From 7a9f46d9d11ead1ddd601d4ac3a7ba9d21f19f39 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 23 Oct 2015 13:19:01 +0530 Subject: [PATCH] [fix] Value mapping while making bank entry from Expense Claim --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 9 ++++++--- erpnext/hr/doctype/expense_claim/expense_claim.js | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 9525a3aef0..9eaf1ddfc4 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -498,14 +498,17 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None): if voucher_type=="Bank Entry": account = frappe.db.get_value("Company", company, "default_bank_account") if not account: - account = frappe.db.get_value("Account", {"company": company, "account_type": "Bank", "is_group": 0}) + account = frappe.db.get_value("Account", + {"company": company, "account_type": "Bank", "is_group": 0}) elif voucher_type=="Cash Entry": account = frappe.db.get_value("Company", company, "default_cash_account") if not account: - account = frappe.db.get_value("Account", {"company": company, "account_type": "Cash", "is_group": 0}) + account = frappe.db.get_value("Account", + {"company": company, "account_type": "Cash", "is_group": 0}) if account: - account_details = frappe.db.get_value("Account", account, ["account_currency", "account_type"], as_dict=1) + account_details = frappe.db.get_value("Account", account, + ["account_currency", "account_type"], as_dict=1) return { "account": account, "balance": get_balance_on(account), diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js index 1d405da00a..780cd70612 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim.js @@ -18,24 +18,25 @@ erpnext.hr.ExpenseClaimController = frappe.ui.form.Controller.extend({ jv.voucher_type = 'Bank Entry'; jv.company = cur_frm.doc.company; jv.remark = 'Payment against Expense Claim: ' + cur_frm.doc.name; - jv.fiscal_year = cur_frm.doc.fiscal_year; var expense = cur_frm.doc.expenses || []; for(var i = 0; i < expense.length; i++){ var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts'); - d1.debit = expense[i].sanctioned_amount; d1.account = expense[i].default_account; + d1.debit_in_account_currency = expense[i].sanctioned_amount; d1.reference_type = cur_frm.doc.doctype; d1.reference_name = cur_frm.doc.name; } // credit to bank var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts'); - d1.credit = cur_frm.doc.total_sanctioned_amount; + d1.credit_in_account_currency = cur_frm.doc.total_sanctioned_amount; d1.reference_type = cur_frm.doc.doctype; d1.reference_name = cur_frm.doc.name; if(r.message) { d1.account = r.message.account; d1.balance = r.message.balance; + d1.account_currency = r.message.account_currency; + d1.account_type = r.message.account_type; } loaddoc('Journal Entry', jv.name);