fix the route filters and payment account (#13447)
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index eafdac3..2f8e6b8 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -768,6 +768,8 @@
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 f40e77c..7cce7d3 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -98,9 +98,9 @@
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 @@
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,