From 8cfa3a9ece1ce4607a4a69b35713ae2336196cc0 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 24 Mar 2022 13:09:55 +0530 Subject: [PATCH] fix: Ignore for Purchase Invoices (cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js --- erpnext/public/js/controllers/taxes_and_totals.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 56454c8942b..593ee79e287 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -819,7 +819,11 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { this.frm.set_value('base_paid_amount', flt(base_paid_amount, precision("base_paid_amount"))); } +<<<<<<< HEAD calculate_change_amount(){ +======= + calculate_change_amount: function() { +>>>>>>> ed38679d22 (fix: Ignore for Purchase Invoices) this.frm.doc.change_amount = 0.0; this.frm.doc.base_change_amount = 0.0; if(in_list(["Sales Invoice", "POS Invoice"], this.frm.doc.doctype)