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

fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2019-04-11 12:31:14 +05:30
parent a6f54aa437 0f62b13dd8
commit 89206e74d0
41 changed files with 7822 additions and 7395 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 frappe.utils import getdate
__version__ = '11.1.17'
__version__ = '11.1.20'
def get_default_company(user=None):
'''Get default company for user'''