Merge branch 'master' of github.com:webnotes/erpnext

2012-05-29 15:47:47 +05:30
parent 9c011f405d d5f5875aab
commit 6971f577da
28 changed files with 380 additions and 200 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -402,4 +402,9 @@ patch_list = [
 		'patch_file': 'profile_perm_patch',
 		'description': 'Make profile readonly for role All'
 	},
+	{
+		'patch_module': 'patches.may_2012',
+		'patch_file': 'remove_euro_currency',
+		'description': 'Remove EURO currency and replace with EUR'
+	},
 ]