Merge branch 'nabinhait-item_description' into develop

Conflicts:
	erpnext/patches.txt
This commit is contained in:
Anand Doshi 2015-08-13 13:40:33 +05:30
commit c0c4e866be

View File

@ -191,3 +191,4 @@ execute:frappe.db.sql("update `tabStock Ledger Entry` set stock_queue = '[]' whe
erpnext.patches.v5_4.fix_missing_item_images
erpnext.patches.v5_4.stock_entry_additional_costs
erpnext.patches.v5_4.cleanup_journal_entry
execute:frappe.db.sql("update `tabProduction Order` pro set description = (select description from tabItem where name=pro.production_item) where ifnull(description, '') = ''")