commit 8bef1d850656895b5bb0228e6b7230cccd4d29a1
author Ameya Shenoy <shenoy.ameya@gmail.com> Sun Oct 07 08:00:07 2018 +0000
committer Ameya Shenoy <shenoy.ameya@gmail.com> Sun Oct 07 08:00:07 2018 +0000
tree 74808b2f92e10296f3d76845ea49f680804713b2
parent f174c95d80d99b000bf4ac1b582560eb417e3440
parent 36be62b927640cb6522216b228ca0e9342ab87ed

Merge branch 'staging' into develop

erpnext/hooks.py

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 6ca5f19..3580489 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -12,7 +12,7 @@
 source_link = "https://github.com/frappe/erpnext"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.6'
+staging_version = '11.0.3-beta.7'
 
 error_report_email = "support@erpnext.com"
 

erpnext/patches/v11_0/make_location_from_warehouse.py

diff --git a/erpnext/patches/v11_0/make_location_from_warehouse.py b/erpnext/patches/v11_0/make_location_from_warehouse.py
index b5b2e17..a307e8c 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 @@
 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')