diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index ca0b037ea5b0..5ccb3f1eca60 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -786,21 +786,11 @@ def calculate_total_advance(self): self.doc.total_advance = flt(total_allocated_amount, self.doc.precision("total_advance")) - grand_total = self.doc.rounded_total or self.doc.grand_total + grand_total = self.doc.base_rounded_total or self.doc.base_grand_total - if self.doc.party_account_currency == self.doc.currency: - invoice_total = flt( - grand_total - flt(self.doc.write_off_amount), self.doc.precision("grand_total") - ) - else: - base_write_off_amount = flt( - flt(self.doc.write_off_amount) * self.doc.conversion_rate, - self.doc.precision("base_write_off_amount"), - ) - invoice_total = ( - flt(grand_total * self.doc.conversion_rate, self.doc.precision("grand_total")) - - base_write_off_amount - ) + invoice_total = flt( + grand_total - flt(self.doc.base_write_off_amount), self.doc.precision("grand_total") + ) if invoice_total > 0 and self.doc.total_advance > invoice_total: frappe.throw(