nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed version conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-10-26 16:41:21 +05:30
parent 2e12a76d18 4c0a9f420f
commit 72a1943c8e
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,10 +4,6 @@
erpnext.taxes_and_totals = erpnext.payments.extend({
setup: function() {},
apply_pricing_rule_on_item: function(item){
if(!item.margin_type){
item.margin_rate_or_amount = 0.0;
}
if(item.margin_type == "Percentage"){
item.total_margin = item.price_list_rate + item.price_list_rate * ( item.margin_rate_or_amount / 100);
}else{

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

@@ -710,7 +710,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
"brand": d.brand,
"qty": d.qty,
"parenttype": d.parenttype,
"parent": d.parent
"parent": d.parent,
"pricing_rule": d.pricing_rule
});
// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list