nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 14:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolved merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2021-04-14 13:09:50 +05:30
parent 3f6ba12344 b77793763a
commit 2535fe9b1e
9 changed files with 46 additions and 20 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__ = '13.0.1'
__version__ = '13.0.0-dev'
def get_default_company(user=None):
'''Get default company for user'''