fix: Ignore for Purchase Invoices
(cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 56454c8..593ee79 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -819,7 +819,11 @@
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)