From 3e8eca35a259021e982c1003ddac50fa6d47d016 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 24 Jun 2013 17:18:24 +0530 Subject: [PATCH] [report][fix] stock balance --- accounts/page/general_ledger/general_ledger.js | 2 +- startup/report_data_map.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index ffab56831ae..e612bd8a418 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -326,7 +326,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ if(voucher_dict.totals.debit || voucher_dict.totals.credit) { voucher_dict.row.debit = voucher_dict.totals.debit; voucher_dict.row.credit = voucher_dict.totals.credit; - voucher_dict.row.id = "entry" + voucher + voucher_dict.row.id = "entry_grouped_by_" + voucher out = out.concat(voucher_dict.row); } }); diff --git a/startup/report_data_map.py b/startup/report_data_map.py index 068e4700450..c3a5dd2cce9 100644 --- a/startup/report_data_map.py +++ b/startup/report_data_map.py @@ -72,7 +72,7 @@ data_map = { }, "Item Group": { "columns": ["name", "parent_item_group"], - "conditions": ["docstatus < 2"], + # "conditions": ["docstatus < 2"], "order_by": "lft" }, "Brand": {