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

[fixes] raise if selects product bundle as sub item in another product bundle.

Browse Source
This commit is contained in:
Saurabh
2016-03-09 15:31:04 +05:30
parent bd01a81638
commit 3fbf3ce852
3 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -881,7 +881,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
set_gross_profit: function(item) {
if (this.frm.doc.doctype == "Sales Order" && item.valuation_rate) {
item.gross_profit = flt((((item.rate - item.valuation_rate) * item.qty) * (this.frm.doc.conversion_rate || 1)), precision("amount", item));
rate = flt(item.rate) * flt(this.frm.doc.conversion_rate || 1);
item.gross_profit = flt(((rate - item.valuation_rate) * item.qty), precision("amount", item));
}
}
});