Merge branch 'stable'

Conflicts:
	erpnext/patches/patch_list.py
This commit is contained in:
Anand Doshi
2012-01-19 12:35:54 +05:30
3 changed files with 33 additions and 60 deletions

View File

@@ -23,5 +23,11 @@ patch_list = [
'patch_module': 'patches.jan_mar_2012',
'patch_file': 'jan_production_patches',
'description': 'Fixes after Major changes in production module'
},
{
'patch_module': 'patches.jan_mar_2012',
'patch_file': 'allocated_to_profile',
'description': """Change Options to "Profile" for fieldname "allocated_to"
as this is giving improper values in Permission Engine"""
}
]