Compare commits

...

21 Commits

Author SHA1 Message Date
Sahil Khan
5caa40857d Merge branch 'v11-pre-release' into version-11 2020-05-21 14:55:08 +05:30
Sahil Khan
78b7f69e0c bumped to version 11.1.76 2020-05-21 15:15:08 +05:50
Sahil Khan
8d9b58d801 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-05-21 14:52:13 +05:30
Sahil Khan
b35db7e819 Merge branch 'v11-pre-release' into version-11 2020-04-22 12:20:15 +05:30
Sahil Khan
44875482ac bumped to version 11.1.75 2020-04-22 12:40:15 +05:50
Sahil Khan
f06cc233a8 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-04-22 11:55:01 +05:30
Sahil Khan
884dc28af6 Merge branch 'v11-pre-release' into version-11 2020-03-17 12:12:23 +05:30
Sahil Khan
a506930b63 bumped to version 11.1.74 2020-03-17 12:32:23 +05:50
Sahil Khan
f6836c1d89 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-03-17 12:06:42 +05:30
Sahil Khan
4206b52bdc Merge branch 'v11-pre-release' into version-11 2020-02-20 18:03:05 +05:30
Sahil Khan
9e66c86d6f bumped to version 11.1.73 2020-02-20 18:23:05 +05:50
Sahil Khan
ec46b4d4c6 Merge branch 'version-11-hotfix' of https://github.com/frappe/erpnext into v11-pre-release 2020-02-20 18:00:23 +05:30
Sahil Khan
47a7e3422b Merge branch 'v11-pre-release' into version-11 2020-01-14 14:19:35 +05:30
Sahil Khan
9efb087e22 bumped to version 11.1.72 2020-01-14 14:39:35 +05:50
Sahil Khan
3d58dd6aa5 Merge branch 'v11-pre-release' of https://github.com/frappe/erpnext into v11-pre-release 2020-01-14 12:49:02 +05:30
Sahil Khan
ac7966cd7e bumped to version 11.1.71 2020-01-14 12:47:21 +05:30
sahil28297
61ddb508d4 fix(init): bump version to 11.1.70 2020-01-14 12:47:21 +05:30
Sahil Khan
b4ce43306b Merge branch 'v11-pre-release' into version-11 2019-12-18 13:59:59 +05:30
Sahil Khan
85a9f55fa7 bumped to version 11.1.71 2019-12-18 14:19:59 +05:50
Suraj Shetty
596c0d2060 fix(init): bump version to 11.1.70 (#19986)
fix(init): bump version to 11.1.70
2019-12-18 13:58:01 +05:30
sahil28297
723421f375 fix(init): bump version to 11.1.70 2019-12-18 13:56:34 +05:30

View File

@@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
__version__ = '11.1.68'
__version__ = '11.1.76'
def get_default_company(user=None):
'''Get default company for user'''
@@ -144,4 +144,4 @@ def is_member():
last_membership = get_last_membership()
if last_membership and getdate(last_membership.to_date) > getdate():
return True
return False
return False