From 60ef9abc1a445a35cd48c2fc2b677b1a85197b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Wed, 19 Jul 2006 09:23:18 +0000
Subject: [PATCH] many workflow modifications

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8539 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../states/confirmed.xml                      |   2 +-
 .../states/delivered.xml                      |   2 +-
 .../states/draft.xml                          |   5 +-
 .../states/ordered.xml                        | 123 ------------------
 .../transitions/cancel.xml                    |   2 -
 .../transitions/cancel_action.xml             |   2 -
 .../transitions/confirm.xml                   |   5 +-
 .../transitions/confirm_action.xml            |   7 +-
 .../transitions/deliver.xml                   |   2 +-
 .../transitions/deliver_action.xml            |   2 +-
 .../transitions/order.xml                     | 100 --------------
 .../transitions/order_action.xml              | 100 --------------
 .../scripts/validateVaultBalance.xml          |  18 ++-
 ...ckDestination.xml => checkConsistency.xml} |  13 +-
 .../transitions/confirm_action.xml            |   2 +-
 .../states/confirmed.xml                      |   2 +-
 .../states/delivered.xml                      |   2 +-
 .../states/ordered.xml                        |  18 +--
 .../states/planned.xml                        |  18 +--
 .../transitions/cancel_action.xml             |   1 +
 .../transitions/confirm.xml                   |   4 +-
 .../transitions/confirm_action.xml            |   4 +-
 .../transitions/deliver.xml                   |   1 -
 .../transitions/order.xml                     |   4 +-
 .../transitions/order_action.xml              |   4 +-
 .../transitions/plan.xml                      |   5 +-
 .../transitions/plan_action.xml               |   5 +-
 .../transitions/plan_to_deliver_action.xml    |   4 +-
 .../scripts/validateVaultBalance.xml          |  19 ++-
 .../scripts/validateVaultBalance.xml          |  18 ++-
 30 files changed, 111 insertions(+), 383 deletions(-)
 delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/ordered.xml
 delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/order.xml
 delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/order_action.xml
 rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/{checkDestination.xml => checkConsistency.xml} (90%)

diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml
index 77ca380bf6..e6bac48ad5 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/confirmed.xml
@@ -40,7 +40,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Confirmed for cash administrator</string> </value>
+            <value> <string>Confirmed By Initiator</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml
index bd5a58144b..3b0e4f2c41 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/delivered.xml
@@ -40,7 +40,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Terminate the operation</string> </value>
+            <value> <string>Validated</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml
index 8bedfc098a..c14e11299a 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/draft.xml
@@ -48,8 +48,8 @@
               <tuple>
                 <string>cancel</string>
                 <string>cancel_action</string>
-                <string>order</string>
-                <string>order_action</string>
+                <string>confirm</string>
+                <string>confirm_action</string>
               </tuple>
             </value>
         </item>
@@ -95,6 +95,7 @@
                       <tuple>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/ordered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/ordered.xml
deleted file mode 100644
index d2c9f12234..0000000000
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/states/ordered.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>ordered</string> </value>
-        </item>
-        <item>
-            <key> <string>permission_roles</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Confirmed for teller particular</string> </value>
-        </item>
-        <item>
-            <key> <string>transitions</string> </key>
-            <value>
-              <tuple>
-                <string>cancel</string>
-                <string>cancel_action</string>
-                <string>confirm</string>
-                <string>confirm_action</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>type_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_container</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>Access contents information</string> </key>
-                    <value>
-                      <tuple>
-                        <string>Assignee</string>
-                        <string>Assignor</string>
-                        <string>Manager</string>
-                      </tuple>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>Add portal content</string> </key>
-                    <value>
-                      <tuple>
-                        <string>Manager</string>
-                      </tuple>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>Modify portal content</string> </key>
-                    <value>
-                      <tuple>
-                        <string>Manager</string>
-                      </tuple>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>View</string> </key>
-                    <value>
-                      <tuple>
-                        <string>Assignee</string>
-                        <string>Assignor</string>
-                        <string>Manager</string>
-                      </tuple>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml
index 889e6b16a6..65bdbd21c9 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel.xml
@@ -100,8 +100,6 @@
                 <string>Assignee</string>
                 <string>Assignor</string>
                 <string>Manager</string>
-                <string>DestinationAssignee</string>
-                <string>Owner</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml
index 7f39d42643..45ead40288 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/cancel_action.xml
@@ -92,8 +92,6 @@
                 <string>Assignor</string>
                 <string>Manager</string>
                 <string>Assignee</string>
