Merge branch 'hotfix'

fix(item): moving reload_doc up in item barcode patch

erpnext/__init__.py

@@ -5,7 +5,7 @@ import frappe
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '11.1.40'
+__version__ = '11.1.41'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/patches/v10_0/item_barcode_childtable_migrate.py

@@ -7,8 +7,9 @@ import frappe
 
 
 def execute():
-	if frappe.get_all("Item Barcode", limit=1): return
 	frappe.reload_doc("stock", "doctype", "item_barcode")
+	if frappe.get_all("Item Barcode", limit=1): return
+	if "barcode" not in frappe.db.get_table_columns("Item"): return
 
 	items_barcode = frappe.db.sql("select name, barcode from tabItem where barcode is not null", as_dict=True)
 	frappe.reload_doc("stock", "doctype", "item")