diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/account_incident_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/account_incident_module.xml
index 88ed5cb5219f0620d4476d48b6f9e7b3cef73242..cb5db209e88e34a171207dd905e565bd2d12ebe4 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/account_incident_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/account_incident_module.xml
@@ -456,10 +456,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_balance_regulation_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_balance_regulation_module.xml
index 992466a18bb7aad39c23f03ad84f9c9e3ae8eb7a..30eef8a66fb8dcb0ea3509daa352d368975a89a2 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_balance_regulation_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_balance_regulation_module.xml
@@ -454,9 +454,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_exchange_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_exchange_module.xml
index 4ff75cb1eef26c501e753d3cae49d564554d5187..2c3b3ac055243ba1573b6315481cde856b8dbf6f 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_exchange_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_exchange_module.xml
@@ -440,9 +440,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignee</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_incident_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_incident_module.xml
index 8050fba71393623c7cc85c25357d0b7965612cee..2f746890b22143c89dfdcb8b75333404a9ad682b 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_incident_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_incident_module.xml
@@ -456,10 +456,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_incident_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_incident_module.xml
index e0d9f8d03c612bb3e217747fdea101a7ab206801..ca4fb0d1235817ac8bc566ae525266c85ca3beb1 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_incident_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_incident_module.xml
@@ -456,10 +456,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml
index 6310bbe49735c4b87d4a38c7189b8fde975a3708..8147d0dc463463398410adc314502d0e25d040a6 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml
@@ -440,9 +440,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignee</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/classification_survey_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/classification_survey_module.xml
index c9d619e13b676e4d35d4d3069a23f7e07cbdeca4..364e353ea8dd43a8cccd52f9b4798683ca80d4e4 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/classification_survey_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/classification_survey_module.xml
@@ -454,9 +454,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/counter_rendering_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/counter_rendering_module.xml
index 772b5897c29f0b84813be0e8f6762217bab75f5d..17c69e78900d1c927f97d2c0a8d604122b6f8618 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/counter_rendering_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/counter_rendering_module.xml
@@ -454,9 +454,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/foreign_cash_reception_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/foreign_cash_reception_module.xml
index ae3e22454be33cb9373a2f919a936ebaf509e887..bac7f0518a35257fab0a82a7c09455eeb10818d5 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/foreign_cash_reception_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/foreign_cash_reception_module.xml
@@ -456,10 +456,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_destruction_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_destruction_module.xml
index 26bea7cb2f888b3212e9f00417e7c87407651c00..914d76939bc3408bcac0e1bbd9e588599d9c8404 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_destruction_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_destruction_module.xml
@@ -439,9 +439,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignor</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_issue_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_issue_module.xml
index 4e7735d5994e77621161b850b3f5ab4896c4758d..06dceb1bed2159228679df9d54e655d4fb542cb1 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_issue_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_issue_module.xml
@@ -454,9 +454,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_recall_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_recall_module.xml
index 57c0775b0d7120d68d0bb1c7ebe0b81c8f83684a..c2e6a394bf606d7616cc05e3b9d735a66b2bba52 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_recall_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_recall_module.xml
@@ -439,9 +439,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignor</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_reception_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_reception_module.xml
index 8c635f1cdcc90d3456bd59198a413466d8168d37..2faf2d1074a80b05ad5b25e3942edf9333e40e72 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_reception_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_reception_module.xml
@@ -455,9 +455,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_survey_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_survey_module.xml
index e881599a37b46e614775f15d4d5ec053450a721b..e79acfdf9de4459d4ae51558ed1ba2e13e2e0a51 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_survey_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/monetary_survey_module.xml
@@ -454,9 +454,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_rendering_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_rendering_module.xml
index 166fcf5be7a3efad9cbc01b8bcce617b9e703999..5f894679a58bc06821e2eca5fa25774723d52c53 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_rendering_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_rendering_module.xml
@@ -459,9 +459,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_transfer_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_transfer_module.xml
index bbf0b6d5acd47b75e36f18a8f731412055f37e0f..fb1454ec7223879f2a67da7499ffc6b3bd762736 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_transfer_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/money_deposit_transfer_module.xml
@@ -454,9 +454,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_incident_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_incident_module.xml
index f68124a2e1228a31950f1a32c9790e44b3e9c065..f45d7153e58282c592f04f521d688678326d5a50 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_incident_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_incident_module.xml
@@ -456,10 +456,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_rendering_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_rendering_module.xml
index d838227c733606101c0a3d2b41c634530d560c3c..dd9f10b4afb6b33482f8d9e743ec9c09cdd88eda 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_rendering_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_rendering_module.xml
@@ -462,9 +462,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml
index 02434698df1adbbb1b8a930bec8865716981ab15..71978e7b90a2642620c5326c7ba2c70a6b7ecb42 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml
@@ -455,9 +455,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/vault_transfer_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/vault_transfer_module.xml
index 979170fafe9a34b35139836c241d69c8fa2920f7..c5807e7a0013e692be5bf0dfac0288611c5b53e8 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/vault_transfer_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/vault_transfer_module.xml
@@ -462,9 +462,6 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change user folder</name>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Account%20Incident%20Module.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Account%20Incident%20Module.xml
index 6b896df1dc74ab6583e4aa1f366be726a5ff6207..6b3fc45ed525cb26885cdbef5096ba6b5eb1af73 100644
--- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Account%20Incident%20Module.xml
+++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Account%20Incident%20Module.xml
@@ -36,6 +36,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_property_domain_dict</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Exchange.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Exchange.xml
index 7f61f4ed75f694a454e68304d326d3337f030f72..685a502d597cb40bfa9ee807645a5447a704bff7 100644
--- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Exchange.xml
+++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Exchange.xml
@@ -100,7 +100,7 @@
         </item>
         <item>
             <key> <string>init_script</string> </key>
