From ddb52a78fd4bf5220d8421ca5ef2e14de016412e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 25 Sep 2015 12:41:56 +0000 Subject: [PATCH] configurator: do not include again base categories already provided by erp5_accounting Added in keep path list, for compatibility --- bt5/erp5_configurator/bt/dependency_list | 3 +- .../portal_categories/account_type.xml | 236 ----------------- .../portal_categories/financial_section.xml | 235 ----------------- .../portal_categories/gap.xml | 237 ------------------ .../bt/template_base_category_list | 3 - .../bt/template_keep_path_list | 3 + 6 files changed, 5 insertions(+), 712 deletions(-) delete mode 100644 bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/account_type.xml delete mode 100644 bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/financial_section.xml delete mode 100644 bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/gap.xml delete mode 100644 bt5/erp5_configurator_standard/bt/template_base_category_list create mode 100644 bt5/erp5_configurator_standard/bt/template_keep_path_list diff --git a/bt5/erp5_configurator/bt/dependency_list b/bt5/erp5_configurator/bt/dependency_list index c9bba35651..d88935f28f 100644 --- a/bt5/erp5_configurator/bt/dependency_list +++ b/bt5/erp5_configurator/bt/dependency_list @@ -1,2 +1,3 @@ erp5_base -erp5_workflow \ No newline at end of file +erp5_workflow +erp5_accounting \ No newline at end of file diff --git a/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/account_type.xml b/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/account_type.xml deleted file mode 100644 index 20ae4a3b92..0000000000 --- a/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/account_type.xml +++ /dev/null @@ -1,236 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="Base Category" module="erp5.portal_type"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_Add_portal_content_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Add_portal_folders_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Copy_or_Move_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Delete_objects_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Modify_portal_content_Permission</string> </key> - <value> - <tuple> - <string>Assignee</string> - <string>Assignor</string> - <string>Manager</string> - <string>Owner</string> - </tuple> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> - </value> - </item> - <item> - <key> <string>acquisition_append_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>acquisition_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>acquisition_copy_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>acquisition_mask_value</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>acquisition_object_id</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>acquisition_portal_type</string> </key> - <value> <string>python: []</string> </value> - </item> - <item> - <key> <string>acquisition_sync_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>category_type</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>criterion_property</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>WARNING: do not modify Ids for this base category. Id is used in many places in accounting. This base category should be read-only.\n -You can still safely change Title or (better) translate it using Localizer</string> </value> - </item> - <item> - <key> <string>fallback_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>account_type</string> </value> - </item> - <item> - <key> <string>id_generator</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id_group</string> </key> - <value> <string>None</string> </value> - </item> - <item> - <key> <string>last_id</string> </key> - <value> <string>1</string> </value> - </item> - <item> - <key> <string>membership_criterion_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>membership_criterion_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>multimembership_criterion_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Base Category</string> </value> - </item> - <item> - <key> <string>read_permission</string> </key> - <value> <string>None</string> </value> - </item> - <item> - <key> <string>rid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>short_title</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>sid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>test_method_id</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Account Type</string> </value> - </item> - <item> - <key> <string>write_permission</string> </key> - <value> <string>None</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="Length" module="BTrees.Length"/> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <global name="OOBTree" module="BTrees.OOBTree"/> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="4" aka="AAAAAAAAAAQ="> - <pickle> - <global name="OOBTree" module="BTrees.OOBTree"/> - </pickle> - <pickle> - <none/> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/financial_section.xml b/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/financial_section.xml deleted file mode 100644 index e7d7cf2f2f..0000000000 --- a/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/financial_section.xml +++ /dev/null @@ -1,235 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="Base Category" module="erp5.portal_type"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_Add_portal_content_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Add_portal_folders_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Copy_or_Move_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Delete_objects_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Modify_portal_content_Permission</string> </key> - <value> - <tuple> - <string>Assignee</string> - <string>Assignor</string> - <string>Manager</string> - <string>Owner</string> - </tuple> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> - </value> - </item> - <item> - <key> <string>acquisition_append_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>acquisition_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>acquisition_copy_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>acquisition_mask_value</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>acquisition_object_id</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>acquisition_portal_type</string> </key> - <value> <string>python: []</string> </value> - </item> - <item> - <key> <string>acquisition_sync_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>category_type</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>criterion_property</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>fallback_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>financial_section</string> </value> - </item> - <item> - <key> <string>id_generator</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id_group</string> </key> - <value> <string>None</string> </value> - </item> - <item> - <key> <string>last_id</string> </key> - <value> <string>1</string> </value> - </item> - <item> - <key> <string>membership_criterion_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>membership_criterion_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>multimembership_criterion_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Base Category</string> </value> - </item> - <item> - <key> <string>read_permission</string> </key> - <value> <string>None</string> </value> - </item> - <item> - <key> <string>rid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>short_title</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>sid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>test_method_id</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Financial Section</string> </value> - </item> - <item> - <key> <string>write_permission</string> </key> - <value> <string>None</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="Length" module="BTrees.Length"/> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <global name="OOBTree" module="BTrees.OOBTree"/> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="4" aka="AAAAAAAAAAQ="> - <pickle> - <global name="OOBTree" module="BTrees.OOBTree"/> - </pickle> - <pickle> - <none/> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/gap.xml b/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/gap.xml deleted file mode 100644 index 976e13f251..0000000000 --- a/bt5/erp5_configurator_standard/CategoryTemplateItem/portal_categories/gap.xml +++ /dev/null @@ -1,237 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="Base Category" module="erp5.portal_type"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_Add_portal_content_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Add_portal_folders_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Copy_or_Move_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Delete_objects_Permission</string> </key> - <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> - </value> - </item> - <item> - <key> <string>_Modify_portal_content_Permission</string> </key> - <value> - <tuple> - <string>Assignee</string> - <string>Assignor</string> - <string>Manager</string> - <string>Owner</string> - </tuple> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> - </value> - </item> - <item> - <key> <string>acquisition_append_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>acquisition_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>acquisition_copy_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>acquisition_mask_value</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>acquisition_object_id</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>acquisition_portal_type</string> </key> - <value> <string>python: []</string> </value> - </item> - <item> - <key> <string>acquisition_sync_value</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>gap</string> - </tuple> - </value> - </item> - <item> - <key> <string>category_type</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>criterion_property</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>fallback_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>gap</string> </value> - </item> - <item> - <key> <string>id_generator</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id_group</string> </key> - <value> <string>None</string> </value> - </item> - <item> - <key> <string>last_id</string> </key> - <value> <string>1</string> </value> - </item> - <item> - <key> <string>membership_criterion_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>membership_criterion_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>multimembership_criterion_base_category</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Base Category</string> </value> - </item> - <item> - <key> <string>read_permission</string> </key> - <value> <string>None</string> </value> - </item> - <item> - <key> <string>rid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>short_title</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>sid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>test_method_id</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>General Accounting Plan</string> </value> - </item> - <item> - <key> <string>write_permission</string> </key> - <value> <string>None</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="Length" module="BTrees.Length"/> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <global name="OOBTree" module="BTrees.OOBTree"/> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="4" aka="AAAAAAAAAAQ="> - <pickle> - <global name="OOBTree" module="BTrees.OOBTree"/> - </pickle> - <pickle> - <none/> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_configurator_standard/bt/template_base_category_list b/bt5/erp5_configurator_standard/bt/template_base_category_list deleted file mode 100644 index e5a5165ad5..0000000000 --- a/bt5/erp5_configurator_standard/bt/template_base_category_list +++ /dev/null @@ -1,3 +0,0 @@ -account_type -financial_section -gap \ No newline at end of file diff --git a/bt5/erp5_configurator_standard/bt/template_keep_path_list b/bt5/erp5_configurator_standard/bt/template_keep_path_list new file mode 100644 index 0000000000..f4d7d1aead --- /dev/null +++ b/bt5/erp5_configurator_standard/bt/template_keep_path_list @@ -0,0 +1,3 @@ +portal_categories/account_type +portal_categories/financial_section +portal_categories/gap \ No newline at end of file -- 2.30.9