merge

2012-09-14 11:09:46 +05:30
parent 93e9fdfe48 36353b2c7e
commit c6369046a1
22 changed files with 259 additions and 123 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -565,10 +565,6 @@ patch_list = [
 		'patch_module': 'patches.august_2012',
 		'patch_file': 'remove_cash_flow_statement',
 	},
-	{
-		'patch_module': 'patches.august_2012',
-		'patch_file': 'reload_stock_ledger',
-	},
 	{
 		'patch_module': 'patches.september_2012',
 		'patch_file': 'stock_report_permissions_for_accounts',
@@ -577,4 +573,8 @@ patch_list = [
 		'patch_module': 'patches.september_2012',
 		'patch_file': 'communication_delete_permission',
 	},
+	{
+		'patch_module': 'patches.september_2012',
+		'patch_file': 'reload_criteria_stock_ledger',
+	},
 ]