nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 08:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6810 from nabinhait/v7.0.x

Browse Source 
set item rate on first selection  of item
This commit is contained in:
Nabin Hait
2016-11-03 15:10:41 +05:30
committed by GitHub
parent 594642441b 37b1b613f5
commit 1b4e9898ce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,9 +16,10 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
}, },
apply_pricing_rule_on_item: function(item){ apply_pricing_rule_on_item: function(item){
if(item.margin_type == "Percentage"){ if(item.margin_type == "Percentage"){
item.total_margin = item.price_list_rate + item.price_list_rate * ( item.margin_rate_or_amount / 100); item.total_margin = flt(item.price_list_rate)
+ flt(item.price_list_rate) * ( flt(item.margin_rate_or_amount) / 100);
}else{ }else{
item.total_margin = item.price_list_rate + item.margin_rate_or_amount; item.total_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.total_margin , precision("rate", item));