nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

added rate and total margin in price_list

Browse Source
This commit is contained in:
mbauskar
2016-01-18 16:32:24 +05:30
committed by rohitwaghchaure
parent 36b5189163
commit c79415eb96
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -643,6 +643,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
"parenttype": d.parenttype, "parenttype": d.parenttype,
"parent": d.parent "parent": d.parent
}); });
// 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
}
} }
}; };
@@ -957,5 +963,3 @@ frappe.ui.form.on(cur_frm.doctype, "discount_amount", function(frm) {
frm.cscript.calculate_taxes_and_totals(); frm.cscript.calculate_taxes_and_totals();
}); });