nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 05:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the route filters and payment account (#13447)

Browse Source
This commit is contained in:
Manas Solanki
2018-04-02 10:13:22 +05:30
committed by Nabin Hait
parent 562227db8f
commit 0289ad285f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -768,6 +768,8 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
party_account = doc.receivable_account party_account = doc.receivable_account
elif dt == "Employee Advance": elif dt == "Employee Advance":
party_account = doc.advance_account party_account = doc.advance_account
elif dt == "Expense Claim":
party_account = doc.payable_account
else: else:
party_account = get_party_account(party_type, doc.get(party_type.lower()), doc.company) party_account = get_party_account(party_type, doc.get(party_type.lower()), doc.company)

8
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@@ -98,9 +98,9 @@ cur_frm.cscript.refresh = function(doc) {
if (cint(doc.total_amount_reimbursed) > 0 && frappe.model.can_read(entry_doctype)) { if (cint(doc.total_amount_reimbursed) > 0 && frappe.model.can_read(entry_doctype)) {
cur_frm.add_custom_button(__('Bank Entries'), function() { cur_frm.add_custom_button(__('Bank Entries'), function() {
frappe.route_options = { frappe.route_options = {
entry_route_doctype: me.frm.doc.doctype, party_type: "Employee",
entry_route_name: me.frm.doc.name, party: doc.employee,
company: me.frm.doc.company company: doc.company
}; };
frappe.set_route("List", entry_doctype); frappe.set_route("List", entry_doctype);
}, __("View")); }, __("View"));
@@ -205,7 +205,7 @@ frappe.ui.form.on("Expense Claim", {
make_payment_entry: function(frm) { make_payment_entry: function(frm) {
var method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry"; var method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry";
if(frm.doc.__onload && frm.doc.__onload.make_payment_via_journal_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({ return frappe.call({
method: method, method: method,