schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict using theirs

Browse Source
This commit is contained in:
Nabin Hait
2012-05-01 16:29:40 +05:30
parent 796505a83e 8360a5f729
commit 5af62d0857
17 changed files with 98 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/patches/patch_list.py
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',