Discount amount field in all transactions' child tables (#15124)
* Add discount_amount and base_discount_amount in Sales Invoice Item
* Add patch for existing documents
* Discount amount field in all child tables of Purchase and Selling
* Remove console statements
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 0fd6c97..11655e9 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -113,8 +113,8 @@
var item = frappe.get_doc(cdt, cdn);
frappe.model.round_floats_in(item, ["price_list_rate", "discount_percentage"]);
- item.rate = flt(item.price_list_rate * (1 - item.discount_percentage / 100.0),
- precision("rate", item));
+ item.discount_amount = flt(item.price_list_rate) * flt(item.discount_percentage) / 100;
+ item.rate = flt((item.price_list_rate) - (item.discount_amount), precision('rate', item));
this.calculate_taxes_and_totals();
},
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index b6690cb..a31acfc 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -16,8 +16,8 @@
item.rate = flt(item.rate_with_margin , precision("rate", item));
if(item.discount_percentage){
- var discount_value = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
- item.rate = flt((item.rate_with_margin) - (discount_value), precision('rate', item));
+ item.discount_amount = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
+ item.rate = flt((item.rate_with_margin) - (item.discount_amount), precision('rate', item));
}
},