diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/portal_type.xml
index e32dfbdabe808c6617681fedd14090c9f77d15f8..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/variables/portal_type.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>default_value</string> </key>
-            <value> <string>Cash Sorting</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml
index 24d1e9451408058af9df386c3beda7aa0c23ec4c..a71b4566c8251a34d8950014e4081fc9e3468456 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=confimed&portal_type=Account Incident&reset=1
+Base_viewWorklist?cash_sorting_state=confimed&portal_type=Account Incident&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/draft.xml
index 1af94659b56a6dce1c7e445e2b4bef70131c3dd0..ade5e3d20f22265b2174d2b19d4e587d9e5738bf 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/account_incident_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=draft&portal_type=Account Incident&reset=1
+Base_viewWorklist?cash_sorting_state=draft&portal_type=Account Incident&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/portal_type.xml
index 2ecf5517bdfdbd91287da00daf207c3f8673f5c7..14b33fc0fff99c57eb0a39649e1906e5af986dfa 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/portal_type.xml
@@ -44,7 +44,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/confirmed.xml
index b29f797a63926a421a511ebe49527708f4730140..f08bb9c34dc4db4054b6a8cab78bd190e9d46fbd 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/confirmed.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Cash Exchange&reset=1
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Cash Exchange&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/draft.xml
index 6679057c4a4b26429523fec92a0bf452e9045790..f32a0b12bb30cf1b6316f6963a6683797ae03934 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/worklists/draft.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Exchange&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Cash Exchange&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateSourceAndDestination.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d75e1f4999df8fddb0f3bd06cd1931ccc569e1d
--- /dev/null
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateSourceAndDestination.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>transaction = state_change.object\n
+\n
+# Check getBaobabSource and getBaobabDestination\n
+transaction.Base_checkBaobabSourceAndDestination()\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/baobab/portal_workflow/cash_exchange_workflow/scripts/validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>state_change, **kw</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>1</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>state_change</string>
+                            <string>kw</string>
+                            <string>_getattr_</string>
+                            <string>transaction</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml
index 5b03c47c89beab125d3a476e0d51672ebbc8ad09..20495a9616d45dab7494ac32b58145b908dd8651 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/transitions/deliver.xml
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>validateSourceAndDestination</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/variables/portal_type.xml
index 2ecf5517bdfdbd91287da00daf207c3f8673f5c7..14b33fc0fff99c57eb0a39649e1906e5af986dfa 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/variables/portal_type.xml
@@ -44,7 +44,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/delivered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/delivered.xml
index 44fd91664001874c61fce6998ce47cb078178b18..ad5991935678c38f0d04601ca5d5427d9cf6708b 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/delivered.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/delivered.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=delivered&reset=1&portal_type=Cash Exchange&reset=1
+Base_viewWorklist?simulation_state=delivered&reset=1&portal_type=Cash Exchange&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/draft.xml
index 7f7b05dd80552e59300a451a4f611b69f0867177..29bb8c4957360a3c582ed5d5d921937bf01db366 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/worklists/draft.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Exchange&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Cash Exchange&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/variables/portal_type.xml
index aaacee8edcd299fe6ab0bd3dd34716495d200659..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/worklists/confirmed.xml
index f0c18e2140ecd1d83e3923b301c51f104e6ca293..8ef68e25ab569d083b12b11586bb44aaf88db1e3 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=confimed&portal_type=Cash Incident&reset=1
+Base_viewWorklist?cash_sorting_state=confimed&portal_type=Cash Incident&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/worklists/draft.xml
index f87962b98592f663259fc34abcf1cc349acc8916..d5482af1c9632c4b6c56e87ee3b19f80d623e5fc 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_incident_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=draft&portal_type=Cash Incident&reset=1
+Base_viewWorklist?cash_sorting_state=draft&portal_type=Cash Incident&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/variables/portal_type.xml
index e32dfbdabe808c6617681fedd14090c9f77d15f8..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/variables/portal_type.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>default_value</string> </key>
-            <value> <string>Cash Sorting</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/worklists/confirmed.xml
index 105a3f56812879ba6d4d0c9ceb6ee6de87be44c0..a292330f2c99c523e6391b0f1d447fe965b23423 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=confimed&portal_type=Cash Sorting Incident&reset=1
+Base_viewWorklist?cash_sorting_state=confimed&portal_type=Cash Sorting Incident&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/worklists/draft.xml
index acfef51d07aeed558c2af8dd7622f5bc9c692176..d64c3fabfff8269e3ba5fbda31879d360eb9f0df 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_incident_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=draft&portal_type=Cash Sorting Incident&reset=1
+Base_viewWorklist?cash_sorting_state=draft&portal_type=Cash Sorting Incident&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/portal_type.xml
index f9bdd17fb0b41aa37bb66e7044f50ed8ec24afc9..14b33fc0fff99c57eb0a39649e1906e5af986dfa 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/portal_type.xml
@@ -32,7 +32,7 @@
         </item>
         <item>
             <key> <string>default_value</string> </key>
