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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait
2017-02-28 18:56:26 +05:30
parent 8312f1cd64 093eba2336
commit 18b7364a81
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

@@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.2.25' __version__ = '7.2.26'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

4
erpnext/utilities/activation.py
View File

@@ -51,8 +51,8 @@ def get_level():
def get_help_messages(): def get_help_messages():
'''Returns help messages to be shown on Desktop''' '''Returns help messages to be shown on Desktop'''
# if get_level() > 6: if get_level() > 6:
# return [] return []
messages = [] messages = []