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

[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py

Browse Source
This commit is contained in:
mbauskar
2016-03-05 15:10:25 +05:30
committed by rohitwaghchaure
parent a720c89535
commit a52472cf5b
16 changed files with 912 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -645,9 +645,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
});
// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list
if (d.doctype == "Quotation Item" || d.doctype == "Sales Order Item"){
item_list[0]["type"] = d.type
item_list[0]["rate_or_amount"] = d.rate_or_amount
if (in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item"]), d.doctype){
item_list[0]["margin_type"] = d.margin_type
item_list[0]["margin_rate_or_amount"] = d.margin_rate_or_amount
}
}
};