diff --git a/hrms/hr/doctype/appraisal_template/appraisal_template.json b/hrms/hr/doctype/appraisal_template/appraisal_template.json index 01e563d0f2b..dba25efaa0b 100644 --- a/hrms/hr/doctype/appraisal_template/appraisal_template.json +++ b/hrms/hr/doctype/appraisal_template/appraisal_template.json @@ -62,7 +62,7 @@ "unique": 1 } ], - "icon": "icon-file-text", + "icon": "file-text", "idx": 1, "links": [ { diff --git a/hrms/hr/doctype/employee_advance/employee_advance.js b/hrms/hr/doctype/employee_advance/employee_advance.js index 9a719e3cae8..b88a4eb3e3a 100644 --- a/hrms/hr/doctype/employee_advance/employee_advance.js +++ b/hrms/hr/doctype/employee_advance/employee_advance.js @@ -137,22 +137,50 @@ frappe.ui.form.on("Employee Advance", { }, make_return_entry: function (frm) { - frappe.call({ - method: "hrms.hr.doctype.employee_advance.employee_advance.make_return_entry", - args: { - employee: frm.doc.employee, - company: frm.doc.company, - employee_advance_name: frm.doc.name, - return_amount: flt(frm.doc.paid_amount - frm.doc.claimed_amount), - advance_account: frm.doc.advance_account, - mode_of_payment: frm.doc.mode_of_payment, - currency: frm.doc.currency, - }, - callback: function (r) { - const doclist = frappe.model.sync(r.message); - frappe.set_route("Form", doclist[0].doctype, doclist[0].name); + let dialog = new frappe.ui.Dialog({ + title: __("Return Advance"), + fields: [ + { + label: __("Bank/Cash Account"), + fieldname: "bank_account", + fieldtype: "Link", + options: "Account", + description: __( + "Optional. Leave blank to use the Mode of Payment set on this Advance, or the Company's Default Cash Account.", + ), + get_query: () => ({ + filters: { + company: frm.doc.company, + account_type: ["in", ["Bank", "Cash"]], + account_currency: frm.doc.currency, + is_group: 0, + }, + }), + }, + ], + primary_action_label: __("Create"), + primary_action: (values) => { + dialog.hide(); + frappe.call({ + method: "hrms.hr.doctype.employee_advance.employee_advance.make_return_entry", + args: { + employee: frm.doc.employee, + company: frm.doc.company, + employee_advance_name: frm.doc.name, + return_amount: flt(frm.doc.paid_amount - frm.doc.claimed_amount), + advance_account: frm.doc.advance_account, + mode_of_payment: frm.doc.mode_of_payment, + currency: frm.doc.currency, + bank_account: values.bank_account, + }, + callback: function (r) { + const doclist = frappe.model.sync(r.message); + frappe.set_route("Form", doclist[0].doctype, doclist[0].name); + }, + }); }, }); + dialog.show(); }, employee: function (frm) { diff --git a/hrms/hr/doctype/employee_advance/employee_advance.py b/hrms/hr/doctype/employee_advance/employee_advance.py index 851e94dbd4d..f062f68c9b7 100644 --- a/hrms/hr/doctype/employee_advance/employee_advance.py +++ b/hrms/hr/doctype/employee_advance/employee_advance.py @@ -323,8 +323,20 @@ def make_return_entry( advance_account: str, currency: str, mode_of_payment: str | None = None, + bank_account: str | None = None, ) -> dict: - bank_cash_account = get_same_currency_bank_cash_account(company, currency, mode_of_payment) + bank_cash_account = get_same_currency_bank_cash_account(company, currency, mode_of_payment, bank_account) + + if not (bank_cash_account.get("account") or bank_cash_account.get("name")): + frappe.msgprint( + _( + "Couldn't automatically pick a Bank/Cash Account for this return. Please set one in the" + " Accounting Entries below, or set a Default Cash Account in the {0} to avoid this next" + " time." + ).format(get_link_to_form("Company", company + "#accounts_tab", _("Company"))), + title=_("Bank/Cash Account Not Set"), + indicator="orange", + ) advance_account_currency = frappe.db.get_value("Account", advance_account, "account_currency") @@ -367,13 +379,17 @@ def make_return_entry( return je.as_dict() -def get_same_currency_bank_cash_account(company, currency, mode_of_payment=None): +def get_same_currency_bank_cash_account(company, currency, mode_of_payment=None, account=None): company_currency = erpnext.get_company_currency(company) if currency == company_currency: - return get_default_bank_cash_account(company, account_type="Cash", mode_of_payment=mode_of_payment) + return get_default_bank_cash_account( + company, + account_type="Cash", + mode_of_payment=None if account else mode_of_payment, + account=account, + ) - account = None - if mode_of_payment: + if not account and mode_of_payment: from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account account = get_bank_cash_account(mode_of_payment, company).get("account")