From 42f3592e959f50633cb57c85221b04d10f9e0aa2 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 28 Jul 2022 13:21:29 +0530 Subject: [PATCH] fix: Allow allocating advance amount against Expense Claim taxes --- erpnext/hr/doctype/expense_claim/expense_claim.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py index ab0e62b378e..0645bd1f937 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.py +++ b/erpnext/hr/doctype/expense_claim/expense_claim.py @@ -305,12 +305,11 @@ class ExpenseClaim(AccountsController): if self.total_advance_amount: precision = self.precision("total_advance_amount") - if flt(self.total_advance_amount, precision) > flt(self.total_claimed_amount, precision): - frappe.throw(_("Total advance amount cannot be greater than total claimed amount")) + amount_with_taxes = flt(self.total_sanctioned_amount, precision) + flt( + self.total_taxes_and_charges, precision + ) - if self.total_sanctioned_amount and flt(self.total_advance_amount, precision) > flt( - self.total_sanctioned_amount, precision - ): + if flt(self.total_advance_amount, precision) > amount_with_taxes: frappe.throw(_("Total advance amount cannot be greater than total sanctioned amount")) def validate_sanctioned_amount(self):