From bc45f896f73c5f45891817c1855c84f327f72777 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 10 Jan 2012 14:11:07 +0530 Subject: [PATCH] Merged master with stable --- .../patches/{ => jan_mar_2012}/delete_pur_of_service.py | 0 erpnext/patches/{ => jan_mar_2012}/pending_patches.py | 0 erpnext/patches/{ => jan_mar_2012}/pos_setting_patch.py | 0 erpnext/patches/{ => jan_mar_2012}/reload_doctype.py | 0 .../patches/{ => jan_mar_2012}/reload_po_pr_mapper.py | 0 erpnext/patches/patch_list.py | 9 --------- 6 files changed, 9 deletions(-) rename erpnext/patches/{ => jan_mar_2012}/delete_pur_of_service.py (100%) rename erpnext/patches/{ => jan_mar_2012}/pending_patches.py (100%) rename erpnext/patches/{ => jan_mar_2012}/pos_setting_patch.py (100%) rename erpnext/patches/{ => jan_mar_2012}/reload_doctype.py (100%) rename erpnext/patches/{ => jan_mar_2012}/reload_po_pr_mapper.py (100%) diff --git a/erpnext/patches/delete_pur_of_service.py b/erpnext/patches/jan_mar_2012/delete_pur_of_service.py similarity index 100% rename from erpnext/patches/delete_pur_of_service.py rename to erpnext/patches/jan_mar_2012/delete_pur_of_service.py diff --git a/erpnext/patches/pending_patches.py b/erpnext/patches/jan_mar_2012/pending_patches.py similarity index 100% rename from erpnext/patches/pending_patches.py rename to erpnext/patches/jan_mar_2012/pending_patches.py diff --git a/erpnext/patches/pos_setting_patch.py b/erpnext/patches/jan_mar_2012/pos_setting_patch.py similarity index 100% rename from erpnext/patches/pos_setting_patch.py rename to erpnext/patches/jan_mar_2012/pos_setting_patch.py diff --git a/erpnext/patches/reload_doctype.py b/erpnext/patches/jan_mar_2012/reload_doctype.py similarity index 100% rename from erpnext/patches/reload_doctype.py rename to erpnext/patches/jan_mar_2012/reload_doctype.py diff --git a/erpnext/patches/reload_po_pr_mapper.py b/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py similarity index 100% rename from erpnext/patches/reload_po_pr_mapper.py rename to erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index 78e0e9adfb..0ebfe5ba38 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py @@ -1,13 +1,4 @@ patch_list = [ - { - 'patch_file': 'reload_print_format', - 'description': 'Reload doctype print format' - }, - { - 'patch_module': 'patches', - 'patch_file': 'reload_project_task', - 'description': 'Reload doctype task of project module' - }, { 'patch_module': 'patches.jan_mar_2012', 'patch_file': 'stable_branch_shift_09_01_12',