-            <value> <string>Cash Sorting</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -44,7 +44,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/confirmed.xml
index be6a24e54959912839ba26f7f457a9305ed1bfcc..008e55b67fd1394b8f28215bb486347b43f2a394 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/confirmed.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=confimed&portal_type=Cash Sorting&reset=1
+Base_viewWorklist?cash_sorting_state=confimed&portal_type=Cash Sorting&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/draft.xml
index a03a8b998fe9abf0c3ea17dc9e33acdfe09972e9..fcd0e286f1aa25f50251fdb221a966bbfe51faa1 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/draft.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=draft&portal_type=Cash Sorting&reset=1
+Base_viewWorklist?cash_sorting_state=draft&portal_type=Cash Sorting&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml
index c69dbf9e206cb1b7254f342e088254c8c1b81018..157c86461dedb08f59e639a5c9f46320bd3e5b00 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=ordered&portal_type=Cash Sorting&reset=1
+Base_viewWorklist?cash_sorting_state=ordered&portal_type=Cash Sorting&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/variables/portal_type.xml
index 2ecf5517bdfdbd91287da00daf207c3f8673f5c7..14b33fc0fff99c57eb0a39649e1906e5af986dfa 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/variables/portal_type.xml
@@ -44,7 +44,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/confirmed.xml
index 0b4a8ae519247b408d9dbfe0e3ef02fbeca38ae4..68e57c1d7c9be2ac65d55db0add0fe015563eec1 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/confirmed.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&portal_type=Classification Survey&reset=1
+Base_viewWorklist?simulation_state=confirmed&portal_type=Classification Survey&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/draft.xml
index 4f0b749f88c174333bf696178126703fc6495f25..7295b48e3067a8240cfa393ef3b6ffcba805b4c7 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/worklists/draft.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Classification Survey&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Classification Survey&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/worklists/confirmed.xml
index 53cf25b1f614046d4f7906d9087dd77e2117a488..1b959ccaabcd008598d2dc29337fef4dc3f0dbd8 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Counter Rendering
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Counter Rendering
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/worklists/draft.xml
index 9e692b3aadf3b740a609795b0b13efad26746d4e..a78d8297ff82d10ecbbea5f130f769fc80b47692 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Counter Rendering&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Counter Rendering&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/worklists/confirmed.xml
index 7e428a006461c1f02ad9a2a615c551f3c215a3f6..9868fdfc96950ad8fe9aaccab48ee7f6ed4a11b7 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Foreign Cash Reception
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Foreign Cash Reception
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/worklists/draft.xml
index 08f3080859ea3f0d9164153da90978329361d421..ffba65a649f9906aded17954929b163630b7209d 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Foreign Cash Reception&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Foreign Cash Reception&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateSourceAndDestination.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0cadf1b2225437721c21e7d2eae3e3bfb2463eeb
--- /dev/null
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateSourceAndDestination.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>transaction = state_change[\'object\']\n
+\n
+# Check getBaobabSource and getBaobabDestination\n
+transaction.Base_checkBaobabSourceAndDestination()\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/baobab/portal_workflow/monetary_destruction_workflow/scripts/validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>state_change, **kw</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>1</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>state_change</string>
+                            <string>kw</string>
+                            <string>_getitem_</string>
+                            <string>transaction</string>
+                            <string>_getattr_</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml
index d3ac7ce13abc62e6334ac3b57ccf0b7eec2a02cc..a08b26c50d671807a7238a17655ce07d53981952 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.xml
@@ -73,7 +73,7 @@
 from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
 \n
 vault = transaction.getSource()\n
 resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Cash Delivery Line\')\n
@@ -150,8 +150,9 @@ elif resource <> 0 :\n
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
                             <string>Message</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                             <string>vault</string>
                             <string>resource</string>
                             <string>msg</string>
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 0c0fb13dae86529fd84a5e16b7b5aadfdca6e23e..5e558fbbaaebe856685c4565fa814d64fe355ea8 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
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>validateSourceAndDestination</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/worklists/confirmed.xml
index f86c49778504482e895a90b47ac251da664fdc45..35c7d7bcd95b24c7e14cf70ced6eec1aab816ecc 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Monetary Destruction
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Monetary Destruction
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/worklists/draft.xml
index 57b1034b1972ed90c1c72debf59a24b650141d85..b01bbc32e328219699980f6191a8ef71010c44bc 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Monetary Destruction&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Monetary Destruction&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/worklists/confirmed.xml
index ba3131b760a256f939e4b7168eda829f5040377e..f67d4d2bd44a76d0d0e7e4713062625bb1c6ca0b 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Monetary Issue
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Monetary Issue
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/worklists/draft.xml
index 8d47196be6ad10f85176ed9ba10a044766d7a2f8..1da5f1e25e8e5f39b2513d1fd815729ef7b0d47a 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Monetary Issue&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Monetary Issue&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/scripts/validateSourceAndDestination.xml
new file mode 100644
index 0000000000000000000000000000000000000000..972b285b23c3bf311c77f1c3ad0bdc61dcf64103
--- /dev/null
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/scripts/validateSourceAndDestination.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>transaction = state_change.object\n
+\n
+# Check getBaobabSource and getBaobabDestination\n
+transaction.Base_checkBaobabSourceAndDestination()\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/baobab/portal_workflow/monetary_recall_workflow/scripts/validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>state_change, **kw</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>1</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>state_change</string>
+                            <string>kw</string>
+                            <string>_getattr_</string>
+                            <string>transaction</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/deliver.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/deliver.xml
index d92213080dc37754a746b9eb2df3f66775e3d5a2..f9a9c6d359178fd0858b32c81f8ec282b0695dde 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/deliver.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/deliver.xml
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>validateSourceAndDestination</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/variables/portal_type.xml
index 1781e6eb4ba73ec78f525b007da939ffd9b8a54d..01049b215e300a5b86ec2c6f9c0d1556626a74d7 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/variables/portal_type.xml
@@ -24,10 +24,18 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>portal_type</string> </value>
         </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <string></string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/worklists/confirmed.xml
index 3fede7318bfba47f7c3973510549c2caa5e62ad6..280696c5e84c7573893089c81b3c88e77026b1ce 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/worklists/confirmed.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Monetary Recall
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Monetary Recall
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/worklists/draft.xml
index 83b695b60bd0ec7c153db77f15d6d332e962deb9..46b3dc58502193f582dda52be518c48557479daa 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/worklists/draft.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Monetary Recall&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Monetary Recall&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/confirmed.xml
index bece91c9a09fe2fff0d206a535826e5c125aaf46..28ba66d5f8e1ed14c5a5da713bc6d9bf8963bbed 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Monetary Reception
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Monetary Reception
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/draft.xml
index 8c47c5de5ab83f3f909bb857c0cb7c97708ee13e..ff0acd1663dcb3649b77a10e9461489766405ae9 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Monetary Reception&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Monetary Reception&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/variables/portal_type.xml
index 5abb2076c7f54aa4903b603d19255ec2ab2f5f14..14b33fc0fff99c57eb0a39649e1906e5af986dfa 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/variables/portal_type.xml
@@ -32,7 +32,7 @@
         </item>
         <item>
             <key> <string>default_value</string> </key>
-            <value> <string>Monetary Survey</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -44,7 +44,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/worklists/confirmed.xml
index 2bd1b73a1d2b5a5ef85bc336aa7651437b41d304..0c33212f77c257171d402be54b32e196c2a30d91 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/worklists/confirmed.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&portal_type=Monetary Survey&reset=1
+Base_viewWorklist?simulation_state=confirmed&portal_type=Monetary Survey&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/worklists/draft.xml
index a7555cdccf9e0c7d91a49fc8902e2cce4c223f69..2f30641738ec20f8ea6131389c220ddafc49cb96 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/worklists/draft.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Monetary Survey&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Monetary Survey&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateSourceAndDestination.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15553739470eebb294dfb82595365bf65c655f78
--- /dev/null
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateSourceAndDestination.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>transaction = state_change.object\n
+\n
+# Check getBaobabSource and getBaobabDestination\n
+transaction.Base_checkBaobabSourceAndDestination()\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/baobab/portal_workflow/money_deposit_rendering_workflow/scripts/validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>state_change, **kw</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>1</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>state_change</string>
+                            <string>kw</string>
+                            <string>_getattr_</string>
+                            <string>transaction</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/states/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/states/confirmed.xml
index c0f6e760d34537e489260eb6c6fc6e0d18570221..6dcea4eaff635d32ae298722886220f262bf75a6 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/states/confirmed.xml
@@ -78,6 +78,7 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>DestinationAssignor</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
@@ -104,6 +105,7 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>DestinationAssignor</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/states/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/states/draft.xml
index ce61ef257ccfd87cdeebdf64a7e2d41b1f833b65..016d9c9b5bf764b9a39fc6314f5be3695223912c 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/states/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/states/draft.xml
@@ -76,11 +76,8 @@
                     <key> <string>Access contents information</string> </key>
                     <value>
                       <tuple>
-                        <string>Assignee</string>
                         <string>Assignor</string>
-                        <string>DestinationAssignor</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
@@ -90,7 +87,6 @@
                       <tuple>
                         <string>Assignor</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
@@ -100,7 +96,6 @@
                       <tuple>
                         <string>Assignor</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
@@ -108,11 +103,8 @@
                     <key> <string>View</string> </key>
                     <value>
                       <tuple>
-                        <string>Assignee</string>
                         <string>Assignor</string>
-                        <string>DestinationAssignor</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/confirm.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/confirm.xml
index 7b66a8e4d856b9296ec0afe5eed63fac1fb66d01..84e20cf5542c04f0ddd411c891f655cb6882a9b2 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/confirm.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/confirm.xml
@@ -41,7 +41,7 @@
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -67,4 +67,28 @@
       </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>Assignee</string>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/confirm_action.xml
index b22a086c4449ff9f573111c5ddb72276a7b134f3..375734702daf803cb020bc47d3dd13ffc427ee15 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/confirm_action.xml
@@ -24,7 +24,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Vault Controler</string> </value>
+            <value> <string>Assigned To Vault Controler</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -85,7 +85,6 @@
               <tuple>
                 <string>Assignee</string>
                 <string>Manager</string>
-                <string>Owner</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/deliver.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/deliver.xml
index f981fd17a2b4709a6adca5c1204dfb9d875d54e1..44428e46690ddb732cb765d724214681d4e3c93e 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/deliver.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/deliver.xml
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>validateSourceAndDestination</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/order.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/order.xml
index c16e634819cac93b29b79e43b1feb4516c32ee58..e8b47bc724c32261b492e482078496d62b1b6f6b 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/order.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/order.xml
@@ -41,7 +41,7 @@
         <item>
             <key> <string>guard</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -67,4 +67,28 @@
       </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/money_deposit_rendering_workflow/transitions/order_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/order_action.xml
index 7519bb6f2aa637280fec9e9c3ab4d9dbd531de47..0bec90cd4cc733ee1592b9f41ae7796917df465c 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/order_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/transitions/order_action.xml
@@ -24,7 +24,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assign To Vault Manager</string> </value>
+            <value> <string>Assigned To Vault Manager</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 Vault</string> </value>
+            <value> <string>Assignes To Vault Manager</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/confirmed.xml
index 89d89be09d7ccc2eca2bb3dd0eff7bef1b01aec7..9da5ef934a7e0cd48bbdfa1ef3a4abc6dd507fb7 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Money Deposit Rendering
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Money Deposit Rendering
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/draft.xml
index 378bd91ef9bf05218caae49329a3e9ce1d0bd899..bef191280cda022f0306586a6fd95473c852e1fb 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Money Deposit Rendering&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Money Deposit Rendering&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/ordered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/ordered.xml
index 05c9860db8952a5466c07317f22962695280ad34..957e640d9d60c6ec0feca4e440809dc8bb9be1de 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/ordered.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/worklists/ordered.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=ordered&reset=1&portal_type=Money Deposit Rendering
+Base_viewWorklist?simulation_state=ordered&reset=1&portal_type=Money Deposit Rendering
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/worklists/confirmed.xml
index 06b063e3d964c49cf576b7f404ee8f23ca320044..75590aa41ac9fa877452f9f24cde7a5652c7da7a 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Money Deposit Transfer
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Money Deposit Transfer
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/worklists/draft.xml
index 56e7c866727dd570444642bbf6483d674112633c..d0a3180d6844f701d5c5155ee73e843d7e3dd1f4 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_transfer_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Money Deposit Transfer&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Money Deposit Transfer&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/variables/portal_type.xml
index e32dfbdabe808c6617681fedd14090c9f77d15f8..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/variables/portal_type.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>default_value</string> </key>
-            <value> <string>Cash Sorting</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/worklists/confirmed.xml
index ce6b285d5bb3e64aff9714a723752e9d8ab60916..7ba3f524eb0641785107d55f1cab5a39a3da1235 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=confimed&portal_type=Usual Cash Incident&reset=1
+Base_viewWorklist?cash_sorting_state=confimed&portal_type=Usual Cash Incident&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/worklists/draft.xml
index e8a7755af9704024d1398d88498603ed7748937b..3dfb90361db30a10f0a7d846e9e7cdd16a7f4ab8 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_incident_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?cash_sorting_state=draft&portal_type=Usual Cash Incident&reset=1
+Base_viewWorklist?cash_sorting_state=draft&portal_type=Usual Cash Incident&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/confirmed.xml
index 0f415f8b9433102a0fa2c5fae2a67ea8b4bd2526..1c4f73f66459100f928593347574e51bfc9f0433 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/confirmed.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Usual Cash Rendering
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Usual Cash Rendering
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/draft.xml
index 199f5f2c432dfe6be8f312f32d7c99871f4fe141..11150ec851dfb2d07805d65b64286960a033786d 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Usual Cash Rendering&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Usual Cash Rendering&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/ordered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/ordered.xml
index 23c26d1b5c130688ec324128649876f0cdfbaed7..0afef720695de83e599588a3f47308436224d6d6 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/ordered.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/ordered.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=planned&reset=1&portal_type=Usual Cash Rendering
+Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Usual Cash Rendering
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/planned.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/planned.xml
index 063e04d9ec2631b67a1e840b06c7624e8c0df9b9..36e9689b2baf0767201fe7d70440fa87ebad57c6 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/planned.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/worklists/planned.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=planned&reset=1&portal_type=Usual Cash Rendering
+Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Usual Cash Rendering
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/portal_type.xml
index 2ecf5517bdfdbd91287da00daf207c3f8673f5c7..14b33fc0fff99c57eb0a39649e1906e5af986dfa 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/portal_type.xml
@@ -44,7 +44,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/confirmed.xml
index e7bd51f6de0d0399ce521024683486e2b97a5cdf..4e56af4a63637f645100705788f163401731bf4c 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/confirmed.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Usual Cash Transfer
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Usual Cash Transfer
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/draft.xml
index 21c83368a512a31a9e13e68a4a08d3e3708708de..28c92fbeab3d843e660109a9ca5cb591d0238e05 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/draft.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Usual Cash Transfer&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Usual Cash Transfer&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_interaction_workflow/variables.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_interaction_workflow/variables.xml
index db67387d4e62a7db68bbb9689238ba0824326e50..07046d72fed718dfcad3c81c6d2ef1003e3b162d 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_interaction_workflow/variables.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_interaction_workflow/variables.xml
@@ -24,6 +24,12 @@
               <dictionary/>
             </value>
         </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>variables</string> </value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_interaction_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_interaction_workflow/variables/portal_type.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01049b215e300a5b86ec2c6f9c0d1556626a74d7
--- /dev/null
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_interaction_workflow/variables/portal_type.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.DCWorkflow.Variables</string>
+          <string>VariableDefinition</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>for_status</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>portal_type</string> </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/variables/portal_type.xml
index 7aebff75f16511617409b5a6dac7080a86de7410..68d15030697632aca16dd821a6e9720b8442da64 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/variables/portal_type.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/variables/portal_type.xml
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -52,7 +52,7 @@
         </item>
         <item>
             <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <value> <string></string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/confirmed.xml
index 48f5f1305b5a0fcde7309c6be0d8eacde0738b14..a182a2838985c3fe4c23496720c5ca4b686ab4e9 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/confirmed.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/confirmed.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Vault Transfer
+Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Vault Transfer
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/draft.xml
index ad032e8cc312045340fcbd62e9c8bc303b3239d2..50241f74307a7511aeca4ca19ee51573cde85457 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/draft.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/draft.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=draft&portal_type=Vault Transfer&reset=1
+Base_viewWorklist?simulation_state=draft&portal_type=Vault Transfer&reset=1
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/ordered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/ordered.xml
index f8ee636e06b0bda4df7c4ba50506a8abe71c03dc..ff94fb6d2f6e11327b6e1a3fa2f91ddbd241ea1a 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/ordered.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/ordered.xml
@@ -36,7 +36,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=planned&reset=1&portal_type=Vault Transfer
+Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Vault Transfer
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/planned.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/planned.xml
index bab2b70a8d86a9b6b79995576582d9d5ece0eef3..2a407111be051a8e949a111d86d27ee52bb90402 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/planned.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/worklists/planned.xml
@@ -30,7 +30,7 @@
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-Base_viewSearchResultList?simulation_state=planned&reset=1&portal_type=Vault Transfer
+Base_viewWorklist?simulation_state=planned&reset=1&portal_type=Vault Transfer
 
 ]]></string> </value>
         </item>