diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 1fb95ea3ec..c40753de49 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" develop_version = '11.x.x-develop' -staging_version = '11.0.3-beta.6' +staging_version = '11.0.3-beta.7' error_report_email = "support@erpnext.com" diff --git a/erpnext/patches/v11_0/make_location_from_warehouse.py b/erpnext/patches/v11_0/make_location_from_warehouse.py index b5b2e17c3b..a307e8c365 100644 --- a/erpnext/patches/v11_0/make_location_from_warehouse.py +++ b/erpnext/patches/v11_0/make_location_from_warehouse.py @@ -6,6 +6,7 @@ import frappe from frappe.utils.nestedset import rebuild_tree def execute(): + if not frappe.db.get_value('Asset', {'docstatus': ('<', 2) }, 'name'): return frappe.reload_doc('assets', 'doctype', 'location') frappe.reload_doc('stock', 'doctype', 'warehouse')