Merge branch 'hotfix'
This commit is contained in:
commit
4ff4d185f7
@ -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'''
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user