fixed conflict

2012-07-13 10:39:45 +05:30
parent 91223d325b 158e7751a8
commit 0c9a262de4
31 changed files with 481 additions and 462 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -488,7 +488,11 @@ patch_list = [
 		'description': "set default freeze_account as 'No' where NULL"
 	},
 	{
-		'patch_module': 'patches.june_2012',
+		'patch_module': 'patches.july_2012',
+		'patch_file': 'update_purchase_tax',
+		'description': "rename options in purchase taxes and charges"
+	},
+	{	'patch_module': 'patches.june_2012',
 		'patch_file': 'cms2',
 		'description': 'cms2 release patches'
 	},