nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait
2018-02-23 16:59:44 +05:30
parent 7570774ebe 4ff4d185f7
commit 802819df9d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.3' __version__ = '10.1.4'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

4
erpnext/stock/report/stock_balance/stock_balance.py
View File

@@ -59,8 +59,8 @@ def get_columns():
columns = [ columns = [
_("Item")+":Link/Item:100", _("Item")+":Link/Item:100",
_("Item Name")+"::150", _("Item Name")+"::150",
_("Item Group")+"::100", _("Item Group")+":Link/Item Group:100",
_("Brand")+"::90", _("Brand")+":Link/Brand:90",
_("Description")+"::140", _("Description")+"::140",
_("Warehouse")+":Link/Warehouse:100", _("Warehouse")+":Link/Warehouse:100",
_("Stock UOM")+":Link/UOM:90", _("Stock UOM")+":Link/UOM:90",