commit c0c4e866bed26cb8ac900fb488abdffc468e019d
author Anand Doshi <anand@erpnext.com> Thu Aug 13 13:40:33 2015 +0530
committer Anand Doshi <anand@erpnext.com> Thu Aug 13 13:40:33 2015 +0530
tree 4df6b3ce710fe33ec9e1d36a7acc0eedb7fc8dc4
parent ae1a91835e460822d1a09e41972461dc9b5658d5
parent b16474e606908f340c6f04c9aa0516714afa8bba

Merge branch 'nabinhait-item_description' into develop

Conflicts:
	erpnext/patches.txt

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 4982ba5..8e3aab1 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -191,3 +191,4 @@
 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, '') = ''")