Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Calculate rate based on discount on server side only if not rate or pricing rule applied

Browse Source
This commit is contained in:
Nabin Hait 2019-04-05 19:35:02 +05:30
parent 77b82894ff
commit 593242fa5c
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/controllers/taxes_and_totals.py
View File

@ -59,19 +59,22 @@ class calculate_taxes_and_totals(object):
if item.discount_percentage == 100: if item.discount_percentage == 100:
item.rate = 0.0 item.rate = 0.0
elif (not item.rate or item.discount_percentage > 0) and item.price_list_rate: elif item.price_list_rate:
item.rate = flt(item.price_list_rate * if not item.rate or (item.pricing_rules and item.discount_percentage > 0):
(1.0 - (item.discount_percentage / 100.0)), item.precision("rate")) item.rate = flt(item.price_list_rate *
item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0) (1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
elif item.discount_amount and item.price_list_rate: item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0)
item.rate = item.price_list_rate - item.discount_amount elif item.discount_amount and item.pricing_rules:
item.rate = item.price_list_rate - item.discount_amount
if item.doctype in ['Quotation Item', 'Sales Order Item', 'Delivery Note Item', 'Sales Invoice Item']: if item.doctype in ['Quotation Item', 'Sales Order Item', 'Delivery Note Item', 'Sales Invoice Item']:
item.rate_with_margin, item.base_rate_with_margin = self.calculate_margin(item) item.rate_with_margin, item.base_rate_with_margin = self.calculate_margin(item)
if item.discount_percentage:
if flt(item.rate_with_margin) > 0: if flt(item.rate_with_margin) > 0:
item.rate = flt(item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate")) item.rate = flt(item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
item.discount_amount = item.rate_with_margin - item.rate item.discount_amount = item.rate_with_margin - item.rate
elif flt(item.price_list_rate) > 0:
item.discount_amount = item.price_list_rate - item.rate
elif flt(item.price_list_rate) > 0 and not item.discount_amount: elif flt(item.price_list_rate) > 0 and not item.discount_amount:
item.discount_amount = item.price_list_rate - item.rate item.discount_amount = item.price_list_rate - item.rate

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

@ -147,6 +147,8 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
}, },
discount_amount: function(doc, cdt, cdn) { discount_amount: function(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
item.discount_percentage = 0.0;
this.price_list_rate(doc, cdt, cdn); this.price_list_rate(doc, cdt, cdn);
}, },

1
erpnext/public/js/controllers/transaction.js
View File

@ -23,6 +23,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} else { } else {
item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0, item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0,
precision("discount_percentage", item)); precision("discount_percentage", item));
item.discount_amount = flt(item.price_list_rate) - flt(item.rate);
item.margin_type = ''; item.margin_type = '';
item.margin_rate_or_amount = 0; item.margin_rate_or_amount = 0;
item.rate_with_margin = 0; item.rate_with_margin = 0;

2
erpnext/selling/sales_common.js
View File

@ -145,6 +145,8 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
}, },
discount_amount: function(doc, cdt, cdn) { discount_amount: function(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
item.discount_percentage = 0.0;
this.apply_discount_on_item(doc, cdt, cdn, 'discount_amount'); this.apply_discount_on_item(doc, cdt, cdn, 'discount_amount');
}, },