Merge branch 'hotfix'

This commit is contained in:
Nabin Hait 2018-02-23 16:59:42 +05:30
commit 4ff4d185f7
2 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@ import frappe
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'''

View File

@ -57,8 +57,8 @@ def get_columns():
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",