From cc739994971e0c35b71f7e4c5828d9e22ebc5a72 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Tue, 9 Dec 2014 18:22:07 +0530 Subject: [PATCH] validate fixed --- .../accounts/doctype/journal_voucher/journal_voucher.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.py b/erpnext/accounts/doctype/journal_voucher/journal_voucher.py index e6d7407073..7a036fe72f 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.py +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.py @@ -434,11 +434,12 @@ class JournalVoucher(AccountsController): def validate_expense_claim(self): for d in self.entries: if d.against_expense_claim: - sanctioned_amount = cint(frappe.db.get_value("Expense Claim", d.against_expense_claim, "total_sanctioned_amount")) - reimbursed_amount = cint(frappe.db.get_value("Expense Claim", d.against_expense_claim, "total_amount_reimbursed")) - pending_amount = sanctioned_amount - reimbursed_amount + sanctioned_amount, reimbursed_amount = frappe.db.get_value("Expense Claim", d.against_expense_claim, + ("total_sanctioned_amount", "total_amount_reimbursed")) + pending_amount = cint(sanctioned_amount) - cint(reimbursed_amount) if d.debit > pending_amount: - frappe.throw("Amount cannot be greater than Expense Claim") + frappe.throw(_("Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. \ + Pending Amount is {2}".format(d.idx, d.against_expense_claim, pending_amount))) @frappe.whitelist() def get_default_bank_cash_account(company, voucher_type):