| commit | bc45f896f73c5f45891817c1855c84f327f72777 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Tue Jan 10 14:11:07 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Tue Jan 10 14:11:07 2012 +0530 |
| tree | 08a57f7885e40d31103713741ef0d4cf21bc2f53 | |
| parent | 266829f0244b61d3bfd91c2eca95cf7d3ea803bc [diff] |
Merged master with stable
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 78e0e9a..0ebfe5b 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py
@@ -1,14 +1,5 @@ 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', 'description': 'Various Reloads for shifting branch from master to stable'