schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: pricing rule enhancements

Browse Source
This commit is contained in:
Rohit Waghchaure
2019-03-18 14:34:19 +05:30
parent 5f8b358fd4
commit 8bfe330b37
60 changed files with 7648 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/public/js/controllers/buying.js
View File

@@ -130,13 +130,23 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
if (doc.doctype == "Purchase Order" && item.blanket_order_rate) {
item_rate = item.blanket_order_rate;
}
item.discount_amount = flt(item_rate) * flt(item.discount_percentage) / 100;
if (item.discount_percentage) {
item.discount_amount = flt(item_rate) * flt(item.discount_percentage) / 100;
}
item.rate = flt((item.price_list_rate) - (item.discount_amount), precision('rate', item));
this.calculate_taxes_and_totals();
},
discount_percentage: function(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
item.discount_amount = 0.0;
this.price_list_rate(doc, cdt, cdn);
},
discount_amount: function(doc, cdt, cdn) {
this.price_list_rate(doc, cdt, cdn);
},