-            <value> <string></string> </value>
+            <value> <string>CashExchange_init</string> </value>
         </item>
         <item>
             <key> <string>property_sheet_list</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml
index 939fa22bca00337e6c002fd59f677d10c0774471..4347c2a18be98eb5af443d21fa7b532319bac9ab 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewIncomingLineFastInputDialog.xml
@@ -89,7 +89,7 @@ if currency != \'XOF\':\n
 \n
 cash_detail_dict= { \'line_portal_type\'          : \'Incoming Cash Balance Regulation Line\'        # The portal type that the fastinput will create\n
                     , \'operation_currency\'       : currency                            # The operation currently\n
-                    , \'cash_status_list\'          : [\'valid\', \'cancelled\', \'to_sort\']                        # List of possible cashStatus or None if all\n
+                    , \'cash_status_list\'          : [\'valid\', \'cancelled\', \'to_sort\', \'new_emitted\']                        # List of possible cashStatus or None if all\n
                     , \'emission_letter_list\'      : None                                       # List of possible emissionLetter or None if all\n
                     , \'variation_list\'           : context.Baobab_getResourceVintageList(banknote=1, coin=1)      # List of possible variation or None if all\n
                     , \'currency_cash_portal_type\': None                                                   # \'Coin\' or \'Banknote\' or None if both\n
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewOutgoingLineFastInputDialog.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewOutgoingLineFastInputDialog.xml
index eb89647b724b453e22e2f7a25f54172ca5f0f593..1cc741efa5486fe8c3a3b28e5123a2f9c819838a 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewOutgoingLineFastInputDialog.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashBalanceRegulation_viewOutgoingLineFastInputDialog.xml
@@ -89,7 +89,7 @@ if currency != \'XOF\':\n
 \n
 cash_detail_dict= { \'line_portal_type\'          : \'Outgoing Cash Balance Regulation Line\'        # The portal type that the fastinput will create\n
                     , \'operation_currency\'       : currency                            # The operation currently\n
-                    , \'cash_status_list\'          : [\'valid\', \'cancelled\', \'to_sort\']             # List of possible cashStatus or None if all\n
+                    , \'cash_status_list\'          : [\'valid\', \'cancelled\', \'to_sort\', \'new_emitted\']             # List of possible cashStatus or None if all\n
                     , \'emission_letter_list\'      : None                                      # List of possible emissionLetter or None if all\n
                     , \'variation_list\'           : context.Baobab_getResourceVintageList(banknote=1, coin=1)      # List of possible variation or None if all\n
                     , \'currency_cash_portal_type\': None                                                   # \'Coin\' or \'Banknote\' or None if both\n
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList.xml
index 1bc6e3fbdd3fa7b2a0a6466ed1518dbf665f31e5..359c95eef540d2d1e5be9fa7f1829a92cc553c7e 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList.xml
@@ -104,6 +104,7 @@
                         <string>listbox</string>
                         <string>listbox_delivery_start_date</string>
                         <string>listbox_source_total_asset_price</string>
+                        <string>listbox_source_logical_path</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList/listbox.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList/listbox.xml
index 46acc953609ffa76f96368f52a0ee5fd8b973ba4..5d94a101324020320516b0ac55a3728453dd1aeb 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList/listbox.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList/listbox.xml
@@ -372,6 +372,10 @@
                           <string>source_reference</string>
                           <string>Reference</string>
                         </tuple>
+                        <tuple>
+                          <string>source_logical_path</string>
+                          <string>Vault</string>
+                        </tuple>
                         <tuple>
                           <string>delevery.start_date</string>
                           <string>Date</string>
@@ -380,10 +384,6 @@
                           <string>source_total_asset_price</string>
                           <string>Amount</string>
                         </tuple>
-                        <tuple>
-                          <string>description</string>
-                          <string>Description</string>
-                        </tuple>
                         <tuple>
                           <string>translated_simulation_state_title</string>
                           <string>State</string>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList/listbox_source_logical_path.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList/listbox_source_logical_path.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8b893443af5fadbc5efbbaf5f55cbb1ff1f95cf0
--- /dev/null
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchangeModule_viewCashExchangeList/listbox_source_logical_path.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.StandardFields</string>
+          <string>StringField</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>listbox_source_logical_path</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <string>too_long</string> </key>
+                    <value> <string>Too much input was given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Source Vault</string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.TALESField</string>
+          <string>TALESMethod</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.Baobab_getStrippedPath(object=cell, source=1)</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_getBaobabSource.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_getBaobabSource.xml
index bc7c9e489cb6f165ace8d4189fe78d239cce1432..e269410acd9d4b3a947383b3b478eed7c272768d 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_getBaobabSource.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_getBaobabSource.xml
@@ -70,8 +70,27 @@
             <key> <string>_body</string> </key>
             <value> <string>source = context.getSource()\n
 if source != None:\n
-  source = source + \'/sortante\'\n
   return source\n
+else:\n
+  # calculate the source\n
+  user_site = None\n
+  # must use owner to know site letter\n
+  group_list = context.get_local_roles()\n
+  for group, role_list in group_list:\n
+    if \'Owner\' in role_list:\n
+      user_id = group\n
+\n
+  site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
+  for site in site_list:\n
+    site_value = context.portal_categories.getCategoryValue(site)\n
+    context.log(\'site_value\',site_value)\n
+    if site_value.getVaultType().endswith(\'guichet\'):\n
+      user_site = site\n
+  if site is None:\n
+    from Products.ERP5Type.Message import Message\n
+    message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
+    raise ValueError,message\n
+  return site\n
 </string> </value>
         </item>
         <item>
@@ -124,6 +143,19 @@ if source != None:\n
                             <string>context</string>
                             <string>source</string>
                             <string>None</string>
+                            <string>user_site</string>
+                            <string>group_list</string>
+                            <string>_getiter_</string>
+                            <string>group</string>
+                            <string>role_list</string>
+                            <string>user_id</string>
+                            <string>site_list</string>
+                            <string>site</string>
+                            <string>site_value</string>
+                            <string>Products.ERP5Type.Message</string>
+                            <string>Message</string>
+                            <string>message</string>
+                            <string>ValueError</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_init.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_init.xml
index fc9f417a168ba0ce779238ca95d86fa0f3e7b001..4b26140720cd073a89ce8082537b9dd2b96450f5 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_init.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_init.xml
@@ -68,29 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>immediate_reindex=1\n
-\n
-# Definition des s\xc3\xa9curit\xc3\xa9s\n
-#return\n
-\n
-#context.Baobab_assignLocalRole(\n
-#     Assignor = ({\'site\': None, \n
-#                  \'group\':\'bceao/agence/principale/dakar/service/caisse\', # principale/dakar/ will be removed\n
-#                  \'function\':\'agence/principale/caissier_particulier\'},),\n
-#     Assignee = ({\'site\': None, \n
-#                  \'group\':\'bceao/agence/principale/dakar/service/caisse\', # principale/dakar/ will be removed\n
-#                  \'function\':\'agence/principale/caissier_principal\'},),\n
-#     Auditor =  ({\'site\': \'siege\', \n
-#                  \'group\':\'bceao/siege/direction/emission/service/caisse\', \n
-#                  \'function\':\'siege/caissier_principal\'},\n
-#                 {\'site\': \'siege\', \n
-#                  \'group\':\'bceao/siege/direction/comptabilite_et_du_budget/service/comptabilite_siege\', \n
-#                  \'function\':\'siege/chef_comptable\'},\n
-#                  {\'site\': None, \n
-#                  \'group\':\'bceao/agence/principale/dakar/service/comptabilite\', \n
-#                  \'function\':\'agence/principale/chef_comptable\'},\n
-#),\n
-#                )\n
+            <value> <string>context.setSource(context.getBaobabSource())\n
 </string> </value>
         </item>
         <item>
@@ -111,7 +89,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string></string> </value>
+            <value> <string>*args,**kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -137,7 +115,10 @@
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
-                            <string>immediate_reindex</string>
+                            <string>args</string>
+                            <string>kw</string>
+                            <string>_getattr_</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_view.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_view.xml
index 9b51dc8eb73760b920e70b144a64451d5bd98ba6..b46d19b82065f22cd2e50fef645a3320490275a2 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_view.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_view.xml
@@ -95,6 +95,7 @@
                     <value>
                       <list>
                         <string>my_source_reference</string>
+                        <string>my_source_logical_path</string>
                         <string>my_source_total_asset_price</string>
                         <string>my_translated_simulation_state_title</string>
                       </list>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_view/my_source_logical_path.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_view/my_source_logical_path.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2f69a15d1e962651018bb51f716f5358e18e2c99
--- /dev/null
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_view/my_source_logical_path.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.StandardFields</string>
+          <string>StringField</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_source_logical_path</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <string>too_long</string> </key>
+                    <value> <string>Too much input was given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Counter</string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.TALESField</string>
+          <string>TALESMethod</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.Baobab_getStrippedPath(object=here, source=1)</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_viewOutgoingLineFastInputDialog.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_viewOutgoingLineFastInputDialog.xml
index f0040fa1dec7f6c5a297f69326f3b5aa68b7d539..89999cbea307ee9f745ba9e176fc7e0f3571dc83 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_viewOutgoingLineFastInputDialog.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_viewOutgoingLineFastInputDialog.xml
@@ -70,7 +70,7 @@
             <key> <string>_body</string> </key>
             <value> <string>cash_detail_dict= { \'line_portal_type\'          : \'Outgoing Cash Exchange Line\'        # The portal type that the fastinput will create\n
                     , \'operation_currency\'       : \'XOF\'                            # The operation currently\n
-                    , \'cash_status_list\'          : [\'valid\']             # List of possible cashStatus or None if all\n
+                    , \'cash_status_list\'          : [\'valid\', \'new_emitted\']             # List of possible cashStatus or None if all\n
                     , \'emission_letter_list\'      : context.Baobab_getUserEmissionLetterList()                                     # List of possible emissionLetter or None if all\n
                     , \'variation_list\'           : context.Baobab_getResourceVintageList(banknote=1, coin=1)      # List of possible variation or None if all   #[\'2003\']      # List of possible variation or None if all\n
                     , \'currency_cash_portal_type\': None                                                   # \'Coin\' or \'Banknote\' or None if both\n
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_getBaobabDestination.xml
index 4184041fae3db8b8f403556132bfe2b2676d5832..59c2534901cab4490663c1afe6a3532c792a7c3c 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_getBaobabDestination.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_getBaobabDestination.xml
@@ -72,7 +72,8 @@
 if \'devise\' in source:\n
   return  "%s/caisse_courante/%s" %("/".join(source.split("/")[:-4]), "/".join(source.split("/")[-2:]))\n
 else:\n
-  return  "%s/caisse_courante/%s" %("/".join(source.split("/")[:-3]), "/".join(source.split("/")[-1:]))\n
+#  return  "%s/caisse_courante/%s" %("/".join(source.split("/")[:-3]), "/".join(source.split("/")[-1:]))\n
+  return  "%s/caisse_courante/encaisse_des_billets_et_monnaies" %("/".join(source.split("/")[:-4]))\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashExchangeLine_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashExchangeLine_getBaobabDestination.xml
index 38b21497ae02e4f40d2d7d432ff1f913a8c0cece..382436820b446c8404175991741352cbbaede51b 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashExchangeLine_getBaobabDestination.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashExchangeLine_getBaobabDestination.xml
@@ -68,38 +68,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>"""\n
-source = context.getSource()\n
-if source != None:\n
-  source = source + \'/entrante\'\n
-  return source\n
-"""\n
-\n
-context.log(\'la_destination\',"")\n
-currency = context.getResourceTitle()\n
-encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/%s/entrante" %(context.getParentValue().getResourceTitle().lower())\n
-\n
-# OLD METHOD user logged in\n
-#user_id = context.portal_membership.getAuthenticatedMember().getUserName()\n
-\n
-# NEW METHOD must use owner to know site letter\n
-old_group_list = context.get_local_roles()\n
-for group, role_list in old_group_list:\n
-  if \'Owner\' in role_list:\n
-    user_id = group\n
-\n
-\n
-\n
-site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
-context.log(\'site_list\',site_list)\n
-destination = None\n
-for site in site_list:\n
-  site_value = context.portal_categories.getCategoryValue(site)\n
-  context.log(\'site_value\',site_value)\n
-  if site_value.getVaultType().endswith(\'guichet\') and ((\'banque_interne\' in site) or (\'operations_diverses\' in site)):\n
-    destination = site + encaisse_billets_et_monnaies\n
-    break\n
-context.log(\'la_bonne_destination\',destination)\n
+            <value> <string>encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/entrante"\n
+counter_site = context.getSource()\n
+destination = counter_site + encaisse_billets_et_monnaies\n
 return destination\n
 </string> </value>
         </item>
@@ -149,20 +120,11 @@ return destination\n
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
+                            <string>encaisse_billets_et_monnaies</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>currency</string>
-                            <string>encaisse_billets_et_monnaies</string>
-                            <string>old_group_list</string>
-                            <string>_getiter_</string>
-                            <string>group</string>
-                            <string>role_list</string>
-                            <string>user_id</string>
-                            <string>site_list</string>
-                            <string>None</string>
+                            <string>counter_site</string>
                             <string>destination</string>
-                            <string>site</string>
-                            <string>site_value</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashExchangeLine_getBaobabSource.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashExchangeLine_getBaobabSource.xml
index af793630f4f418c4a91cc4291c94eced8cc77c5b..72de2391975c194ce39f592a546430774de41381 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashExchangeLine_getBaobabSource.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashExchangeLine_getBaobabSource.xml
@@ -68,37 +68,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>"""\n
-source = context.getSource()\n
-if source != None:\n
-  source = source + \'/sortante\'\n
-  return source\n
-"""\n
-\n
-currency = context.getResourceTitle()\n
-encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/sortante"\n
-\n
-# OLD METHOD user logged in\n
-#user_id = context.portal_membership.getAuthenticatedMember().getUserName()\n
-\n
-# NEW METHOD must use owner to know site letter\n
-old_group_list = context.get_local_roles()\n
-for group, role_list in old_group_list:\n
-  if \'Owner\' in role_list:\n
-    user_id = group\n
-\n
-\n
-\n
-site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
-context.log(\'site_list\',site_list)\n
-destination = None\n
-for site in site_list:\n
-  site_value = context.portal_categories.getCategoryValue(site)\n
-  context.log(\'site_value\',site_value)\n
-  if site_value.getVaultType().endswith(\'guichet\') and ((\'banque_interne\' in site) or (\'operations_diverses\' in site)):\n
-    destination = site + encaisse_billets_et_monnaies\n
-    break\n
-context.log(\'la_bonne_destination\',destination)\n
+            <value> <string>encaisse_billets_et_monnaies = "/encaisse_des_billets_et_monnaies/sortante"\n
+counter_site = context.getSource()\n
+destination = counter_site + encaisse_billets_et_monnaies\n
 return destination\n
 </string> </value>
         </item>
@@ -148,20 +120,11 @@ return destination\n
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
+                            <string>encaisse_billets_et_monnaies</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>currency</string>
-                            <string>encaisse_billets_et_monnaies</string>
-                            <string>old_group_list</string>
-                            <string>_getiter_</string>
-                            <string>group</string>
-                            <string>role_list</string>
-                            <string>user_id</string>
-                            <string>site_list</string>
-                            <string>None</string>
+                            <string>counter_site</string>
                             <string>destination</string>
-                            <string>site</string>
-                            <string>site_value</string>
                           </tuple>
                         </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
new file mode 100644
index 0000000000000000000000000000000000000000..2ecf5517bdfdbd91287da00daf207c3f8673f5c7
--- /dev/null
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/portal_type.xml
@@ -0,0 +1,66 @@
+<?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>default_expr</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>portal_type</string> </value>
+        </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
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 0dc70616f42b7f4dea0adb305cfe5fb383a1d28d..b29f797a63926a421a511ebe49527708f4730140 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
@@ -79,6 +79,14 @@ Base_viewSearchResultList?simulation_state=confirmed&reset=1&portal_type=Cash Ex
             <key> <string>_container</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>portal_type</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Cash Balance Regulation</string>
+                      </tuple>
+                    </value>
+                </item>
                 <item>
                     <key> <string>simulation_state</string> </key>
                     <value>
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 b53899bfcf345fdd5065de875b336267dc1050c7..6679057c4a4b26429523fec92a0bf452e9045790 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
@@ -79,6 +79,14 @@ Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Exchange&reset
             <key> <string>_container</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>portal_type</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Cash Balance Regulation</string>
+                      </tuple>
+                    </value>
+                </item>
                 <item>
                     <key> <string>simulation_state</string> </key>
                     <value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml
index 28f6fc4f4b44a9bcd62b611be802456114900b91..f4cf0965c39210cd6d638a054fb8d84e4cd02116 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.xml
@@ -77,35 +77,21 @@ encaisse_billets_et_monnaies_sortante = "/encaisse_des_billets_et_monnaies/sorta
 encaisse_billets_et_monnaies_entrante = "/encaisse_des_billets_et_monnaies/entrante"\n
 \n
 \n
-# user logged in\n
-user_id = transaction.portal_membership.getAuthenticatedMember().getUserName()\n
-site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
-\n
-\n
-caisse_incoming = None\n
-caisse_outgoing = None\n
-for site in site_list:\n
-  site_value = context.portal_categories.getCategoryValue(site)\n
-  \n
-  if site_value.getVaultType().endswith(\'guichet\') and ((\'banque_interne\' in site) or (\'operations_diverses\' in site)):\n
-    caisse_incoming = site + encaisse_billets_et_monnaies_entrante\n
-    caisse_outgoing = site + encaisse_billets_et_monnaies_sortante\n
-    break\n
+counter_site = transaction.getSource()\n
+caisse_incoming = counter_site + encaisse_billets_et_monnaies_entrante\n
+caisse_outgoing = counter_site + encaisse_billets_et_monnaies_sortante\n
 \n
 \n
 \n
 # check again that we are in the good accounting date\n
-if not transaction.Baobab_checkCounterDateOpen(site=caisse_outgoing, date=transaction.getStartDate()):\n
+if not transaction.Baobab_checkCounterDateOpen(site=counter_site, date=transaction.getStartDate()):\n
   msg = Message(domain = "ui", message="Transaction not in the good accounting date")\n
   raise ValidationFailed, (msg,)\n
 \n
 \n
 \n
-#resource_one = transaction.CashDelivery_checkCounterInventory(source = caisse_incoming, portal_type=\'Incoming Cash Exchange Line\')\n
 resource_two = transaction.CashDelivery_checkCounterInventory(caisse_outgoing, portal_type=\'Outgoing Cash Exchange Line\')\n
 \n
-#resource_two = transaction.CashDelivery_checkCounterInventory(outgoing_source,portal_type=\'Outgoing Cash To Currency Purchase Line\')\n
-\n
 # Get total_price.\n
 incoming_total = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash Exchange Line\')\n
 outgoing_total = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash Exchange Line\')\n
@@ -148,7 +134,7 @@ if amount_total != outgoing_total:\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>state_change</string> </value>
+            <value> <string>state_change, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -175,6 +161,7 @@ if amount_total != outgoing_total:\n
                         <value>
                           <tuple>
                             <string>state_change</string>
+                            <string>kw</string>
                             <string>Products.DCWorkflow.DCWorkflow</string>
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
@@ -184,15 +171,9 @@ if amount_total != outgoing_total:\n
                             <string>currency</string>
                             <string>encaisse_billets_et_monnaies_sortante</string>
                             <string>encaisse_billets_et_monnaies_entrante</string>
-                            <string>user_id</string>
-                            <string>context</string>
-                            <string>site_list</string>
-                            <string>None</string>
+                            <string>counter_site</string>
                             <string>caisse_incoming</string>
                             <string>caisse_outgoing</string>
-                            <string>_getiter_</string>
-                            <string>site</string>
-                            <string>site_value</string>
                             <string>msg</string>
                             <string>resource_two</string>
                             <string>incoming_total</string>
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 1344483fa9221b61d23c835228fbd665edb953a8..5b03c47c89beab125d3a476e0d51672ebbc8ad09 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
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Delivered </string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>actbox_url</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 1781e6eb4ba73ec78f525b007da939ffd9b8a54d..2ecf5517bdfdbd91287da00daf207c3f8673f5c7 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
@@ -24,10 +24,42 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>default_expr</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_value</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>for_catalog</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>for_status</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>portal_type</string> </value>
         </item>
+        <item>
+            <key> <string>info_guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>0</int> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
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 cab216f0a9c919685c233e890494730de64c4364..44fd91664001874c61fce6998ce47cb078178b18 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
@@ -103,6 +103,14 @@ Base_viewSearchResultList?simulation_state=delivered&reset=1&portal_type=Cash Ex
             <key> <string>_container</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>portal_type</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Cash Exchange</string>
+                      </tuple>
+                    </value>
+                </item>
                 <item>
                     <key> <string>simulation_state</string> </key>
                     <value>
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 e87f69106373535283fb41d2caaaee9dcab0631d..7f7b05dd80552e59300a451a4f611b69f0867177 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
@@ -103,6 +103,14 @@ Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Exchange&reset
             <key> <string>_container</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>portal_type</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Cash Exchange</string>
+                      </tuple>
+                    </value>
+                </item>
                 <item>
                     <key> <string>simulation_state</string> </key>
                     <value>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
index fe6500f322d58f3936ce8fa1f0392e5df9c3330e..0282a3b053089fa17feceb4c8c50e471e5609ca1 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.xml
@@ -82,7 +82,7 @@ line_price = object.getTotalPrice(deliveryLineType=\'Cash Delivery Line\')\n
 \n
 if object_price != line_price:\n
   msg = Message(domain="ui", message="Amount differs between document and lines.")\n
-  raise validationFailed, (msg,)\n
+  raise ValidationFailed, (msg,)\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm.xml
index 1f0d30b02f9a721ec67024aa14c06d1ae1d724c7..99f1f3c8f0a7da793a5802036c073230a15a32f1 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm.xml
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assign To Vault Controler</string> </value>
+            <value> <string>Assigned To Vault Controler</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm_action.xml
index 163f55229bb7242c35a28fa3ad330d9a9103112c..0beeffc4c5f334dd9c7c0ff5d2f416b86569925a 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/transitions/confirm_action.xml
@@ -30,7 +30,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>
@@ -64,7 +64,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Assign To Vault Controler Action</string> </value>
+            <value> <string>Assigned To Vault Controler Action</string> </value>
         </item>
         <item>
             <key> <string>trigger_type</string> </key>
diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateSourceAndDestination.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fc284f16d69086c344a844735119728d143abf79
--- /dev/null
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateSourceAndDestination.xml
@@ -0,0 +1,145 @@
+<?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># Call the script wich checks if source and destination\n
+# are well defined\n
+transaction = state_change.object\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/vault_transfer_workflow/scripts/validateSourceAndDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>state_change</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>_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/vault_transfer_workflow/transitions/confirm_to_deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/transitions/confirm_to_deliver_action.xml
index 0b37d3b1544c40a4f0bf1b61f94156d624fb0aa9..ac15453d2ba94185b8575d0860bbc9efb65a95ba 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/transitions/confirm_to_deliver_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/transitions/confirm_to_deliver_action.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/vault_transfer_workflow/transitions/order_to_deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/transitions/order_to_deliver_action.xml
index a93117ce959053368790f94213c269cc34a16898..68ac05cfd2f6537a52aedcabe916724f2c633199 100644
--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/transitions/order_to_deliver_action.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/transitions/order_to_deliver_action.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>