nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 14:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2012-11-30 15:02:20 +05:30
parent b18c7738d1 71d6a0ce1d
commit 3e0612db83
50 changed files with 1414 additions and 2671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/patch_list.py
View File

@@ -278,11 +278,6 @@ patch_list = [
'patch_file': 'after_sync_cleanup',
'description': 'cleanup after sync'
},
{
'patch_module': 'patches.april_2012',
'patch_file': 'change_cacheitem_schema',
'description': 'Modified datatype of `value` column from text to longtext'
},
{
'patch_module': 'patches.april_2012',
'patch_file': 'remove_default_from_rv_detail',
@@ -458,11 +453,6 @@ patch_list = [
'patch_file': 'delete_about_contact',
'description': "delete depracated doctypes of website module"
},
{
'patch_module': 'patches.june_2012',
'patch_file': 'cache_item_table',
'description': "create cache item table again"
},
{
'patch_module': 'patches.july_2012',
'patch_file': 'reload_pr_po_mapper',
@@ -699,6 +689,14 @@ patch_list = [
'patch_module': 'patches.november_2012',
'patch_file': 'add_theme_to_profile',
},
{
'patch_module': 'patches.november_2012',
'patch_file': 'add_employee_field_in_employee',
},
{
'patch_module': 'patches.november_2012',
'patch_file': 'leave_application_cleanup',
},
{
'patch_module': 'patches.november_2012',
'patch_file': 'production_order_patch',