[fixes] calculate valuation rate for non stock item

2016-02-26 18:02:55 +05:30
parent 2d7af63351
commit 5ada14b887
3 changed files with 17 additions and 9 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -880,7 +880,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 	},
 	
 	set_gross_profit: function(item) {
-		if (this.frm.doc.doctype == "Sales Order") {
+		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));
 		}
 	}