CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 14:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Saurabh
2019-06-26 17:18:50 +05:30
parent 1202dc1dd3 23251d9e4d
commit 79f2779574
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -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'''

3
erpnext/patches/v10_0/item_barcode_childtable_migrate.py
View File

@@ -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")