From c15a645892153fe1ef88942b5c10455a44d4d4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 30 Oct 2009 13:46:05 +0000 Subject: [PATCH] allowed content types, hidden content types and workflow chains are now sorted git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30152 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../allowed_content_types.xml | 8 ++++---- .../hidden_content_type_list.xml | 2 +- .../workflow_chain_type.xml | 4 ++-- bt5/erp5_invoicing/bt/revision | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 603d889b89..4a3b021c06 100644 --- a/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -4,21 +4,21 @@ <item>Invoice Line</item> </portal_type> <portal_type id="Invoice Transaction Rule"> - <item>Category Divergence Tester</item> <item>Accounting Rule Cell</item> + <item>Category Divergence Tester</item> + <item>Predicate</item> <item>Property Divergence Tester</item> <item>Quantity Divergence Tester</item> - <item>Predicate</item> </portal_type> <portal_type id="Invoicing Rule"> - <item>Property Divergence Tester</item> <item>Category Divergence Tester</item> + <item>Property Divergence Tester</item> <item>Quantity Divergence Tester</item> </portal_type> <portal_type id="Rule Tool"> + <item>Invoice Transaction Rule</item> <item>Invoicing Rule</item> <item>Trade Model Rule</item> - <item>Invoice Transaction Rule</item> </portal_type> <portal_type id="Trade Model Rule"> <item>Category Divergence Tester</item> diff --git a/bt5/erp5_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml index b297588dee..28014f412c 100644 --- a/bt5/erp5_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml +++ b/bt5/erp5_invoicing/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml @@ -1,7 +1,7 @@ <hidden_content_type_list> <portal_type id="Invoice Line"> - <item>Invoice Line</item> <item>Invoice Cell</item> + <item>Invoice Line</item> </portal_type> <portal_type id="Invoice Transaction Rule"> <item>Accounting Rule Cell</item> diff --git a/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index f20fb81d12..0176340f52 100644 --- a/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -1,11 +1,11 @@ <workflow_chain> <chain> <type>Invoice Cell</type> - <workflow>pricing_interaction_workflow, delivery_movement_account_interaction_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow> + <workflow>delivery_movement_account_interaction_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, pricing_interaction_workflow</workflow> </chain> <chain> <type>Invoice Line</type> - <workflow>delivery_movement_simulation_interaction_workflow, delivery_movement_account_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow, movement_base_contribution_interaction_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow> + <workflow>delivery_movement_account_interaction_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, movement_base_contribution_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow</workflow> </chain> <chain> <type>Invoice Transaction Rule</type> diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index a540f59f28..2c136b29b5 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -301 \ No newline at end of file +302 \ No newline at end of file -- 2.30.9