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

[minor] renamed a Total Margin field to Rate With Margin (#8720)

Browse Source 
* [minor] renamed a Total Margin field to Rate With Margin

* [minor] minor fixes in field lable
This commit is contained in:
Makarand Bauskar
2017-05-11 11:40:02 +05:30
committed by Nabin Hait
parent 734d7795f8
commit 0e4c5c9efb
9 changed files with 436 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/public/js/controllers/taxes_and_totals.js
View File

@@ -5,17 +5,17 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
setup: function() {},
apply_pricing_rule_on_item: function(item){
if(item.margin_type == "Percentage"){
item.total_margin = flt(item.price_list_rate)
item.rate_with_margin = flt(item.price_list_rate)
+ flt(item.price_list_rate) * ( flt(item.margin_rate_or_amount) / 100);
} else {
item.total_margin = flt(item.price_list_rate) + flt(item.margin_rate_or_amount);
item.rate_with_margin = flt(item.price_list_rate) + flt(item.margin_rate_or_amount);
}
item.rate = flt(item.total_margin , precision("rate", item));
item.rate = flt(item.rate_with_margin , precision("rate", item));
if(item.discount_percentage){
discount_value = flt(item.total_margin) * flt(item.discount_percentage) / 100;
item.rate = flt((item.total_margin) - (discount_value), precision('rate', item));
discount_value = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
item.rate = flt((item.rate_with_margin) - (discount_value), precision('rate', item));
}
},