Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

This commit is contained in:
Rushabh Mehta 2012-05-01 16:15:37 +05:30
commit c59fc6623b

View File

@ -237,6 +237,11 @@ patch_list = [
'patch_file': 'clean_property_setter',
'description': 'Patch related to property setter cleanup'
},
{
'patch_module': 'patches.april_2012',
'patch_file': 'naming_series_patch',
'description': 'Move naming series options into property setter'
},
{
'patch_module': 'patches.jan_mar_2012',
'patch_file': 'rename_dt',
@ -267,11 +272,6 @@ patch_list = [
'patch_file': 'reload_c_form',
'description': 'Added attchemnt option and total field'
},
{
'patch_module': 'patches.april_2012',
'patch_file': 'naming_series_patch',
'description': 'Move naming series options into property setter'
},
{
'patch_module': 'patches.april_2012',
'patch_file': 'after_sync_cleanup',