From 0289ad285f4396a4a922fed64cd21219d9b20516 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Mon, 2 Apr 2018 10:13:22 +0530 Subject: [PATCH] fix the route filters and payment account (#13447) --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 2 ++ erpnext/hr/doctype/expense_claim/expense_claim.js | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index eafdac3c31..2f8e6b83a2 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -768,6 +768,8 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount= party_account = doc.receivable_account elif dt == "Employee Advance": party_account = doc.advance_account + elif dt == "Expense Claim": + party_account = doc.payable_account else: party_account = get_party_account(party_type, doc.get(party_type.lower()), doc.company) diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js index f40e77c53c..7cce7d34dd 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim.js @@ -98,9 +98,9 @@ cur_frm.cscript.refresh = function(doc) { if (cint(doc.total_amount_reimbursed) > 0 && frappe.model.can_read(entry_doctype)) { cur_frm.add_custom_button(__('Bank Entries'), function() { frappe.route_options = { - entry_route_doctype: me.frm.doc.doctype, - entry_route_name: me.frm.doc.name, - company: me.frm.doc.company + party_type: "Employee", + party: doc.employee, + company: doc.company }; frappe.set_route("List", entry_doctype); }, __("View")); @@ -205,7 +205,7 @@ frappe.ui.form.on("Expense Claim", { make_payment_entry: function(frm) { var method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry"; if(frm.doc.__onload && frm.doc.__onload.make_payment_via_journal_entry) { - method = "erpnext.hr.doctype.expense_claim.expense_claim.make_bank_entry" + method = "erpnext.hr.doctype.expense_claim.expense_claim.make_bank_entry"; } return frappe.call({ method: method,