-                <string>DestinationAssignee</string>
-                <string>Owner</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml
index 7d30e2e590..c88bf3c50e 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm.xml
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assign To Cash Administrator</string> </value>
+            <value> <string>Assign To Controler</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -90,7 +90,8 @@
             <value>
               <tuple>
                 <string>Manager</string>
-                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Owner</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml
index a07a5f2b0b..915f6f04ef 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/confirm_action.xml
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Cash Administrator </string> </value>
+            <value> <string>Assign To Controler Action</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assign To Cash Administrator Action</string> </value>
+            <value> <string>Assign To Controler Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -89,7 +89,8 @@
             <key> <string>roles</string> </key>
             <value>
               <tuple>
-                <string>Assignee</string>
+                <string>Assignor</string>
+                <string>Owner</string>
                 <string>Manager</string>
               </tuple>
             </value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml
index bed8729379..a44afa2313 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver.xml
@@ -89,7 +89,7 @@
             <key> <string>roles</string> </key>
             <value>
               <tuple>
-                <string>DestinationAssignee</string>
+                <string>Assignee</string>
                 <string>Manager</string>
               </tuple>
             </value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml
index 8b1b101f9d..6cf0c322b8 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/deliver_action.xml
@@ -89,7 +89,7 @@
             <key> <string>roles</string> </key>
             <value>
               <tuple>
-                <string>DestinationAssignee</string>
+                <string>Assignee</string>
                 <string>Manager</string>
               </tuple>
             </value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/order.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/order.xml
deleted file mode 100644
index b956bb089c..0000000000
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/order.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_category</string> </key>
-            <value> <string>workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Teller Particular</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>after_script_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>guard</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>order</string> </value>
-        </item>
-        <item>
-            <key> <string>new_state_id</string> </key>
-            <value> <string>ordered</string> </value>
-        </item>
-        <item>
-            <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Assign To Teller Particular</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>roles</string> </key>
-            <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/order_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/order_action.xml
deleted file mode 100644
index 00aa0ecb74..0000000000
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/transitions/order_action.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_category</string> </key>
-            <value> <string>workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Teller Particular</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=order_action</string> </value>
-        </item>
-        <item>
-            <key> <string>after_script_name</string> </key>
-            <value> <string>order</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>guard</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>order_action</string> </value>
-        </item>
-        <item>
-            <key> <string>new_state_id</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>script_name</string> </key>
-            <value> <string>validateVaultBalance</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Assign To Teller Particular Action</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>roles</string> </key>
-            <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml
index a5649a6c41..303e5205ee 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.xml
@@ -76,6 +76,19 @@ from Products.ERP5Type.Message import Message\n
 transaction = state_change.object\n
 \n
 vault = transaction.getSource()\n
+date = transaction.getStartDate()\n
+\n
+# check we are in an opened accounting day\n
+if not transaction.Baobab_checkCounterDateOpen(site=vault, date=date):\n
+  msg = Message(domain = "ui", message="Counter Date is not opened")\n
+  raise ValidationFailed, (msg,)\n
+\n
+# check counter is opened\n
+site = transaction.getSourceValue()\n
+if not context.Baobab_checkCounterOpened(site):\n
+  msg = Message(domain = "ui", message="Counter is not opened")\n
+  raise ValidationFailed, (msg,)\n
+\n
 resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Cash Delivery Line\')\n
 \n
 # Get price and total_price.\n
@@ -141,10 +154,13 @@ elif resource <> 0 :\n
                             <string>_getattr_</string>
                             <string>transaction</string>
                             <string>vault</string>
+                            <string>date</string>
+                            <string>msg</string>
+                            <string>site</string>
+                            <string>context</string>
                             <string>resource</string>
                             <string>amount</string>
                             <string>total_price</string>
-                            <string>msg</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkDestination.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
similarity index 90%
rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkDestination.xml
rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
index 77374c7b14..dbc3be990a 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkDestination.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
@@ -76,6 +76,13 @@ object = state_change.object\n
 if not \'encaisse_des_devises\' in object.getDestination():\n
   msg = Message(domain="ui", msg="Wrong Destination Selected.")\n
   raise validationFailed, (msg,)\n
