- replaced interaction workflows by new ones in workflow chains

- accounting_workflow/scripts/Delivery_Build now uses Delivery_updateAppliedRule in its after_methid_id list

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

bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -13,11 +13,11 @@
  </chain>
  <chain>
   <type>Accounting Transaction Line</type>
-  <workflow>delivery_edit_workflow, edit_workflow</workflow>
+  <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Balance Transaction</type>
-  <workflow>accounting_workflow, edit_workflow</workflow>
+  <workflow>edit_workflow, accounting_workflow</workflow>
  </chain>
  <chain>
   <type>Balance Transaction Line</type>
@@ -25,11 +25,11 @@
  </chain>
  <chain>
   <type>Invoice Cell</type>
-  <workflow>delivery_edit_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
+  <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Invoice Line</type>
-  <workflow>delivery_edit_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
+  <workflow>delivery_movement_simulation_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Invoice Rule</type>
@@ -53,18 +53,18 @@
  </chain>
  <chain>
   <type>Purchase Invoice Transaction</type>
-  <workflow>delivery_causality_interaction_workflow, accounting_workflow, edit_workflow, delivery_edit_workflow, invoice_causality_workflow</workflow>
+  <workflow>delivery_causality_interaction_workflow, accounting_workflow, invoice_causality_workflow, delivery_simulation_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Purchase Invoice Transaction Line</type>
-  <workflow>delivery_edit_workflow, edit_workflow, delivery_movement_causality_interaction_workflow</workflow>
+  <workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Sale Invoice Transaction</type>
-  <workflow>delivery_causality_interaction_workflow, accounting_workflow, edit_workflow, delivery_edit_workflow, invoice_causality_workflow</workflow>
+  <workflow>delivery_causality_interaction_workflow, accounting_workflow, delivery_simulation_interaction_workflow, edit_workflow, invoice_causality_workflow</workflow>
  </chain>
  <chain>
   <type>Sale Invoice Transaction Line</type>
-  <workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_edit_workflow</workflow>
+  <workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow>
  </chain>
 </workflow_chain>
\ No newline at end of file

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml

@@ -120,14 +120,13 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
   # FIXME after_method_id is not enough here.\n
 \n
   # build accounting lines\n
+  method_id_list = (\'expand\', \'edit\', \'updateAppliedRule\', \'Delivery_updateAppliedRule\',\n
+      \'immediateReindexObject\', \'recursiveImmediateReindexObject\')\n
   builder.activate(\n
-      after_method_id=(\'expand\', \'updateAppliedRule\', \'edit\',\'recursiveImmediateReindexObject\', \'immediateReindexObject\'))\\\n
-      .build()\n
+      after_method_id=method_id_list).build()\n
 \n
   # build related payment transactions\n
-  portal_deliveries.payment_transaction_builder.activate(\n
-      after_method_id=(\'expand\', \'edit\', \'updateAppliedRule\', \'recursiveImmediateReindexObject\', \'immediateReindexObject\'))\\\n
-      .build()\n
+  portal_deliveries.payment_transaction_builder.activate(after_method_id=method_id_list).build()\n
 \n
   # set the object in building state.\n
   delivery.startBuilding()\n
@@ -190,6 +189,7 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n
                             <string>previous_tag</string>
                             <string>expand_tag</string>
                             <string>activate_kw</string>
+                            <string>method_id_list</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_accounting/bt/revision

-434
\ No newline at end of file
+431
\ No newline at end of file

bt5/erp5_accounting/bt/template_portal_type_workflow_chain_list

@@ -2,18 +2,19 @@ Account | account_workflow
 Account | edit_workflow
 Accounting Period | accounting_period_workflow
 Accounting Period | edit_workflow
-Accounting Transaction Line | delivery_edit_workflow
+Accounting Transaction Line | delivery_movement_causality_interaction_workflow
+Accounting Transaction Line | delivery_movement_simulation_interaction_workflow
 Accounting Transaction Line | edit_workflow
 Accounting Transaction | accounting_workflow
 Accounting Transaction | edit_workflow
 Balance Transaction Line | edit_workflow
 Balance Transaction | accounting_workflow
 Balance Transaction | edit_workflow
-Invoice Cell | delivery_edit_workflow
 Invoice Cell | delivery_movement_causality_interaction_workflow
+Invoice Cell | delivery_movement_simulation_interaction_workflow
 Invoice Cell | edit_workflow
-Invoice Line | delivery_edit_workflow
 Invoice Line | delivery_movement_causality_interaction_workflow
+Invoice Line | delivery_movement_simulation_interaction_workflow
 Invoice Line | edit_workflow
 Invoice Line | trade_matrix_workflow
 Invoice Rule | edit_workflow
@@ -23,19 +24,19 @@ Invoicing Rule | edit_workflow
 Payment Rule | edit_workflow
 Payment Transaction | accounting_workflow
 Payment Transaction | edit_workflow
-Purchase Invoice Transaction Line | delivery_edit_workflow
 Purchase Invoice Transaction Line | delivery_movement_causality_interaction_workflow
+Purchase Invoice Transaction Line | delivery_movement_simulation_interaction_workflow
 Purchase Invoice Transaction Line | edit_workflow
 Purchase Invoice Transaction | accounting_workflow
 Purchase Invoice Transaction | delivery_causality_interaction_workflow
-Purchase Invoice Transaction | delivery_edit_workflow
+Purchase Invoice Transaction | delivery_simulation_interaction_workflow
 Purchase Invoice Transaction | edit_workflow
 Purchase Invoice Transaction | invoice_causality_workflow
-Sale Invoice Transaction Line | delivery_edit_workflow
 Sale Invoice Transaction Line | delivery_movement_causality_interaction_workflow
+Sale Invoice Transaction Line | delivery_movement_simulation_interaction_workflow
 Sale Invoice Transaction Line | edit_workflow
 Sale Invoice Transaction | accounting_workflow
 Sale Invoice Transaction | delivery_causality_interaction_workflow
-Sale Invoice Transaction | delivery_edit_workflow
+Sale Invoice Transaction | delivery_simulation_interaction_workflow
 Sale Invoice Transaction | edit_workflow
 Sale Invoice Transaction | invoice_causality_workflow
\ No newline at end of file