Merge branch 'shf_rename'

Conflicts: erpnext/patches/patch_list.py
2012-05-14 12:53:29 +05:30
parent a3851758bf 4602ef39e3
commit 4a3d3d75de
18 changed files with 83 additions and 265 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -342,5 +342,14 @@ patch_list = [
 		'patch_file': 'cms',
 		'description': 'generate html pages'
 	},
-	
+	{
+		'patch_module': 'patches.may_2012',
+		'patch_file': 'reload_reports',
+		'description': 'reload reports: itemwise sales/delivery details'
+	},
+	{
+		'patch_module': 'patches.may_2012',
+		'patch_file': 'page_role_series_fix',
+		'description': 'reset series of page role at max'
+	},
 ]