+\n
+object_price = object.getSourceTotalAssetPrice()\n
+line_price = object.getTotalPrice(deliveryLineType=\'Cash Delivery Line\')\n
+\n
+if object_price != line_price:\n
+  msg = Message(domain="ui", msg="Amount differs between document and lines.")\n
+  raise validationFailed, (msg,)\n
 </string> </value>
         </item>
         <item>
@@ -86,7 +93,7 @@ if not \'encaisse_des_devises\' in object.getDestination():\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_workflow/foreign_cash_reception_workflow/scripts/checkDestination</string> </value>
+            <value> <string>Script (Python):/baobab/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -125,6 +132,8 @@ if not \'encaisse_des_devises\' in object.getDestination():\n
                             <string>object</string>
                             <string>msg</string>
                             <string>validationFailed</string>
+                            <string>object_price</string>
+                            <string>line_price</string>
                           </tuple>
                         </value>
                     </item>
@@ -141,7 +150,7 @@ if not \'encaisse_des_devises\' in object.getDestination():\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>checkDestination</string> </value>
+            <value> <string>checkConsistency</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml
index b39b542c38..fb05f0d87c 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/transitions/confirm_action.xml
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>script_name</string> </key>
-            <value> <string>checkDestination</string> </value>
+            <value> <string>checkConsistency</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml
index bb62817ec6..407d296257 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/confirmed.xml
@@ -34,7 +34,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assigned To Vault Controler</string> </value>
+            <value> <string>Assigned To Remote Site Vault Controller</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml
index f3d3871594..6629a939d6 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/delivered.xml
@@ -34,7 +34,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Validated</string> </value>
+            <value> <string>Delivered</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml
index cacb2653d7..a0a6382adf 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/ordered.xml
@@ -40,7 +40,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Assigned To  Vault Manager</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>
@@ -81,39 +81,39 @@
                 <item>
                     <key> <string>Access contents information</string> </key>
                     <value>
-                      <list>
+                      <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
-                      </list>
+                      </tuple>
                     </value>
                 </item>
                 <item>
                     <key> <string>Add portal content</string> </key>
                     <value>
-                      <list>
+                      <tuple>
                         <string>Manager</string>
-                      </list>
+                      </tuple>
                     </value>
                 </item>
                 <item>
                     <key> <string>Modify portal content</string> </key>
                     <value>
-                      <list>
+                      <tuple>
                         <string>Manager</string>
-                      </list>
+                      </tuple>
                     </value>
                 </item>
                 <item>
                     <key> <string>View</string> </key>
                     <value>
-                      <list>
+                      <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
-                      </list>
+                      </tuple>
                     </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml
index a78caf0a05..0b2323996c 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/states/planned.xml
@@ -40,7 +40,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Validated By Vault Manager</string> </value>
         </item>
         <item>
             <key> <string>transitions</string> </key>
@@ -83,37 +83,37 @@
                 <item>
                     <key> <string>Access contents information</string> </key>
                     <value>
-                      <list>
+                      <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
-                      </list>
+                      </tuple>
                     </value>
                 </item>
                 <item>
                     <key> <string>Add portal content</string> </key>
                     <value>
-                      <list>
+                      <tuple>
                         <string>Manager</string>
-                      </list>
+                      </tuple>
                     </value>
                 </item>
                 <item>
                     <key> <string>Modify portal content</string> </key>
                     <value>
-                      <list>
+                      <tuple>
                         <string>Manager</string>
-                      </list>
+                      </tuple>
                     </value>
                 </item>
                 <item>
                     <key> <string>View</string> </key>
                     <value>
-                      <list>
+                      <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
-                      </list>
+                      </tuple>
                     </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml
index 3363d7a0f9..6146817928 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/cancel_action.xml
@@ -86,6 +86,7 @@
                 <string>Assignor</string>
                 <string>DestinationAssignor</string>
                 <string>DestinationAssignee</string>
+                <string>Assignee</string>
                 <string>Manager</string>
               </tuple>
             </value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml
index 36bcf8e33c..1fe001d495 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm.xml
@@ -24,7 +24,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Remote Site Vault Controler</string> </value>
+            <value> <string>Assign To Remote Site Vault Controller</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assign To Remote Site Vault Controler</string> </value>
+            <value> <string>Assign To Remote Site Vault Controller</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml
index 56ca800819..12a7baa312 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/confirm_action.xml
@@ -24,7 +24,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Remote Site Vault Controler </string> </value>
+            <value> <string>Assign To Remote Site Vault Controller </string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assign To Remote Site Vault Controler Action</string> </value>
+            <value> <string>Assign To Remote Site Vault Controller Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml
index 990ae27e66..0c0fb13dae 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/deliver.xml
@@ -84,7 +84,6 @@
             <value>
               <tuple>
                 <string>DestinationAssignee</string>
-                <string>Assignee</string>
                 <string>Manager</string>
               </tuple>
             </value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml
index 9996c9db1e..a9b18ae819 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order.xml
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Remote Site Vault Manager</string> </value>
+            <value> <string>Assign To  Remote Site Vault Manager</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assign To Remote Site Vault Manager</string> </value>
+            <value> <string>Assign To  Remote Site Vault Manager</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml
index f362b41485..28bb0bbc74 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/order_action.xml
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Remote Site Vault Manager</string> </value>
+            <value> <string>Assign To  Remote Site Vault Manager</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assign To Remote Site Vault Manager Action</string> </value>
+            <value> <string>Assign To  Remote Site Vault Manager Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml
index 9854d7881f..a3ba0c2946 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan.xml
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Validated By Vault Manager</string> </value>
+            <value> <string>Assign To  Vault Controler</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Validated By Vault Manager</string> </value>
+            <value> <string>Assign To  Vault Controler</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -91,7 +91,6 @@
               <tuple>
                 <string>Assignor</string>
                 <string>Manager</string>
-                <string>Owner</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml
index b414eeb0ce..52029a827c 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_action.xml
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Validated By Vault Manager</string> </value>
+            <value> <string>Assign To  Vault Controler</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Validated By Vault Manager Action</string> </value>
+            <value> <string>Assign To  Vault Controler Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
@@ -91,7 +91,6 @@
               <tuple>
                 <string>Assignor</string>
                 <string>Manager</string>
-                <string>Owner</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml
index 8fc79ab169..e1aecd8400 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/transitions/plan_to_deliver_action.xml
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Validated By Vault Controler</string> </value>
+            <value> <string>Validate</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Validated By Vault Controler Action</string> </value>
+            <value> <string>Validate Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml
index f2ec2a7ce0..c556313bea 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.xml
@@ -74,8 +74,20 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
 transaction = state_change.object\n
-\n
 vault = transaction.getSource()\n
+date = transaction.getStartDate()\n
+\n
+# check we are in an opened accounting day\n
+if not transaction.Baobab_checkCounterDateOpen(site=vault, date=date):\n
+  msg = Message(domain = "ui", message="Counter Date is not opened")\n
+  raise ValidationFailed, (msg,)\n
+\n
+# check counter is opened\n
+site = transaction.getSourceValue()\n
+if not context.Baobab_checkCounterOpened(site):\n
+  msg = Message(domain = "ui", message="Counter is not opened")\n
+  raise ValidationFailed, (msg,)\n
+\n
 resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Cash Delivery Line\')\n
 \n
 # Get price and total_price.\n
@@ -141,10 +153,13 @@ elif resource <> 0 :\n
                             <string>_getattr_</string>
                             <string>transaction</string>
                             <string>vault</string>
+                            <string>date</string>
+                            <string>msg</string>
+                            <string>site</string>
+                            <string>context</string>
                             <string>resource</string>
                             <string>amount</string>
                             <string>total_price</string>
-                            <string>msg</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml
index ce255d6890..d6ba26f3f3 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/scripts/validateVaultBalance.xml
@@ -74,8 +74,19 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
 transaction = state_change.object\n
-\n
 vault = transaction.getSource()\n
+date = transaction.getStartDate()\n
+# check we are in an opened accounting day\n
+if not transaction.Baobab_checkCounterDateOpen(site=vault, date=date):\n
+  msg = Message(domain = "ui", message="Counter Date is not opened")\n
+  raise ValidationFailed, (msg,)\n
+\n
+# check counter is opened\n
+site = transaction.getSourceValue()\n
+if not context.Baobab_checkCounterOpened(site):\n
+  msg = Message(domain = "ui", message="Counter is not opened")\n
+  raise ValidationFailed, (msg,)\n
+\n
 resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Cash Delivery Line\')\n
 \n
 # Get price and total_price.\n
@@ -141,10 +152,13 @@ elif resource <> 0 :\n
                             <string>_getattr_</string>
                             <string>transaction</string>
                             <string>vault</string>
+                            <string>date</string>
+                            <string>msg</string>
+                            <string>site</string>
+                            <string>context</string>
                             <string>resource</string>
                             <string>amount</string>
                             <string>total_price</string>
-                            <string>msg</string>
                           </tuple>
                         </value>
                     </item>
-- 
2.30.9