Fixed merge conflict

2014-11-05 12:41:02 +05:30
parent 4a4125b3f4 5086ef2499
commit ae1dcabcb5
28 changed files with 252 additions and 454 deletions
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -131,6 +131,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({

 			if(me.is_default("warehouse") ? true : me.warehouse == sl.warehouse) {
 				var item = me.item_by_name[sl.item_code];
+				if(item.closing_qty_value==undefined) item.closing_qty_value = 0;

 				if(me.value_or_qty!="Quantity") {
 					var wh = me.get_item_warehouse(sl.warehouse, sl.item_code);