commit 4ff4d185f7e794ed1ad6b1f4dd74f48314931aa6
author Nabin Hait <nabinhait@gmail.com> Fri Feb 23 16:59:42 2018 +0530
committer Nabin Hait <nabinhait@gmail.com> Fri Feb 23 16:59:42 2018 +0530
tree a3affde52ac0b7f3e57d0199314e12c7c6c3b87e
parent 489ff6e21cbec85f8a157f0669fbcb6233e098f0
parent d54953e419cbc72190fb867b35777200517470fc

Merge branch 'hotfix'

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 120d65f..fd0f5c1 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '10.1.3'
+__version__ = '10.1.4'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/stock/report/stock_balance/stock_balance.py

diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 2948119..d6fb873 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -57,8 +57,8 @@
 	columns = [
 		_("Item")+":Link/Item:100",
 		_("Item Name")+"::150",
-		_("Item Group")+"::100",
-		_("Brand")+"::90",
+		_("Item Group")+":Link/Item Group:100",
+		_("Brand")+":Link/Brand:90",
 		_("Description")+"::140",
 		_("Warehouse")+":Link/Warehouse:100",
 		_("Stock UOM")+":Link/UOM:90",