[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 3a010c6..a54f30d 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -40,8 +40,10 @@
},
calculate_discount_amount: function(){
- if (frappe.meta.get_docfield(this.frm.doc.doctype, "discount_amount"))
+ if (frappe.meta.get_docfield(this.frm.doc.doctype, "discount_amount")) {
+ this.set_discount_amount();
this.apply_discount_amount();
+ }
},
_calculate_taxes_and_totals: function() {
@@ -451,6 +453,13 @@
}
},
+ set_discount_amount: function() {
+ if(this.frm.doc.additional_discount_percentage) {
+ this.frm.doc.discount_amount = flt(flt(this.frm.doc[frappe.scrub(this.frm.doc.apply_discount_on)])
+ * this.frm.doc.additional_discount_percentage / 100, precision("discount_amount"));
+ }
+ },
+
apply_discount_amount: function() {
var me = this;
var distributed_amount = 0.0;