From 411f894caed2b922b0ff04883236557ba8ff7a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 6 Apr 2018 09:59:59 +0200 Subject: [PATCH] *: move Predicate as allowed content type of Rule to legacy This was used to control predicate matrix of Accounting Rule Cells, which is not longer used in new simulation. --- .../allowed_content_types.xml | 1 - .../bt/template_portal_type_allowed_content_type_list | 1 - .../allowed_content_types.xml | 2 ++ .../bt/template_portal_type_allowed_content_type_list | 4 +++- .../allowed_content_types.xml | 1 - .../bt/template_portal_type_allowed_content_type_list | 1 - 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index d92d5d26a9..5c2c539824 100644 --- a/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -48,7 +48,6 @@ <item>DateTime Divergence Tester</item> <item>Float Divergence Tester</item> <item>Net Converted Quantity Divergence Tester</item> - <item>Predicate</item> <item>Specialise Divergence Tester</item> <item>String Divergence Tester</item> <item>Variation Divergence Tester</item> diff --git a/bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list index 8e566a6910..db2a9ebb2a 100644 --- a/bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list @@ -28,7 +28,6 @@ Payment Simulation Rule | Category Membership Divergence Tester Payment Simulation Rule | DateTime Divergence Tester Payment Simulation Rule | Float Divergence Tester Payment Simulation Rule | Net Converted Quantity Divergence Tester -Payment Simulation Rule | Predicate Payment Simulation Rule | Specialise Divergence Tester Payment Simulation Rule | String Divergence Tester Payment Simulation Rule | Variation Divergence Tester diff --git a/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 348c7492d3..d29adb7aff 100644 --- a/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_accounting_simulation_legacy/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -5,8 +5,10 @@ </portal_type> <portal_type id="Invoice Transaction Simulation Rule"> <item>Accounting Rule Cell</item> + <item>Predicate</item> </portal_type> <portal_type id="Payment Simulation Rule"> <item>Accounting Rule Cell</item> + <item>Predicate</item> </portal_type> </allowed_content_type_list> \ No newline at end of file diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list index 1de67a8c1b..90fda05ef2 100644 --- a/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_accounting_simulation_legacy/bt/template_portal_type_allowed_content_type_list @@ -1,4 +1,6 @@ Accounting Rule Cell | Accounting Rule Cell Line Accounting Rule Cell | Accounting Transaction Line Invoice Transaction Simulation Rule | Accounting Rule Cell -Payment Simulation Rule | Accounting Rule Cell \ No newline at end of file +Invoice Transaction Simulation Rule | Predicate +Payment Simulation Rule | Accounting Rule Cell +Payment Simulation Rule | Predicate \ No newline at end of file diff --git a/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 42c55e84d9..58dbd63c78 100644 --- a/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -17,7 +17,6 @@ <item>DateTime Divergence Tester</item> <item>Float Divergence Tester</item> <item>Net Converted Quantity Divergence Tester</item> - <item>Predicate</item> <item>Specialise Divergence Tester</item> <item>String Divergence Tester</item> <item>Variation Divergence Tester</item> diff --git a/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list index dd7d974cf2..b16c397725 100644 --- a/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list @@ -11,7 +11,6 @@ Invoice Transaction Simulation Rule | Category Membership Divergence Tester Invoice Transaction Simulation Rule | DateTime Divergence Tester Invoice Transaction Simulation Rule | Float Divergence Tester Invoice Transaction Simulation Rule | Net Converted Quantity Divergence Tester -Invoice Transaction Simulation Rule | Predicate Invoice Transaction Simulation Rule | Specialise Divergence Tester Invoice Transaction Simulation Rule | String Divergence Tester Invoice Transaction Simulation Rule | Variation Divergence Tester -- 2.30.9