Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

validate fixed

Browse Source
This commit is contained in:
Neil Trini Lasrado 2014-12-09 18:22:07 +05:30
parent f13c4f0145
commit cc73999497
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/journal_voucher/journal_voucher.py
View File

@ -434,11 +434,12 @@ class JournalVoucher(AccountsController):
def validate_expense_claim(self): def validate_expense_claim(self):
for d in self.entries: for d in self.entries:
if d.against_expense_claim: if d.against_expense_claim:
sanctioned_amount = cint(frappe.db.get_value("Expense Claim", d.against_expense_claim, "total_sanctioned_amount")) sanctioned_amount, reimbursed_amount = frappe.db.get_value("Expense Claim", d.against_expense_claim,
reimbursed_amount = cint(frappe.db.get_value("Expense Claim", d.against_expense_claim, "total_amount_reimbursed")) ("total_sanctioned_amount", "total_amount_reimbursed"))
pending_amount = sanctioned_amount - reimbursed_amount pending_amount = cint(sanctioned_amount) - cint(reimbursed_amount)
if d.debit > pending_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() @frappe.whitelist()
def get_default_bank_cash_account(company, voucher_type): def get_default_bank_cash_account(company, voucher_type):