Merge branch 'shf_rename'

Conflicts: public/js/all-app.js public/js/all-web.js
2012-05-18 11:52:31 +05:30
parent c7e26873c0 acd291a228
commit d643d367ca
18 changed files with 149 additions and 134 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -362,5 +362,10 @@ patch_list = [
 		'patch_file': 'std_pf_readonly',
 		'description': 'Make standard print formats readonly for system manager'
 	},
+	{
+		'patch_module': 'patches.may_2012',
+		'patch_file': 'reload_so_pending_items',
+		'description': 'reload so pending items'
+	},

 ]