invoice_rule is needed in standalone accounting, move it back from...

invoice_rule is needed in standalone accounting, move it back from erp5_invoicing to erp5_accounting

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18145 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -18,6 +18,11 @@
  <portal_type id="Balance Transaction">
   <item>Balance Transaction Line</item>
  </portal_type>
+ <portal_type id="Invoice Rule">
+  <item>Property Divergence Tester</item>
+  <item>Category Divergence Tester</item>
+  <item>Quantity Divergence Tester</item>
+ </portal_type>
  <portal_type id="Organisation">
   <item>Accounting Period</item>
   <item>Cash Register</item>
@@ -40,6 +45,7 @@
   <item>Purchase Invoice Transaction Line</item>
  </portal_type>
  <portal_type id="Rule Tool">
+  <item>Invoice Rule</item>
   <item>Payment Rule</item>
  </portal_type>
  <portal_type id="Sale Invoice Transaction">

bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -23,6 +23,10 @@
   <type>Balance Transaction Line</type>
   <workflow>edit_workflow</workflow>
  </chain>
+ <chain>
+  <type>Invoice Rule</type>
+  <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
  <chain>
   <type>Payment Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>
@@ -37,7 +41,7 @@
  </chain>
  <chain>
   <type>Purchase Invoice Transaction Line</type>
-  <workflow>delivery_movement_causality_interaction_workflow, edit_workflow, delivery_movement_simulation_interaction_workflow</workflow>
+  <workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Sale Invoice Transaction</type>

bt5/erp5_accounting/bt/revision

-519
\ No newline at end of file
+522
\ No newline at end of file

bt5/erp5_accounting/bt/template_action_path_list

@@ -46,6 +46,7 @@ Bank Account | transactions
 Cash Register | jump_active_accounting_pref
 Cash Register | transactions
 Cash Register | view
+Invoice Rule | view
 Organisation | jump_active_accounting_pref
 Organisation | jump_to_accounting
 Organisation | transactions

