Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/patches/patch.py b/patches/patch.py
index cf9774b..f550aa9 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -251,6 +251,8 @@
reload_doc('stock','doctype','item_customer_detail')
elif patch_no == 344:
sql("delete from `tabDocFormat` where ifnull(format, '') = '' and parent = 'Delivery Note'")
+ reload_doc('stock', 'doctype', 'delivery_note_detail')
+ reload_doc('stock', 'doctype', 'item_customer_detail')
elif patch_no == 345:
# rerun 343 (merge confict)
reload_doc('stock','doctype','item_customer_detail')
@@ -291,7 +293,7 @@
elif patch_no == 353:
reload_doc('hr', 'doctype', 'salary_manager')
elif patch_no == 354:
- reload_doc('setup', 'doctype','feature_setup')
+ reload_doc('setup', 'doctype','features_setup')
reload_doc('stock','doctype','item')
sql("update tabDocField set label='Produced Qty',description='Updated after finished goods are transferred to FG Warehouse through Stock Entry' where parent='Production Order' and fieldname='produced_qty'")
rs = sql("select fieldname from tabDocField where parent='Features Setup' and fieldname is not null")
diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js
index b29e7ad..7c1245a 100644
--- a/setup/page/setup/setup.js
+++ b/setup/page/setup/setup.js
@@ -172,7 +172,8 @@
['Property Setter',1,'Property Setter','', 'Customize properties of a Form (DocType) or Field'],
['Letter Head',1,'Letter Head','','Manage different letter heads for Prints'],
['SMS Settings',3,'SMS Settings','','Integrate your personalized SMS gateway which support http web service'],
- ['SMS Center',3,'SMS Center','','Send mass sms to your leads, contacts and partners']
+ ['SMS Center',3,'SMS Center','','Send mass sms to your leads, contacts and partners'],
+ ['Features Setup',3,'Features Setup','','Displays fields based on features selected']
]};