From 1c44a6a0bae00e79396e98587198804748ce2f52 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 29 Jan 2019 18:52:50 +0530 Subject: [PATCH] fix: set version to 11.1.0, remove staging_version --- erpnext/__init__.py | 8 ++++---- erpnext/hooks.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 635f189ec2..0e71525512 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.81' +__version__ = '11.1.0' def get_default_company(user=None): '''Get default company for user''' @@ -74,7 +74,7 @@ def is_perpetual_inventory_enabled(company): frappe.local.enable_perpetual_inventory = {} if not company in frappe.local.enable_perpetual_inventory: - frappe.local.enable_perpetual_inventory[company] = frappe.get_cached_value('Company', + frappe.local.enable_perpetual_inventory[company] = frappe.get_cached_value('Company', company, "enable_perpetual_inventory") or 0 return frappe.local.enable_perpetual_inventory[company] @@ -87,7 +87,7 @@ def get_default_finance_book(company=None): frappe.local.default_finance_book = {} if not company in frappe.local.default_finance_book: - frappe.local.default_finance_book[company] = frappe.get_cached_value('Company', + frappe.local.default_finance_book[company] = frappe.get_cached_value('Company', company, "default_finance_book") return frappe.local.default_finance_book[company] @@ -108,7 +108,7 @@ def get_region(company=None): You can also set global company flag in `frappe.flags.company` ''' if company or frappe.flags.company: - return frappe.get_cached_value('Company', + return frappe.get_cached_value('Company', company or frappe.flags.company, 'country') elif frappe.flags.country: return frappe.flags.country diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 5fdef885ff..7d77f90afa 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -12,7 +12,6 @@ app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" develop_version = '12.x.x-develop' -staging_version = '11.1.0' error_report_email = "support@erpnext.com"