bt5/erp5_accounting/bt/template_path_list

 portal_categories/account_type/**
 portal_categories/financial_section/*
 portal_deliveries/payment_transaction_builder
+portal_rules/default_invoice_rule
+portal_rules/default_invoice_rule/**
 portal_rules/default_payment_rule
 portal_rules/default_payment_rule/**
\ No newline at end of file

bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list

@@ -7,6 +7,9 @@ Accounting Transaction Module | Purchase Invoice Transaction
 Accounting Transaction Module | Sale Invoice Transaction
 Accounting Transaction | Accounting Transaction Line
 Balance Transaction | Balance Transaction Line
+Invoice Rule | Category Divergence Tester
+Invoice Rule | Property Divergence Tester
+Invoice Rule | Quantity Divergence Tester
 Organisation | Accounting Period
 Organisation | Cash Register
 Payment Rule | Category Divergence Tester
@@ -18,5 +21,6 @@ Preference | Payment Transaction
 Preference | Purchase Invoice Transaction
 Preference | Sale Invoice Transaction
 Purchase Invoice Transaction | Purchase Invoice Transaction Line
+Rule Tool | Invoice Rule
 Rule Tool | Payment Rule
 Sale Invoice Transaction | Sale Invoice Transaction Line
\ No newline at end of file

bt5/erp5_accounting/bt/template_portal_type_id_list

@@ -8,6 +8,7 @@ Accounting Transaction Module
 Balance Transaction
 Balance Transaction Line
 Cash Register
+Invoice Rule
 Payment Rule
 Payment Transaction
 Purchase Invoice Transaction

bt5/erp5_accounting/bt/template_portal_type_workflow_chain_list

@@ -10,6 +10,8 @@ Accounting Transaction | edit_workflow
 Balance Transaction Line | edit_workflow
 Balance Transaction | accounting_workflow
 Balance Transaction | edit_workflow
+Invoice Rule | edit_workflow
+Invoice Rule | rule_validation_workflow
 Payment Rule | edit_workflow
 Payment Rule | rule_validation_workflow
 Payment Transaction | accounting_workflow

bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

 <allowed_content_type_list>
  <portal_type id="Invoice Line">
-  <item>Discount</item>
   <item>Invoice Cell</item>
- </portal_type>
- <portal_type id="Invoice Rule">
-  <item>Category Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
-  <item>Property Divergence Tester</item>
+  <item>Discount</item>
  </portal_type>
  <portal_type id="Invoice Transaction Rule">
   <item>Category Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
-  <item>Predicate</item>
   <item>Accounting Rule Cell</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>Quantity Divergence Tester</item>
-  <item>Property Divergence Tester</item>
  </portal_type>
  <portal_type id="Purchase Invoice Transaction">
   <item>Discount</item>
@@ -26,13 +21,12 @@
   <item>Invoice Line</item>
  </portal_type>
  <portal_type id="Rule Tool">
-  <item>Invoice Rule</item>
   <item>Invoice Transaction Rule</item>
   <item>Invoicing Rule</item>
  </portal_type>
  <portal_type id="Sale Invoice Transaction">
-  <item>Payment Condition</item>
   <item>Discount</item>
+  <item>Payment Condition</item>
   <item>Invoice Line</item>
  </portal_type>
 </allowed_content_type_list>
\ No newline at end of file

bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -7,10 +7,6 @@
   <type>Invoice Line</type>
   <workflow>delivery_movement_simulation_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
  </chain>
- <chain>
-  <type>Invoice Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
  <chain>
   <type>Invoice Transaction Rule</type>
   <workflow>rule_interaction_workflow, rule_validation_workflow, edit_workflow</workflow>

bt5/erp5_invoicing/bt/revision

-6
\ No newline at end of file
+10
\ No newline at end of file

bt5/erp5_invoicing/bt/template_action_path_list

@@ -4,7 +4,6 @@ Invoice Line | list
 Invoice Line | price
 Invoice Line | quantity
 Invoice Line | view
-Invoice Rule | view
 Invoice Transaction Rule | divergence
 Invoice Transaction Rule | view
 Invoicing Rule | view

bt5/erp5_invoicing/bt/template_path_list

 portal_deliveries/sale_invoice_builder
 portal_deliveries/sale_invoice_transaction_builder
-portal_rules/default_invoice_rule
-portal_rules/default_invoice_rule/**
 portal_rules/default_invoice_transaction_rule
 portal_rules/default_invoice_transaction_rule/**
 portal_rules/default_invoicing_rule

bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list

 Invoice Line | Discount
 Invoice Line | Invoice Cell
 Invoice Line | Invoice Cell
-Invoice Rule | Category Divergence Tester
-Invoice Rule | Property Divergence Tester
-Invoice Rule | Quantity Divergence Tester
 Invoice Transaction Rule | Accounting Rule Cell
 Invoice Transaction Rule | Category Divergence Tester
 Invoice Transaction Rule | Predicate
@@ -15,7 +12,6 @@ Invoicing Rule | Quantity Divergence Tester
 Purchase Invoice Transaction | Discount
 Purchase Invoice Transaction | Invoice Line
 Purchase Invoice Transaction | Payment Condition
-Rule Tool | Invoice Rule
 Rule Tool | Invoice Transaction Rule
 Rule Tool | Invoicing Rule
 Sale Invoice Transaction | Discount

bt5/erp5_invoicing/bt/template_portal_type_id_list

 Invoice Cell
 Invoice Line
-Invoice Rule
 Invoice Transaction Rule
 Invoicing Rule
\ No newline at end of file

bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list

@@ -6,8 +6,6 @@ Invoice Line | delivery_movement_simulation_interaction_workflow
 Invoice Line | edit_workflow
 Invoice Line | pricing_interaction_workflow
 Invoice Line | trade_matrix_workflow
-Invoice Rule | edit_workflow
-Invoice Rule | rule_validation_workflow
 Invoice Transaction Rule | edit_workflow
 Invoice Transaction Rule | rule_interaction_workflow
 Invoice Transaction Rule | rule_validation_workflow