From ddefa2043937e3ea1814b3d2aa36cd24e8a41183 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Wed, 5 Jun 2019 15:06:23 +0900 Subject: [PATCH 1/9] erp5_tiosafe_virtuemart_test: Reduce document duplication. currency_module/euro is also present in erp5_tiosafe_test, which is already installed in the same unit test. So add a dependency on that BT and remove the duplication. --- .../PathTemplateItem/currency_module/euro.xml | 90 ------------------- .../bt/dependency_list | 1 + .../bt/template_keep_path_list | 1 + .../bt/template_path_list | 2 +- 4 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 bt5/erp5_tiosafe_virtuemart_test/PathTemplateItem/currency_module/euro.xml create mode 100644 bt5/erp5_tiosafe_virtuemart_test/bt/dependency_list create mode 100644 bt5/erp5_tiosafe_virtuemart_test/bt/template_keep_path_list diff --git a/bt5/erp5_tiosafe_virtuemart_test/PathTemplateItem/currency_module/euro.xml b/bt5/erp5_tiosafe_virtuemart_test/PathTemplateItem/currency_module/euro.xml deleted file mode 100644 index d450cd22114..00000000000 --- a/bt5/erp5_tiosafe_virtuemart_test/PathTemplateItem/currency_module/euro.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - _Access_contents_information_Permission - - - Assignee - Assignor - Associate - Auditor - Author - Manager - Owner - - - - - _Add_portal_content_Permission - - - Assignee - Assignor - Associate - Author - Manager - Owner - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Associate - Author - Manager - Owner - - - - - _View_Permission - - - Assignee - Assignor - Associate - Auditor - Author - Manager - Owner - - - - - base_unit_quantity - 0.01 - - - default_reference - EUR - - - id - euro - - - portal_type - Currency - - - short_title - € - - - title - Euro - - - - - diff --git a/bt5/erp5_tiosafe_virtuemart_test/bt/dependency_list b/bt5/erp5_tiosafe_virtuemart_test/bt/dependency_list new file mode 100644 index 00000000000..f5f4a5212fc --- /dev/null +++ b/bt5/erp5_tiosafe_virtuemart_test/bt/dependency_list @@ -0,0 +1 @@ +erp5_tiosafe_test \ No newline at end of file diff --git a/bt5/erp5_tiosafe_virtuemart_test/bt/template_keep_path_list b/bt5/erp5_tiosafe_virtuemart_test/bt/template_keep_path_list new file mode 100644 index 00000000000..454d5c34778 --- /dev/null +++ b/bt5/erp5_tiosafe_virtuemart_test/bt/template_keep_path_list @@ -0,0 +1 @@ +currency_module/euro \ No newline at end of file diff --git a/bt5/erp5_tiosafe_virtuemart_test/bt/template_path_list b/bt5/erp5_tiosafe_virtuemart_test/bt/template_path_list index 5c548048b06..33402fa0caa 100644 --- a/bt5/erp5_tiosafe_virtuemart_test/bt/template_path_list +++ b/bt5/erp5_tiosafe_virtuemart_test/bt/template_path_list @@ -1,4 +1,4 @@ -currency_module/** +currency_module/1 portal_categories/role/client portal_categories/role/virtuemart_delivery portal_integrations/virtuemart/Collection** -- 2.30.9 From 683e01913501abc7824c8ef834a1cb6010404ec0 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Wed, 5 Jun 2019 15:10:53 +0900 Subject: [PATCH 2/9] erp5_tiosafe_ubercart_test: Reduce document duplication. region/europe/western_europe is also present in erp5_tiosafe_test, which is already installed in the same unit test. So add a dependency on that BT and remove the duplication. --- .../region/europe/western_europe.xml | 111 ------------------ .../europe/western_europe/allemagne.xml | 71 ----------- .../bt/dependency_list | 1 + .../bt/template_keep_path_list | 2 + .../bt/template_path_list | 6 +- 5 files changed, 8 insertions(+), 183 deletions(-) delete mode 100644 bt5/erp5_tiosafe_ubercart_test/PathTemplateItem/portal_categories/region/europe/western_europe.xml delete mode 100644 bt5/erp5_tiosafe_ubercart_test/PathTemplateItem/portal_categories/region/europe/western_europe/allemagne.xml create mode 100644 bt5/erp5_tiosafe_ubercart_test/bt/dependency_list create mode 100644 bt5/erp5_tiosafe_ubercart_test/bt/template_keep_path_list diff --git a/bt5/erp5_tiosafe_ubercart_test/PathTemplateItem/portal_categories/region/europe/western_europe.xml b/bt5/erp5_tiosafe_ubercart_test/PathTemplateItem/portal_categories/region/europe/western_europe.xml deleted file mode 100644 index af857662369..00000000000 --- a/bt5/erp5_tiosafe_ubercart_test/PathTemplateItem/portal_categories/region/europe/western_europe.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - _Add_portal_content_Permission - - - Assignor - Manager - - - - - _Add_portal_folders_Permission - - - Assignor - Manager - - - - - _Copy_or_Move_Permission - - - Assignor - Manager - - - - - _Delete_objects_Permission - - - Assignor - Manager - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Manager - Owner - - - - - _count - - AAAAAAAAAAI= - - - - _mt_index - - AAAAAAAAAAM= - - - - _tree - - AAAAAAAAAAQ= - - - - id - western_europe - - - portal_type - Category - - - title - Western Europe - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - diff --git a/bt5/erp5_tiosafe_ubercart_test/PathTemplateItem/portal_categories/region/europe/western_europe/allemagne.xml b/bt5/erp5_tiosafe_ubercart_test/PathTemplateItem/portal_categories/region/europe/western_europe/allemagne.xml deleted file mode 100644 index 29e6bc52e04..00000000000 --- a/bt5/erp5_tiosafe_ubercart_test/PathTemplateItem/portal_categories/region/europe/western_europe/allemagne.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - _Add_portal_content_Permission - - - Assignor - Manager - - - - - _Add_portal_folders_Permission - - - Assignor - Manager - - - - - _Copy_or_Move_Permission - - - Assignor - Manager - - - - - _Delete_objects_Permission - - - Assignor - Manager - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Manager - Owner - - - - - id - allemagne - - - portal_type - Category - - - title - Allemagne - - - - - diff --git a/bt5/erp5_tiosafe_ubercart_test/bt/dependency_list b/bt5/erp5_tiosafe_ubercart_test/bt/dependency_list new file mode 100644 index 00000000000..f5f4a5212fc --- /dev/null +++ b/bt5/erp5_tiosafe_ubercart_test/bt/dependency_list @@ -0,0 +1 @@ +erp5_tiosafe_test \ No newline at end of file diff --git a/bt5/erp5_tiosafe_ubercart_test/bt/template_keep_path_list b/bt5/erp5_tiosafe_ubercart_test/bt/template_keep_path_list new file mode 100644 index 00000000000..23686c888ba --- /dev/null +++ b/bt5/erp5_tiosafe_ubercart_test/bt/template_keep_path_list @@ -0,0 +1,2 @@ +portal_categories/region/europe/western_europe +portal_categories/region/europe/western_europe/allemagne \ No newline at end of file diff --git a/bt5/erp5_tiosafe_ubercart_test/bt/template_path_list b/bt5/erp5_tiosafe_ubercart_test/bt/template_path_list index 00e7b98cd32..8af3e475cd4 100644 --- a/bt5/erp5_tiosafe_ubercart_test/bt/template_path_list +++ b/bt5/erp5_tiosafe_ubercart_test/bt/template_path_list @@ -1,5 +1,9 @@ portal_categories/payment_mode/** -portal_categories/region/** +portal_categories/region/afrique +portal_categories/region/afrique/** +portal_categories/region/europe +portal_categories/region/united_states +portal_categories/region/france portal_categories/role/client portal_categories/role/ubercart_delivery portal_integrations/ubercart/Catalog** -- 2.30.9 From de32ba3174a15bf0b2ba97c29dd5e55fe74126d3 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Wed, 5 Jun 2019 15:21:09 +0900 Subject: [PATCH 3/9] erp5_credential: Reduce document duplication. This BT achieved the rare feat of containing the same document twice. --- .../portal_categories/question.xml | 117 ------------------ .../bt/template_keep_path_list | 1 + bt5/erp5_credential/bt/template_path_list | 1 - 3 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 bt5/erp5_credential/PathTemplateItem/portal_categories/question.xml create mode 100644 bt5/erp5_credential/bt/template_keep_path_list diff --git a/bt5/erp5_credential/PathTemplateItem/portal_categories/question.xml b/bt5/erp5_credential/PathTemplateItem/portal_categories/question.xml deleted file mode 100644 index a52efda49f6..00000000000 --- a/bt5/erp5_credential/PathTemplateItem/portal_categories/question.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - _Add_portal_content_Permission - - - Assignor - Manager - - - - - _Add_portal_folders_Permission - - - Assignor - Manager - - - - - _Copy_or_Move_Permission - - - Assignor - Manager - - - - - _Delete_objects_Permission - - - Assignor - Manager - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Manager - Owner - - - - - _count - - AAAAAAAAAAI= - - - - _mt_index - - AAAAAAAAAAM= - - - - _tree - - AAAAAAAAAAQ= - - - - description - - - - - - id - question - - - portal_type - Base Category - - - title - Question - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - diff --git a/bt5/erp5_credential/bt/template_keep_path_list b/bt5/erp5_credential/bt/template_keep_path_list new file mode 100644 index 00000000000..ac16f177804 --- /dev/null +++ b/bt5/erp5_credential/bt/template_keep_path_list @@ -0,0 +1 @@ +portal_categories/question \ No newline at end of file diff --git a/bt5/erp5_credential/bt/template_path_list b/bt5/erp5_credential/bt/template_path_list index 8c3207fe070..ee9d687ab12 100644 --- a/bt5/erp5_credential/bt/template_path_list +++ b/bt5/erp5_credential/bt/template_path_list @@ -5,6 +5,5 @@ notification_message_module/20110426-1B7D notification_message_module/credential_recovery-username.en notification_message_module/credential_request-subscription portal_alarms/accept_submitted_credentials -portal_categories/question portal_categories/question/credential portal_categories/question/credential/** \ No newline at end of file -- 2.30.9 From a3ae2b1436f45b6788b5a1c5fa3f9440035f5b7a Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Wed, 5 Jun 2019 16:19:03 +0900 Subject: [PATCH 4/9] erp5_consulting: Reduce document duplication. requirement is also present in erp5_project. So add a dependency on that BT and remove the duplication. --- .../portal_categories/requirement.xml | 198 ------------------ bt5/erp5_consulting/bt/dependency_list | 1 + .../bt/template_base_category_list | 1 - .../bt/template_keep_path_list | 1 + 4 files changed, 2 insertions(+), 199 deletions(-) delete mode 100644 bt5/erp5_consulting/CategoryTemplateItem/portal_categories/requirement.xml create mode 100644 bt5/erp5_consulting/bt/dependency_list create mode 100644 bt5/erp5_consulting/bt/template_keep_path_list diff --git a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/requirement.xml b/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/requirement.xml deleted file mode 100644 index d3c44bfccf7..00000000000 --- a/bt5/erp5_consulting/CategoryTemplateItem/portal_categories/requirement.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - _Add_portal_content_Permission - - - Assignor - Manager - - - - - _Add_portal_folders_Permission - - - Assignor - Manager - - - - - _Copy_or_Move_Permission - - - Assignor - Manager - - - - - _Delete_objects_Permission - - - Assignor - Manager - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Manager - - - - - acquisition_append_value - 0 - - - acquisition_base_category - - - - - - acquisition_copy_value - 0 - - - acquisition_mask_value - 1 - - - acquisition_object_id - - - - - - acquisition_portal_type - python: [] - - - acquisition_sync_value - 0 - - - categories - - - requirement - - - - - category_type - - - - - - criterion_property - - - - - - description - - - - fallback_base_category - - - - - - id - requirement - - - id_generator - - - - - - id_group - - - - - - membership_criterion_base_category - - - - - - membership_criterion_category - - - - - - multimembership_criterion_base_category - - - - - - portal_type - Base Category - - - read_permission - - - - - - rid - - - - - - short_title - - - - - - sid - - - - - - test_method_id - - - - - - title - Requirement - - - write_permission - - - - - - - - diff --git a/bt5/erp5_consulting/bt/dependency_list b/bt5/erp5_consulting/bt/dependency_list new file mode 100644 index 00000000000..5baeafc5b12 --- /dev/null +++ b/bt5/erp5_consulting/bt/dependency_list @@ -0,0 +1 @@ +erp5_project \ No newline at end of file diff --git a/bt5/erp5_consulting/bt/template_base_category_list b/bt5/erp5_consulting/bt/template_base_category_list index b600646645a..08eb7f32501 100644 --- a/bt5/erp5_consulting/bt/template_base_category_list +++ b/bt5/erp5_consulting/bt/template_base_category_list @@ -2,5 +2,4 @@ document_analysis_document_type lexicon_item_type lexicon_item_ubm lexicon_source_type -requirement use_case_actor_role \ No newline at end of file diff --git a/bt5/erp5_consulting/bt/template_keep_path_list b/bt5/erp5_consulting/bt/template_keep_path_list new file mode 100644 index 00000000000..dfa160501cf --- /dev/null +++ b/bt5/erp5_consulting/bt/template_keep_path_list @@ -0,0 +1 @@ +portal_categories/requirement \ No newline at end of file -- 2.30.9 From ca8959233fe1ee91e5488e960f93846372c6db33 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Wed, 5 Jun 2019 16:21:52 +0900 Subject: [PATCH 5/9] erp5_dms_ui_test: Reduce document duplication. classification is already provided by erp5_dms, which is a dependency of this BT already. --- .../portal_categories/classification.xml | 237 ------------------ .../bt/template_keep_path_list | 1 + bt5/erp5_dms_ui_test/bt/template_path_list | 1 - 3 files changed, 1 insertion(+), 238 deletions(-) delete mode 100644 bt5/erp5_dms_ui_test/PathTemplateItem/portal_categories/classification.xml create mode 100644 bt5/erp5_dms_ui_test/bt/template_keep_path_list diff --git a/bt5/erp5_dms_ui_test/PathTemplateItem/portal_categories/classification.xml b/bt5/erp5_dms_ui_test/PathTemplateItem/portal_categories/classification.xml deleted file mode 100644 index 609338a43eb..00000000000 --- a/bt5/erp5_dms_ui_test/PathTemplateItem/portal_categories/classification.xml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - _Add_portal_content_Permission - - - Assignor - Manager - - - - - _Add_portal_folders_Permission - - - Assignor - Manager - - - - - _Copy_or_Move_Permission - - - Assignor - Manager - - - - - _Delete_objects_Permission - - - Assignor - Manager - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Manager - Owner - - - - - _count - - AAAAAAAAAAI= - - - - _mt_index - - AAAAAAAAAAM= - - - - _tree - - AAAAAAAAAAQ= - - - - acquisition_append_value - 0 - - - acquisition_base_category - - - - - - acquisition_copy_value - 0 - - - acquisition_mask_value - 1 - - - acquisition_object_id - - - - - - acquisition_portal_type - python: [] - - - acquisition_sync_value - 0 - - - categories - - - - - - category_type - - - - - - criterion_property - - - - - - description - - - - fallback_base_category - - - - - - id - classification - - - id_generator - - - - - - id_group - - - - - - membership_criterion_base_category - - - - - - membership_criterion_category - - - - - - multimembership_criterion_base_category - - - - - - portal_type - Base Category - - - read_permission - - - - - - rid - - - - - - short_title - - - - - - sid - - - - - - test_method_id - - - - - - title - Security Classification - - - write_permission - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - diff --git a/bt5/erp5_dms_ui_test/bt/template_keep_path_list b/bt5/erp5_dms_ui_test/bt/template_keep_path_list new file mode 100644 index 00000000000..b9498d8eb0a --- /dev/null +++ b/bt5/erp5_dms_ui_test/bt/template_keep_path_list @@ -0,0 +1 @@ +portal_categories/classification \ No newline at end of file diff --git a/bt5/erp5_dms_ui_test/bt/template_path_list b/bt5/erp5_dms_ui_test/bt/template_path_list index 791478fc4f2..cb096ac3a3f 100644 --- a/bt5/erp5_dms_ui_test/bt/template_path_list +++ b/bt5/erp5_dms_ui_test/bt/template_path_list @@ -1,5 +1,4 @@ document_module/test_pdf -portal_categories/classification portal_categories/classification/** portal_tests/dms_zuite portal_tests/dms_zuite/** \ No newline at end of file -- 2.30.9 From 38d4ae67385220866a8218060ef418f901ee7d7b Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Fri, 7 Jun 2019 15:19:00 +0900 Subject: [PATCH 6/9] erp5_banking_core: Reduce portal type and Base Category duplication. Bank Account, Currency{, Module}, Currency Exchange {Cell,Line} already exist in erp5_base, which is a dependency of this Business Template at least through erp5_trade. "composition" and "variation" Base Categories exist in erp5_pdm, which is a dependency of this Business Template via erp5_trade. "site" Base Category exists in erp5_base, which is a dependency of this Business Template via erp5_trade. --- .../portal_categories/composition.xml | 60 ------ .../portal_categories/site.xml | 83 -------- .../portal_categories/variation.xml | 199 ------------------ .../portal_types/Bank%20Account.xml | 82 -------- .../Currency%20Exchange%20Cell.xml | 66 ------ .../Currency%20Exchange%20Line.xml | 76 ------- .../portal_types/Currency%20Module.xml | 94 --------- .../portal_types/Currency.xml | 80 ------- .../bt/template_base_category_list | 3 - .../bt/template_keep_path_list | 8 + .../bt/template_portal_type_id_list | 7 +- 11 files changed, 9 insertions(+), 749 deletions(-) delete mode 100644 bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/composition.xml delete mode 100644 bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/site.xml delete mode 100644 bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/variation.xml delete mode 100644 bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml delete mode 100644 bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml delete mode 100644 bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml delete mode 100644 bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Module.xml delete mode 100644 bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency.xml create mode 100644 bt5/erp5_banking_core/bt/template_keep_path_list diff --git a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/composition.xml b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/composition.xml deleted file mode 100644 index ba0e738be70..00000000000 --- a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/composition.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - _count - - AAAAAAAAAAI= - - - - _mt_index - - AAAAAAAAAAM= - - - - _tree - - AAAAAAAAAAQ= - - - - id - composition - - - portal_type - Base Category - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - diff --git a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/site.xml b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/site.xml deleted file mode 100644 index 1895c94a515..00000000000 --- a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/site.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - _count - - AAAAAAAAAAI= - - - - _mt_index - - AAAAAAAAAAM= - - - - _tree - - AAAAAAAAAAQ= - - - - acquisition_base_category - - - subordination - parent - - - - - acquisition_portal_type - python:[\'Organisation\',\'Person\'] - - - description - - - - - - id - site - - - portal_type - Base Category - - - title - Site - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - diff --git a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/variation.xml b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/variation.xml deleted file mode 100644 index 5ece5749528..00000000000 --- a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/variation.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - _count - - AAAAAAAAAAI= - - - - _mt_index - - AAAAAAAAAAM= - - - - _tree - - AAAAAAAAAAQ= - - - - acquisition_append_value - 0 - - - acquisition_base_category - - - specialise - delivery - order - parent - - - - - acquisition_copy_value - 0 - - - acquisition_mask_value - 1 - - - acquisition_object_id - - - - - - acquisition_portal_type - python: [] - - - acquisition_sync_value - 0 - - - categories - - - - - - category_type - - - - - - criterion_property - - - - - - description - - - - fallback_base_category - - - - - - id - variation - - - id_generator - - - - - - id_group - None - - - last_id - 1 - - - membership_criterion_base_category - - - - - - membership_criterion_category - - - - - - multimembership_criterion_base_category - - - - - - portal_type - Base Category - - - read_permission - - - - - - rid - - - - - - short_title - - - - - - sid - - - - - - test_method_id - - - - - - title - - - - - - write_permission - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - diff --git a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml b/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml deleted file mode 100644 index d06bed91ddf..00000000000 --- a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - acquire_local_roles - 1 - - - content_icon - document.gif - - - content_meta_type - ERP5 Bank Account - - - description - A bank account number holds a collection of numbers and codes (ex. SWIFT, RIB, etc.) which may be used to identify a bank account. It is owned by a Person or an Organisation. A Bank Account contains Agents with Agent Privileges used by the owner to delegate the management of the bank account to trusted third-party Persons.\n -\n -BankAccount inherits from Base and from the mix-in Coordinate. - - - factory - addBankAccount - - - filter_content_types - 1 - - - group_list - - - payment_node - - - - - id - Bank Account - - - init_script - - - - - - permission - - - - - - title - - - - type_class - BankAccount - - - type_interface - - - - - - type_mixin - - - - - - - - diff --git a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml b/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml deleted file mode 100644 index cce2b708832..00000000000 --- a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Cell.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - acquire_local_roles - 1 - - - content_icon - order_line_icon.gif - - - content_meta_type - ERP5 Supply Cell - - - description - Une ligne tarifaire. - - - factory - addSupplyCell - - - filter_content_types - 1 - - - id - Currency Exchange Cell - - - init_script - - - - - - permission - - - - - - title - - - - type_class - SupplyCell - - - type_mixin - - - - - - - - diff --git a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml b/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml deleted file mode 100644 index 33645f5e409..00000000000 --- a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - acquire_local_roles - 1 - - - content_icon - document.gif - - - content_meta_type - ERP5 Supply Line - - - description - This line can define the value of a currency towards another currency - - - factory - addSupplyLine - - - filter_content_types - 1 - - - group_list - - - - - - id - Currency Exchange Line - - - init_script - CurrencyExchangeLine_init - - - permission - - - - - - title - - - - type_class - SupplyLine - - - type_interface - - - - - - type_mixin - - - - - - - - diff --git a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Module.xml b/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Module.xml deleted file mode 100644 index d3216fc2f04..00000000000 --- a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency%20Module.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - _property_domain_dict - - - - title - - AAAAAAAAAAI= - - - - - - - acquire_local_roles - 1 - - - content_icon - folder_icon.gif - - - content_meta_type - ERP5 Folder - - - description - Holds Accounting Transaction objects - - - factory - addFolder - - - filter_content_types - 1 - - - group_list - - - module - - - - - id - Currency Module - - - init_script - - - - permission - - - - title - - - - type_class - Folder - - - - - - - - - - - - domain_name - erp5_ui - - - property_name - title - - - - - diff --git a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency.xml b/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency.xml deleted file mode 100644 index db015fcd2bf..00000000000 --- a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Currency.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - acquire_local_roles - 1 - - - content_icon - organisation_icon.gif - - - content_meta_type - ERP5 Currency - - - description - A Currency is a resource which can be credited or debited on general ledger accounts. It defines currency information, identification and exchange rates to one or multiple reference currencies. - - - factory - addCurrency - - - filter_content_types - 1 - - - group_list - - - resource - - - - - id - Currency - - - init_script - - - - - - permission - - - - - - title - - - - type_class - Currency - - - type_interface - - - - - - type_mixin - - - - - - - - diff --git a/bt5/erp5_banking_core/bt/template_base_category_list b/bt5/erp5_banking_core/bt/template_base_category_list index c8705201c4a..c2f2bca4b12 100644 --- a/bt5/erp5_banking_core/bt/template_base_category_list +++ b/bt5/erp5_banking_core/bt/template_base_category_list @@ -2,9 +2,6 @@ aggregate_resource cash_status check_amount check_type -composition emission_letter payment_type -site -variation vault_type \ No newline at end of file diff --git a/bt5/erp5_banking_core/bt/template_keep_path_list b/bt5/erp5_banking_core/bt/template_keep_path_list new file mode 100644 index 00000000000..677c981f6e1 --- /dev/null +++ b/bt5/erp5_banking_core/bt/template_keep_path_list @@ -0,0 +1,8 @@ +portal_categories/composition +portal_categories/site +portal_categories/variation +portal_types/Bank Account +portal_types/Currency +portal_types/Currency Exchange Cell +portal_types/Currency Exchange Line +portal_types/Currency Module \ No newline at end of file diff --git a/bt5/erp5_banking_core/bt/template_portal_type_id_list b/bt5/erp5_banking_core/bt/template_portal_type_id_list index d93a8f92210..fb211bfdabf 100644 --- a/bt5/erp5_banking_core/bt/template_portal_type_id_list +++ b/bt5/erp5_banking_core/bt/template_portal_type_id_list @@ -3,7 +3,6 @@ Accounting Cancellation Line Accounting Cancellation Module Accounting Date Accounting Date Module -Bank Account Banking Operation Line Banknote Cash Delivery Cell @@ -23,8 +22,4 @@ Counter Counter Date Counter Date Module Counter Module -Currency -Currency Cash Module -Currency Exchange Cell -Currency Exchange Line -Currency Module \ No newline at end of file +Currency Cash Module \ No newline at end of file -- 2.30.9 From e8e5bacb38902df194e526b463e28a2034c88212 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Mon, 24 Jun 2019 16:47:20 +0900 Subject: [PATCH 7/9] erp5_corporate_identity_test: Reduce category duplication. This BT contains the same category twice. --- .../group/template_test_group.xml | 280 ------------------ .../bt/template_base_category_list | 1 - .../bt/template_keep_path_list | 1 + 3 files changed, 1 insertion(+), 281 deletions(-) delete mode 100644 bt5/erp5_corporate_identity_test/CategoryTemplateItem/portal_categories/group/template_test_group.xml delete mode 100644 bt5/erp5_corporate_identity_test/bt/template_base_category_list diff --git a/bt5/erp5_corporate_identity_test/CategoryTemplateItem/portal_categories/group/template_test_group.xml b/bt5/erp5_corporate_identity_test/CategoryTemplateItem/portal_categories/group/template_test_group.xml deleted file mode 100644 index edacbbcbe08..00000000000 --- a/bt5/erp5_corporate_identity_test/CategoryTemplateItem/portal_categories/group/template_test_group.xml +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - _Access_contents_information_Permission - - - Anonymous - Assignee - Assignor - Associate - Auditor - Authenticated - Author - Manager - Member - Owner - Reviewer - - - - - _Add_portal_content_Permission - - - Assignor - Manager - - - - - _Add_portal_folders_Permission - - - Assignor - Manager - - - - - _Copy_or_Move_Permission - - - Assignor - Manager - - - - - _Delete_objects_Permission - - - Assignor - Manager - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Manager - - - - - _View_Permission - - - Anonymous - Assignee - Assignor - Associate - Auditor - Authenticated - Author - Manager - Member - Owner - Reviewer - - - - - categories - - - group/web - - - - - codification - TEST - - - default_reference - template-test-group - - - description - Group to associate organisations with. - - - id - template_test_group - - - int_index - 1 - - - portal_type - Category - - - short_title - Template Test Group - - - title - Tepmlate Test Group - - - workflow_history - - AAAAAAAAAAI= - - - - - - - - - - - - - data - - - - category_publication_workflow - - AAAAAAAAAAM= - - - - edit_workflow - - AAAAAAAAAAQ= - - - - - - - - - - - - - - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1537195468.01 - UTC - - - - - - - validation_state - published - - - - - - - - - - - - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 969.56682.45078.47052 - - - state - current - - - time - - - - - - - - - - - 1537195460.2 - UTC - - - - - - - - - - - diff --git a/bt5/erp5_corporate_identity_test/bt/template_base_category_list b/bt5/erp5_corporate_identity_test/bt/template_base_category_list deleted file mode 100644 index 6f2059b61ca..00000000000 --- a/bt5/erp5_corporate_identity_test/bt/template_base_category_list +++ /dev/null @@ -1 +0,0 @@ -group/template_test_group \ No newline at end of file diff --git a/bt5/erp5_corporate_identity_test/bt/template_keep_path_list b/bt5/erp5_corporate_identity_test/bt/template_keep_path_list index fe865a6e15b..bd438a686b3 100644 --- a/bt5/erp5_corporate_identity_test/bt/template_keep_path_list +++ b/bt5/erp5_corporate_identity_test/bt/template_keep_path_list @@ -7,6 +7,7 @@ bank_account_module/template_test_* person_module/template_test* person_module/template_test*/default** web_page_module/template_test_* +portal_categories/group/template_test_group portal_tests/template_test_zuite portal_tests/template_test_zuite/testAndUpdateTest* support_request_module/template_test_* \ No newline at end of file -- 2.30.9 From 63f18b7b830037cd5515b50decc64f3804fa46f3 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Mon, 24 Jun 2019 19:31:04 +0900 Subject: [PATCH 8/9] erp5_configurator_standard_categories: Reduce category duplication. trade_phase/production is already present in erp5_mrp. Add a dependency to it, and remove it from this Business Template. trade_phase/production/delivery: Likewise. Also, remove the test-dependency to erp5_mrp as it's now a regular dependency. --- bt5/erp5_configurator/bt/dependency_list | 1 + .../trade_phase/production.xml | 155 ------------------ .../trade_phase/production/delivery.xml | 115 ------------- .../bt/dependency_list | 3 +- .../bt/template_keep_path_list | 1 + .../bt/template_path_list | 6 +- .../bt/test_dependency_list | 1 - 7 files changed, 9 insertions(+), 273 deletions(-) delete mode 100644 bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_phase/production.xml delete mode 100644 bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_phase/production/delivery.xml create mode 100644 bt5/erp5_configurator_standard_categories/bt/template_keep_path_list diff --git a/bt5/erp5_configurator/bt/dependency_list b/bt5/erp5_configurator/bt/dependency_list index d88935f28fb..6290ff9781e 100644 --- a/bt5/erp5_configurator/bt/dependency_list +++ b/bt5/erp5_configurator/bt/dependency_list @@ -1,3 +1,4 @@ erp5_base +erp5_simulation erp5_workflow erp5_accounting \ No newline at end of file diff --git a/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_phase/production.xml b/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_phase/production.xml deleted file mode 100644 index 831c7aaad73..00000000000 --- a/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_phase/production.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - _Add_portal_content_Permission - - - Assignor - Manager - - - - - _Add_portal_folders_Permission - - - Assignor - Manager - - - - - _Copy_or_Move_Permission - - - Assignor - Manager - - - - - _Delete_objects_Permission - - - Assignor - Manager - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Manager - Owner - - - - - _count - - AAAAAAAAAAI= - - - - _local_properties - - - - - id - sort_index - - - type - string - - - - - - - _mt_index - - AAAAAAAAAAM= - - - - _tree - - AAAAAAAAAAQ= - - - - description - Different phases used in for production - - - effective_date - - - - - - - - - - - 1263423600.0 - GMT+1 - - - - - - - id - production - - - portal_type - Category - - - sort_index - 2 - - - title - Production - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - diff --git a/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_phase/production/delivery.xml b/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_phase/production/delivery.xml deleted file mode 100644 index c5e206681a5..00000000000 --- a/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_phase/production/delivery.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - _Add_portal_content_Permission - - - Assignor - Manager - - - - - _Add_portal_folders_Permission - - - Assignor - Manager - - - - - _Copy_or_Move_Permission - - - Assignor - Manager - - - - - _Delete_objects_Permission - - - Assignor - Manager - - - - - _Modify_portal_content_Permission - - - Assignee - Assignor - Manager - Owner - - - - - _local_properties - - - - - id - sort_index - - - type - string - - - - - - - description - Delivery of produced products - - - effective_date - - - - - - - - - - - 1263423600.0 - GMT+1 - - - - - - - id - delivery - - - portal_type - Category - - - sort_index - 3 - - - title - Delivery - - - - - diff --git a/bt5/erp5_configurator_standard_categories/bt/dependency_list b/bt5/erp5_configurator_standard_categories/bt/dependency_list index a1cf400fd7c..a429d83b400 100644 --- a/bt5/erp5_configurator_standard_categories/bt/dependency_list +++ b/bt5/erp5_configurator_standard_categories/bt/dependency_list @@ -4,4 +4,5 @@ erp5_accounting erp5_pdm erp5_dms erp5_trade -erp5_crm \ No newline at end of file +erp5_crm +erp5_mrp \ No newline at end of file diff --git a/bt5/erp5_configurator_standard_categories/bt/template_keep_path_list b/bt5/erp5_configurator_standard_categories/bt/template_keep_path_list new file mode 100644 index 00000000000..031084cdaf5 --- /dev/null +++ b/bt5/erp5_configurator_standard_categories/bt/template_keep_path_list @@ -0,0 +1 @@ +portal_categories/trade_phase/production \ No newline at end of file diff --git a/bt5/erp5_configurator_standard_categories/bt/template_path_list b/bt5/erp5_configurator_standard_categories/bt/template_path_list index aa86c182204..7d4c161ae19 100644 --- a/bt5/erp5_configurator_standard_categories/bt/template_path_list +++ b/bt5/erp5_configurator_standard_categories/bt/template_path_list @@ -30,7 +30,11 @@ portal_categories/salary_level/** portal_categories/site/** portal_categories/skill/** portal_categories/social_form/** -portal_categories/trade_phase/** +portal_categories/trade_phase/payroll +portal_categories/trade_phase/payroll/** +portal_categories/trade_phase/production/sourcing +portal_categories/trade_phase/trade +portal_categories/trade_phase/trade/** portal_categories/trade_state/** portal_categories/use/** quantity_unit_conversion_module/area_conversion_group diff --git a/bt5/erp5_real_time_inventory_accounting_test/bt/test_dependency_list b/bt5/erp5_real_time_inventory_accounting_test/bt/test_dependency_list index 11f09c85fe9..1c77fc1b05d 100644 --- a/bt5/erp5_real_time_inventory_accounting_test/bt/test_dependency_list +++ b/bt5/erp5_real_time_inventory_accounting_test/bt/test_dependency_list @@ -1,3 +1,2 @@ erp5_accounting_l10n_fr -erp5_mrp erp5_full_text_mroonga_catalog \ No newline at end of file -- 2.30.9 From 3932962803c14693d24a6a0a38c0e82fa18a4d11 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Wed, 19 Jun 2019 13:49:06 +0900 Subject: [PATCH 9/9] erp5_simulation: Reduce portal type duplication. Solver Tool portal type is also present in erp5_base, and erp5_simulation already depends on erp5_base. The alternative would be to move this to erp5_simulation along with what depends on it, which eventually includes workflows, which then break erp5_accounting (which should not depend on erp5_simulation, despite referencing workflows which do semantically belong to simulation). This change is much simpler, sufficient to not cause a regression, and this type is anyway already in erp5_base to begin with. --- .../portal_types/Solver%20Tool.xml | 121 ------------------ .../bt/template_keep_path_list | 1 + .../bt/template_portal_type_id_list | 1 - 3 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml create mode 100644 bt5/erp5_simulation/bt/template_keep_path_list diff --git a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml b/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml deleted file mode 100644 index aae3d5d61f1..00000000000 --- a/bt5/erp5_simulation/PortalTypeTemplateItem/portal_types/Solver%20Tool.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - _property_domain_dict - - - - short_title - - AAAAAAAAAAI= - - - - title - - AAAAAAAAAAM= - - - - - - - acquire_local_roles - 0 - - - content_icon - folder_icon.gif - - - content_meta_type - ERP5 Solver Tool - - - description - Solver Tool contains Solver Types - - - factory - addFolder - - - filter_content_types - 1 - - - group_list - - - module - - - - - id - Solver Tool - - - init_script - - - - - - permission - - - - - - title - - - - type_class - Folder - - - - - - - - - - - - domain_name - erp5_ui - - - property_name - short_title - - - - - - - - - - - - domain_name - erp5_ui - - - property_name - title - - - - - diff --git a/bt5/erp5_simulation/bt/template_keep_path_list b/bt5/erp5_simulation/bt/template_keep_path_list new file mode 100644 index 00000000000..9548963024c --- /dev/null +++ b/bt5/erp5_simulation/bt/template_keep_path_list @@ -0,0 +1 @@ +portal_types/Solver Tool \ No newline at end of file diff --git a/bt5/erp5_simulation/bt/template_portal_type_id_list b/bt5/erp5_simulation/bt/template_portal_type_id_list index 26ec611f48a..c4b16cd8218 100644 --- a/bt5/erp5_simulation/bt/template_portal_type_id_list +++ b/bt5/erp5_simulation/bt/template_portal_type_id_list @@ -5,7 +5,6 @@ Net Converted Quantity Divergence Tester Solver Decision Solver Process Solver Process Tool -Solver Tool Solver Type Specialise Divergence Tester String Divergence Tester -- 2.30.9