From 11aac8e41c5c165d9e8c70abc775873d74029d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Thu, 27 Apr 2006 09:29:13 +0000
Subject: [PATCH] move cash transfer to usual cash transfer use cash sorting
 for cash classification

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6954 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Cash%20Classification%20Module/view.xml   |  93 ------
 .../Cash%20Classification/list.xml            |  93 ------
 .../list.xml}                                 |  10 +-
 .../list_ui.xml                               |   0
 .../sort_on.xml                               |   0
 .../Cash%20Sorting%20Module/view.xml          |  93 ++++++
 .../history.xml                               |   2 +-
 .../incoming_fastinput.xml}                   |  10 +-
 .../incoming_line_view.xml}                   |   8 +-
 .../metadata.xml                              |   4 +-
 .../outgoing_fastinput.xml}                   |  10 +-
 .../outgoing_line_list.xml}                   |   6 +-
 .../view.xml                                  |   2 +-
 .../list.xml                                  |  93 ------
 .../print.xml                                 |  93 ------
 .../metadata.xml                              |   0
 .../view.xml                                  |   2 +-
 .../list.xml                                  |  93 ------
 .../print.xml                                 |  93 ------
 .../metadata.xml                              |  93 ++++++
 .../view.xml                                  |   2 +-
 .../metadata.xml                              |   2 +-
 .../view.xml                                  |   0
 .../list_ui.xml                               |   0
 .../sort_on.xml                               |   0
 .../view.xml                                  |   2 +-
 .../fastinput.xml                             |   2 +-
 .../history.xml                               |   0
 .../metadata.xml                              |   0
 .../print.xml                                 |   0
 .../Usual%20Cash%20Transfer/view.xml          |  93 ++++++
 ...fer_module.xml => cash_sorting_module.xml} |  64 ++--
 ...ule.xml => usual_cash_transfer_module.xml} |  33 +-
 .../allowed_content_types.xml                 |  26 +-
 .../base_category_list.xml                    |   5 +
 .../hidden_content_type_list.xml              |  18 +-
 .../property_sheet_list.xml                   |  15 +-
 .../workflow_chain_type.xml                   |   8 +-
 .../listbox_source_logical_path.xml           | 287 ------------------
 .../listbox_source_total_asset_price.xml      | 275 -----------------
 .../my_source_total_asset_price.xml           | 254 ----------------
 ...CashSortingModule_viewCashSortingList.xml} |   9 +-
 .../listbox.xml                               |  33 +-
 .../listbox_delivery_start_date.xml           |   8 +-
 .../listbox_source_total_asset_price.xml}     |  10 +-
 ...fication_view.xml => CashSorting_view.xml} |  13 +-
 .../my_description.xml                        |   8 +-
 .../my_source.xml                             |   8 +-
 .../my_source_reference.xml                   |   6 +
 .../my_source_total_asset_price.xml           | 281 +++++++++++++++++
 .../my_start_date.xml                         |   6 +
 .../my_translated_simulation_state_title.xml  |   8 +-
 ...rting_viewIncomingLineFastInputDialog.xml} |  18 +-
 ...l => CashSorting_viewIncomingLineList.xml} |   8 +-
 .../listbox.xml                               |  18 +-
 .../listbox_quantity.xml                      |   8 +-
 .../listbox_total_price.xml                   |  10 +-
 .../my_total_price.xml                        |  10 +-
 ...rting_viewOutgoingLineFastInputDialog.xml} |  14 +-
 ...l => CashSorting_viewOutgoingLineList.xml} |   8 +-
 .../listbox.xml                               |  20 +-
 .../listbox_quantity.xml                      |   8 +-
 .../listbox_total_price.xml                   | 281 +++++++++++++++++
 .../my_total_price.xml                        |  10 +-
 ...gCashSortingLine_getBaobabDestination.xml} |  24 +-
 ...ngCashSortingCell_getBaobabDestination.xml | 188 ++++++++++++
 ...tgoingCashSortingLine_getBaobabSource.xml} |  28 +-
 ...nsferModule_viewUsualCashTransferList.xml} |   6 +-
 .../listbox.xml                               |   8 +-
 .../listbox_delivery_start_date.xml           |   0
 .../listbox_destination_logical_path.xml      |   0
 .../listbox_source_logical_path.xml           |   0
 .../listbox_source_total_asset_price.xml      |   0
 ...er_view.xml => UsualCashTransfer_view.xml} |   6 +-
 .../listbox.xml                               |   0
 .../listbox_quantity.xml                      |   0
 .../listbox_total_price.xml                   |   0
 .../my_description.xml                        |   0
 .../my_destination.xml                        |   2 +-
 .../my_resource.xml                           |   0
 .../my_source.xml                             |   2 +-
 .../my_source_reference.xml                   |   0
 .../my_source_total_asset_price.xml           |   0
 .../my_start_date.xml                         |   0
 .../my_total_price.xml                        |   0
 .../my_translated_simulation_state_title.xml  |   0
 ...lCashTransfer_viewLineFastInputDialog.xml} |   4 +-
 87 files changed, 1332 insertions(+), 1623 deletions(-)
 delete mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification%20Module/view.xml
 delete mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/list.xml
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification/print.xml => Cash%20Sorting%20Module/list.xml} (88%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification%20Module => Cash%20Sorting%20Module}/list_ui.xml (100%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification%20Module => Cash%20Sorting%20Module}/sort_on.xml (100%)
 create mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/view.xml
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification => Cash%20Sorting}/history.xml (98%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification/fastinputIn.xml => Cash%20Sorting/incoming_fastinput.xml} (91%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification/external.xml => Cash%20Sorting/incoming_line_view.xml} (89%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification => Cash%20Sorting}/metadata.xml (96%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification/fastinputOut.xml => Cash%20Sorting/outgoing_fastinput.xml} (90%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification/source.xml => Cash%20Sorting/outgoing_line_list.xml} (91%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Outgoing%20Cash%20Classification%20Line => Cash%20Sorting}/view.xml (96%)
 delete mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/list.xml
 delete mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/print.xml
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Incoming%20Cash%20Classification%20Line => Incoming%20Cash%20Sorting%20Line}/metadata.xml (100%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Transfer => Incoming%20Cash%20Sorting%20Line}/view.xml (97%)
 delete mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/list.xml
 delete mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/print.xml
 create mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell/metadata.xml
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Classification => Outgoing%20Cash%20Sorting%20Cell}/view.xml (96%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Outgoing%20Cash%20Classification%20Line => Outgoing%20Cash%20Sorting%20Line}/metadata.xml (96%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Incoming%20Cash%20Classification%20Line => Outgoing%20Cash%20Sorting%20Line}/view.xml (100%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Transfer%20Module => Usual%20Cash%20Transfer%20Module}/list_ui.xml (100%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Transfer%20Module => Usual%20Cash%20Transfer%20Module}/sort_on.xml (100%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Transfer%20Module => Usual%20Cash%20Transfer%20Module}/view.xml (95%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Transfer => Usual%20Cash%20Transfer}/fastinput.xml (97%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Transfer => Usual%20Cash%20Transfer}/history.xml (100%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Transfer => Usual%20Cash%20Transfer}/metadata.xml (100%)
 rename bt5/erp5_banking_cash/ActionTemplateItem/portal_types/{Cash%20Transfer => Usual%20Cash%20Transfer}/print.xml (100%)
 create mode 100644 bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/view.xml
 rename bt5/erp5_banking_cash/ModuleTemplateItem/{cash_transfer_module.xml => cash_sorting_module.xml} (94%)
 rename bt5/erp5_banking_cash/ModuleTemplateItem/{cash_classification_module.xml => usual_cash_transfer_module.xml} (97%)
 create mode 100644 bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
 delete mode 100644 bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_source_logical_path.xml
 delete mode 100644 bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_source_total_asset_price.xml
 delete mode 100644 bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source_total_asset_price.xml
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassificationModule_viewCashClassificationList.xml => CashSortingModule_viewCashSortingList.xml} (93%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassificationModule_viewCashClassificationList => CashSortingModule_viewCashSortingList}/listbox.xml (95%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransferModule_viewCashTransferList => CashSortingModule_viewCashSortingList}/listbox_delivery_start_date.xml (99%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewOutgoingLineList/listbox_total_price.xml => CashSortingModule_viewCashSortingList/listbox_source_total_asset_price.xml} (97%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_view.xml => CashSorting_view.xml} (91%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => CashSorting_view}/my_description.xml (98%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_view => CashSorting_view}/my_source.xml (97%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => CashSorting_view}/my_source_reference.xml (98%)
 create mode 100644 bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source_total_asset_price.xml
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => CashSorting_view}/my_start_date.xml (99%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => CashSorting_view}/my_translated_simulation_state_title.xml (98%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewOutgoingLineFastInputDialog.xml => CashSorting_viewIncomingLineFastInputDialog.xml} (88%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewIncomingLineList.xml => CashSorting_viewIncomingLineList.xml} (95%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewOutgoingLineList => CashSorting_viewIncomingLineList}/listbox.xml (97%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewIncomingLineList => CashSorting_viewIncomingLineList}/listbox_quantity.xml (98%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewIncomingLineList => CashSorting_viewIncomingLineList}/listbox_total_price.xml (97%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewIncomingLineList => CashSorting_viewIncomingLineList}/my_total_price.xml (97%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewIncomingLineFastInputDialog.xml => CashSorting_viewOutgoingLineFastInputDialog.xml} (89%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewOutgoingLineList.xml => CashSorting_viewOutgoingLineList.xml} (93%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewIncomingLineList => CashSorting_viewOutgoingLineList}/listbox.xml (96%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewOutgoingLineList => CashSorting_viewOutgoingLineList}/listbox_quantity.xml (98%)
 create mode 100644 bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox_total_price.xml
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_viewOutgoingLineList => CashSorting_viewOutgoingLineList}/my_total_price.xml (97%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{IncomingCashClassificationLine_getBaobabDestination.xml => IncomingCashSortingLine_getBaobabDestination.xml} (83%)
 create mode 100644 bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{OutgoingCashClassificationLine_getBaobabDestination.xml => OutgoingCashSortingLine_getBaobabSource.xml} (84%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransferModule_viewCashTransferList.xml => UsualCashTransferModule_viewUsualCashTransferList.xml} (94%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransferModule_viewCashTransferList => UsualCashTransferModule_viewUsualCashTransferList}/listbox.xml (98%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassificationModule_viewCashClassificationList => UsualCashTransferModule_viewUsualCashTransferList}/listbox_delivery_start_date.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransferModule_viewCashTransferList => UsualCashTransferModule_viewUsualCashTransferList}/listbox_destination_logical_path.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransferModule_viewCashTransferList => UsualCashTransferModule_viewUsualCashTransferList}/listbox_source_logical_path.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransferModule_viewCashTransferList => UsualCashTransferModule_viewUsualCashTransferList}/listbox_source_total_asset_price.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view.xml => UsualCashTransfer_view.xml} (96%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => UsualCashTransfer_view}/listbox.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => UsualCashTransfer_view}/listbox_quantity.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => UsualCashTransfer_view}/listbox_total_price.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_view => UsualCashTransfer_view}/my_description.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => UsualCashTransfer_view}/my_destination.xml (98%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => UsualCashTransfer_view}/my_resource.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => UsualCashTransfer_view}/my_source.xml (99%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_view => UsualCashTransfer_view}/my_source_reference.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => UsualCashTransfer_view}/my_source_total_asset_price.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_view => UsualCashTransfer_view}/my_start_date.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_view => UsualCashTransfer_view}/my_total_price.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashClassification_view => UsualCashTransfer_view}/my_translated_simulation_state_title.xml (100%)
 rename bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/{CashTransfer_viewLineFastInputDialog.xml => UsualCashTransfer_viewLineFastInputDialog.xml} (97%)

diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification%20Module/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification%20Module/view.xml
deleted file mode 100644
index 298ac89ddb..0000000000
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification%20Module/view.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>view</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>1.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>View</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashClassificationModule_viewCashClassificationList</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/list.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/list.xml
deleted file mode 100644
index 7483e75ef1..0000000000
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/list.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Object Contents</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/folder_contents</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/print.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/list.xml
similarity index 88%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/print.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/list.xml
index 21ff1c8005..0ec4fd2f42 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/print.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/list.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
+            <value> <string>object</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>
@@ -42,7 +42,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>print</string> </value>
+            <value> <string>list</string> </value>
         </item>
         <item>
             <key> <string>optional</string> </key>
@@ -58,11 +58,11 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
+            <value> <float>4.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
+            <value> <string>List</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
+            <value> <string>string:${object_url}/Folder_list</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification%20Module/list_ui.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/list_ui.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification%20Module/list_ui.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/list_ui.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification%20Module/sort_on.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/sort_on.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification%20Module/sort_on.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/sort_on.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/view.xml
new file mode 100644
index 0000000000..d921813f97
--- /dev/null
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting%20Module/view.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>view</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>View</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/CashSortingModule_viewCashSortingList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/history.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/history.xml
similarity index 98%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/history.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/history.xml
index 88214e1bd7..5b6adac722 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/history.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/history.xml
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>6.0</float> </value>
+            <value> <float>8.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/fastinputIn.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/incoming_fastinput.xml
similarity index 91%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/fastinputIn.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/incoming_fastinput.xml
index 25b9b0b602..f34db5a218 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/fastinputIn.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/incoming_fastinput.xml
@@ -46,7 +46,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>fastinputIn</string> </value>
+            <value> <string>incoming_fastinput</string> </value>
         </item>
         <item>
             <key> <string>optional</string> </key>
@@ -56,17 +56,17 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>Add portal content</string>
+                <string>View</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>9.0</float> </value>
+            <value> <float>7.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Source Banknotes</string> </value>
+            <value> <string>Sorting Supply</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -89,7 +89,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashClassification_viewIncomingLineFastInputDialog</string> </value>
+            <value> <string>string:${object_url}/CashSorting_viewIncomingLineFastInputDialog</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/external.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/incoming_line_view.xml
similarity index 89%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/external.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/incoming_line_view.xml
index 809360a76e..85f157391d 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/external.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/incoming_line_view.xml
@@ -42,7 +42,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>external</string> </value>
+            <value> <string>incoming_line_view</string> </value>
         </item>
         <item>
             <key> <string>optional</string> </key>
@@ -58,11 +58,11 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>5.0</float> </value>
+            <value> <float>3.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>External Banknotes</string> </value>
+            <value> <string>Sorting Supply</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashClassification_viewOutgoingLineList</string> </value>
+            <value> <string>string:${object_url}/CashSorting_viewIncomingLineList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/metadata.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/metadata.xml
similarity index 96%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/metadata.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/metadata.xml
index 6c8c098a72..785e413d30 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/metadata.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/metadata.xml
@@ -52,13 +52,13 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>Manage properties</string>
+                <string>Manage portal</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>7.0</float> </value>
+            <value> <float>9.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/fastinputOut.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/outgoing_fastinput.xml
similarity index 90%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/fastinputOut.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/outgoing_fastinput.xml
index 4d920956c2..c6afca0ce4 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/fastinputOut.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/outgoing_fastinput.xml
@@ -46,7 +46,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>fastinputOut</string> </value>
+            <value> <string>outgoing_fastinput</string> </value>
         </item>
         <item>
             <key> <string>optional</string> </key>
@@ -56,17 +56,17 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>Add portal content</string>
+                <string>View</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>10.0</float> </value>
+            <value> <float>7.5</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>External Banknotes</string> </value>
+            <value> <string>Sorting Result</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -89,7 +89,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashClassification_viewOutgoingLineFastInputDialog</string> </value>
+            <value> <string>string:${object_url}/CashSorting_viewOutgoingLineFastInputDialog</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/source.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/outgoing_line_list.xml
similarity index 91%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/source.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/outgoing_line_list.xml
index f851529690..b4802cefc4 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/source.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/outgoing_line_list.xml
@@ -42,7 +42,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>source</string> </value>
+            <value> <string>outgoing_line_list</string> </value>
         </item>
         <item>
             <key> <string>optional</string> </key>
@@ -62,7 +62,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Source Banknotes</string> </value>
+            <value> <string>Sorting Result</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashClassification_viewIncomingLineList</string> </value>
+            <value> <string>string:${object_url}/CashSorting_viewOutgoingLineList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/view.xml
similarity index 96%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/view.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/view.xml
index 35f8253f2b..7e7de06046 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/view.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Sorting/view.xml
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashDeliveryLine_view</string> </value>
+            <value> <string>string:${object_url}/CashSorting_view</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/list.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/list.xml
deleted file mode 100644
index 7483e75ef1..0000000000
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/list.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Object Contents</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/folder_contents</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/print.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/print.xml
deleted file mode 100644
index 21ff1c8005..0000000000
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/print.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/metadata.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line/metadata.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/metadata.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line/metadata.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line/view.xml
similarity index 97%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/view.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line/view.xml
index fe687fcd25..c2930328f1 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/view.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line/view.xml
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashTransfer_view</string> </value>
+            <value> <string>string:${object_url}/CashDelivery_view</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/list.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/list.xml
deleted file mode 100644
index 7483e75ef1..0000000000
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/list.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Object Contents</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/folder_contents</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/print.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/print.xml
deleted file mode 100644
index 21ff1c8005..0000000000
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/print.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>icon</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print</string> </value>
-        </item>
-        <item>
-            <key> <string>optional</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_printPdf</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell/metadata.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell/metadata.xml
new file mode 100644
index 0000000000..b038135d15
--- /dev/null
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell/metadata.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>metadata</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>Manage portal</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>3.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Metadata</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell/view.xml
similarity index 96%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/view.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell/view.xml
index eea45c48b6..458f548c92 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Classification/view.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell/view.xml
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashClassification_view</string> </value>
+            <value> <string>string:${object_url}/DeliveryCell_view</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/metadata.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line/metadata.xml
similarity index 96%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/metadata.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line/metadata.xml
index c2615f1284..461b044c0e 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line/metadata.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line/metadata.xml
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/ase_viewMetadata</string> </value>
+            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line/view.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line/view.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line/view.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer%20Module/list_ui.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module/list_ui.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer%20Module/list_ui.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module/list_ui.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer%20Module/sort_on.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module/sort_on.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer%20Module/sort_on.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module/sort_on.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer%20Module/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module/view.xml
similarity index 95%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer%20Module/view.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module/view.xml
index cef994245a..6dd2dd4dc4 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer%20Module/view.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module/view.xml
@@ -85,7 +85,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashTransferModule_viewCashTransferList</string> </value>
+            <value> <string>string:${object_url}/UsualCashTransferModule_viewUsualCashTransferList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/fastinput.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/fastinput.xml
similarity index 97%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/fastinput.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/fastinput.xml
index 67b82c6c9d..f11185ee9e 100644
--- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/fastinput.xml
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/fastinput.xml
@@ -89,7 +89,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/CashTransfer_viewLineFastInputDialog</string> </value>
+            <value> <string>string:${object_url}/UsualCashTransfer_viewLineFastInputDialog</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/history.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/history.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/history.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/history.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/metadata.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/metadata.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/metadata.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/metadata.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/print.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/print.xml
similarity index 100%
rename from bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Transfer/print.xml
rename to bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/print.xml
diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/view.xml
new file mode 100644
index 0000000000..dd47adff77
--- /dev/null
+++ b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Usual%20Cash%20Transfer/view.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>view</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>View</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/UsualCashTransfer_view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_transfer_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml
similarity index 94%
rename from bt5/erp5_banking_cash/ModuleTemplateItem/cash_transfer_module.xml
rename to bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml
index cd876e3e39..4a205072d6 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_transfer_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/cash_sorting_module.xml
@@ -1,5 +1,5 @@
 <module>
- <id>cash_transfer_module</id>
+ <id>cash_sorting_module</id>
  <permission_list>
   <permission>
    <name>Access Transient Objects</name>
@@ -54,7 +54,6 @@
   </permission>
   <permission>
    <name>Add CMF Action Icons Tools</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Active Processs</name>
@@ -66,7 +65,6 @@
   </permission>
   <permission>
    <name>Add CMF Calendar Tools</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Core Tools</name>
@@ -74,7 +72,6 @@
   </permission>
   <permission>
    <name>Add CMF Default Tools</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Report Tools</name>
@@ -82,7 +79,6 @@
   </permission>
   <permission>
    <name>Add CMF Setup Tools</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Sites</name>
@@ -90,7 +86,6 @@
   </permission>
   <permission>
    <name>Add CMF Unique Id Tools</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMFActivity Tools</name>
@@ -106,7 +101,6 @@
   </permission>
   <permission>
    <name>Add Configured CMF Sites</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -134,11 +128,9 @@
   </permission>
   <permission>
    <name>Add ERP5 OOo Templates</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add ERP5 PDF Forms</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add ERP5 PDF Templates</name>
@@ -146,11 +138,9 @@
   </permission>
   <permission>
    <name>Add ERP5 Publications</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add ERP5 Reports</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add ERP5 Sites</name>
@@ -158,7 +148,6 @@
   </permission>
   <permission>
    <name>Add ERP5 Subscriptions</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add ERP5 Tools</name>
@@ -172,6 +161,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add ERP5Subversion Tools</name>
+  </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
@@ -242,11 +234,6 @@
   </permission>
   <permission>
    <name>Add Plugin Registrys</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
-   <name>Add Portal ZSyncer Tools</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Add Python Scripts</name>
@@ -316,16 +303,13 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ZSyncers</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
   <permission>
    <name>Add portal content</name>
+   <role>Assignee</role>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
@@ -336,8 +320,6 @@
   </permission>
   <permission>
    <name>Add portal folders</name>
-   <role>Assignor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission>
@@ -438,7 +420,6 @@
   </permission>
   <permission>
    <name>Change local roles</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Change permissions</name>
@@ -458,6 +439,8 @@
   </permission>
   <permission>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission>
@@ -474,6 +457,7 @@
   </permission>
   <permission>
    <name>Delete objects</name>
+   <role>Assignee</role>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
@@ -507,7 +491,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission>
@@ -536,16 +519,11 @@
   </permission>
   <permission>
    <name>Manage Groups</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
@@ -592,7 +570,6 @@
   </permission>
   <permission>
    <name>Modify portal content</name>
-   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission>
@@ -629,11 +606,14 @@
   </permission>
   <permission>
    <name>Search ZCatalog</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
    <role>Manager</role>
   </permission>
   <permission>
    <name>Search for principals</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Set own password</name>
@@ -649,6 +629,10 @@
   </permission>
   <permission>
    <name>Test Database Connections</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
    <role>Manager</role>
   </permission>
   <permission>
@@ -661,6 +645,9 @@
   </permission>
   <permission>
    <name>Use Database Methods</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Auditor</role>
    <role>Manager</role>
   </permission>
   <permission>
@@ -669,7 +656,6 @@
   </permission>
   <permission>
    <name>Use external editor</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>Use mailhost services</name>
@@ -695,6 +681,8 @@
   </permission>
   <permission>
    <name>View ZMailMessage</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission>
@@ -713,19 +701,13 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>ZSyncer: Use ZSyncer</name>
-   <role>Manager</role>
-  </permission>
   <permission>
    <name>ZopeProfiler: manage</name>
-   <role>Manager</role>
   </permission>
   <permission>
    <name>ZopeProfiler: view</name>
-   <role>Manager</role>
   </permission>
  </permission_list>
- <portal_type>Cash Transfer Module</portal_type>
- <title>Cash Transfers</title>
+ <portal_type>Cash Sorting Module</portal_type>
+ <title>Cash Sortings</title>
 </module>
\ No newline at end of file
diff --git a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_classification_module.xml b/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml
similarity index 97%
rename from bt5/erp5_banking_cash/ModuleTemplateItem/cash_classification_module.xml
rename to bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml
index 8690a0fd3f..dec1bac0a7 100644
--- a/bt5/erp5_banking_cash/ModuleTemplateItem/cash_classification_module.xml
+++ b/bt5/erp5_banking_cash/ModuleTemplateItem/usual_cash_transfer_module.xml
@@ -1,5 +1,5 @@
 <module>
- <id>cash_classification_module</id>
+ <id>usual_cash_transfer_module</id>
  <permission_list>
   <permission>
    <name>Access Transient Objects</name>
@@ -54,6 +54,7 @@
   </permission>
   <permission>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Active Processs</name>
@@ -65,6 +66,7 @@
   </permission>
   <permission>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Core Tools</name>
@@ -72,6 +74,7 @@
   </permission>
   <permission>
    <name>Add CMF Default Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Report Tools</name>
@@ -79,6 +82,7 @@
   </permission>
   <permission>
    <name>Add CMF Setup Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMF Sites</name>
@@ -86,6 +90,7 @@
   </permission>
   <permission>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add CMFActivity Tools</name>
@@ -101,6 +106,7 @@
   </permission>
   <permission>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -166,6 +172,10 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
+  <permission>
+   <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
@@ -236,9 +246,7 @@
   </permission>
   <permission>
    <name>Add Plugin Registrys</name>
-  </permission>
-  <permission>
-   <name>Add Portal ZSyncer Tools</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Add Python Scripts</name>
@@ -308,9 +316,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -429,6 +434,7 @@
   </permission>
   <permission>
    <name>Change local roles</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Change permissions</name>
@@ -526,13 +532,10 @@
   </permission>
   <permission>
    <name>Manage Groups</name>
-  </permission>
-  <permission>
-   <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
   <permission>
-   <name>Manage Translation Services</name>
+   <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
   <permission>
@@ -622,6 +625,7 @@
   </permission>
   <permission>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission>
    <name>Set own password</name>
@@ -701,9 +705,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
   <permission>
    <name>ZopeProfiler: manage</name>
    <role>Manager</role>
@@ -713,6 +714,6 @@
    <role>Manager</role>
   </permission>
  </permission_list>
- <portal_type>Cash Classification Module</portal_type>
- <title>Cash Classifications</title>
+ <portal_type>Usual Cash Transfer Module</portal_type>
+ <title>Usual Cash Transfers</title>
 </module>
\ No newline at end of file
diff --git a/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index f86a445514..e6e9768f65 100644
--- a/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -1,21 +1,21 @@
 <allowed_content_type_list>
- <portal_type id="Cash Classification">
-  <item>Outgoing Cash Classification Line</item>
-  <item>Incoming Cash Classification Line</item>
+ <portal_type id="Cash Sorting">
+  <item>Incoming Cash Sorting Line</item>
+  <item>Outgoing Cash Sorting Line</item>
  </portal_type>
- <portal_type id="Cash Classification Module">
-  <item>Cash Classification</item>
+ <portal_type id="Cash Sorting Module">
+  <item>Cash Sorting</item>
  </portal_type>
- <portal_type id="Cash Transfer">
-  <item>Cash Delivery Line</item>
+ <portal_type id="Incoming Cash Sorting Line">
+  <item>Cash Delivery Cell</item>
  </portal_type>
- <portal_type id="Cash Transfer Module">
-  <item>Cash Transfer</item>
+ <portal_type id="Outgoing Cash Sorting Line">
+  <item>Outgoing Cash Sorting Cell</item>
  </portal_type>
- <portal_type id="Incoming Cash Classification Line">
-  <item>Cash Delivery Cell</item>
+ <portal_type id="Usual Cash Transfer">
+  <item>Cash Delivery Line</item>
  </portal_type>
- <portal_type id="Outgoing Cash Classification Line">
-  <item>Cash Delivery Cell</item>
+ <portal_type id="Usual Cash Transfer Module">
+  <item>Usual Cash Transfer</item>
  </portal_type>
 </allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
new file mode 100644
index 0000000000..530e698220
--- /dev/null
+++ b/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
@@ -0,0 +1,5 @@
+<base_category_list>
+ <portal_type id="Outgoing Cash Sorting Cell">
+  <item>variation</item>
+ </portal_type>
+</base_category_list>
\ No newline at end of file
diff --git a/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
index 03269c234f..77218535a6 100644
--- a/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
+++ b/bt5/erp5_banking_cash/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
@@ -1,15 +1,15 @@
 <hidden_content_type_list>
- <portal_type id="Cash Classification">
-  <item>Outgoing Cash Classification Line</item>
-  <item>Incoming Cash Classification Line</item>
+ <portal_type id="Cash Sorting">
+  <item>Outgoing Cash Sorting Line</item>
+  <item>Incoming Cash Sorting Line</item>
  </portal_type>
- <portal_type id="Cash Transfer">
-  <item>Cash Delivery Line</item>
- </portal_type>
- <portal_type id="Incoming Cash Classification Line">
+ <portal_type id="Incoming Cash Sorting Line">
   <item>Cash Delivery Cell</item>
  </portal_type>
- <portal_type id="Outgoing Cash Classification Line">
-  <item>Cash Delivery Cell</item>
+ <portal_type id="Outgoing Cash Sorting Line">
+  <item>Outgoing Cash Sorting Cell</item>
+ </portal_type>
+ <portal_type id="Usual Cash Transfer">
+  <item>Cash Delivery Line</item>
  </portal_type>
 </hidden_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
index c251179cb2..d153fa1f09 100644
--- a/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
+++ b/bt5/erp5_banking_cash/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
@@ -1,15 +1,18 @@
 <property_sheet_list>
- <portal_type id="Cash Classification">
+ <portal_type id="Cash Sorting">
   <item>Price</item>
  </portal_type>
- <portal_type id="Cash Transfer">
-  <item>Price</item>
-  <item>Amount</item>
+ <portal_type id="Incoming Cash Sorting Line">
+  <item>CashDeliveryLine</item>
  </portal_type>
- <portal_type id="Incoming Cash Classification Line">
+ <portal_type id="Outgoing Cash Sorting Cell">
   <item>CashDeliveryLine</item>
  </portal_type>
- <portal_type id="Outgoing Cash Classification Line">
+ <portal_type id="Outgoing Cash Sorting Line">
   <item>CashDeliveryLine</item>
  </portal_type>
+ <portal_type id="Usual Cash Transfer">
+  <item>Price</item>
+  <item>Amount</item>
+ </portal_type>
 </property_sheet_list>
\ No newline at end of file
diff --git a/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 9012b253f2..99bb97c424 100644
--- a/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_banking_cash/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -1,10 +1,10 @@
 <workflow_chain>
  <chain>
-  <type>Cash Classification</type>
-  <workflow>cash_classification_workflow, edit_workflow</workflow>
+  <type>Cash Sorting</type>
+  <workflow>cash_sorting_workflow, edit_workflow</workflow>
  </chain>
  <chain>
-  <type>Cash Transfer</type>
-  <workflow>edit_workflow, cash_transfer_workflow</workflow>
+  <type>Usual Cash Transfer</type>
+  <workflow>edit_workflow, usual_cash_transfer_workflow</workflow>
  </chain>
 </workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_source_logical_path.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_source_logical_path.xml
deleted file mode 100644
index 4a96b249aa..0000000000
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_source_logical_path.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?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>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>1</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/CashClassificationModule_viewCashClassificationList/listbox_source_total_asset_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_source_total_asset_price.xml
deleted file mode 100644
index 7d93b87716..0000000000
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_source_total_asset_price.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>listbox_source_total_asset_price</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>not_float</string> </key>
-                    <value> <string>You did not enter a floating point number.</string> </value>
-                </item>
-                <item>
-                    <key> <string>required_not_found</string> </key>
-                    <value> <string>Input is required but no input 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>input_style</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>precision</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>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> <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>input_style</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>precision</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>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>figure</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>align="right"</string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>input_style</string> </key>
-                    <value> <string>-1 234.5</string> </value>
-                </item>
-                <item>
-                    <key> <string>precision</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Price</string> </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>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source_total_asset_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source_total_asset_price.xml
deleted file mode 100644
index 806fff7ba2..0000000000
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source_total_asset_price.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>my_source_total_asset_price</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>not_float</string> </key>
-                    <value> <string>You did not enter a floating point number.</string> </value>
-                </item>
-                <item>
-                    <key> <string>required_not_found</string> </key>
-                    <value> <string>Input is required but no input 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>input_style</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>precision</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>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> <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>input_style</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>precision</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>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>figure</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>1</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>input_style</string> </key>
-                    <value> <string>-1 234.5</string> </value>
-                </item>
-                <item>
-                    <key> <string>precision</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Amount</string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList.xml
similarity index 93%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList.xml
index 6f8fb75a00..790b26df49 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList.xml
@@ -95,8 +95,8 @@
                     <key> <string>hidden</string> </key>
                     <value>
                       <list>
-                        <string>listbox_source_logical_path</string>
                         <string>listbox_source_total_asset_price</string>
+                        <string>listbox_delivery_start_date</string>
                       </list>
                     </value>
                 </item>
@@ -105,7 +105,6 @@
                     <value>
                       <list>
                         <string>listbox</string>
-                        <string>listbox_delivery_start_date</string>
                       </list>
                     </value>
                 </item>
@@ -120,7 +119,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashClassificationModule_viewCashClassificationList</string> </value>
+            <value> <string>CashSortingModule_viewCashSortingList</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
@@ -128,7 +127,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>CashClassificationModule_viewCashClassificationList</string> </value>
+            <value> <string>CashSortingModule_viewCashSortingList</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
@@ -144,7 +143,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Cash Classifications</string> </value>
+            <value> <string>Cash Sorting Results</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox.xml
similarity index 95%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox.xml
index eccfcba84e..a2b4cdd1d9 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
@@ -343,7 +349,7 @@
                         </tuple>
                         <tuple>
                           <string>source_logical_path</string>
-                          <string>Source Vault</string>
+                          <string>Source</string>
                         </tuple>
                         <tuple>
                           <string>source_total_asset_price</string>
@@ -387,17 +393,12 @@
                 <item>
                     <key> <string>domain_root_list</string> </key>
                     <value>
-                      <list>
-                        <tuple>
-                          <string>source_site_domain</string>
-                          <string>Source Vault</string>
-                        </tuple>
-                      </list>
+                      <list/>
                     </value>
                 </item>
                 <item>
                     <key> <string>domain_tree</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <int>0</int> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
@@ -409,11 +410,7 @@
                       <list>
                         <tuple>
                           <string>delivery.start_date</string>
-                          <string>Date</string>
-                        </tuple>
-                        <tuple>
-                          <string>price</string>
-                          <string>Amount</string>
+                          <string>delivery.start_date</string>
                         </tuple>
                         <tuple>
                           <string>source_total_asset_price</string>
@@ -446,7 +443,7 @@
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>
-                    <value> <string>CashClassificationModule_viewCashClassificationList</string> </value>
+                    <value> <string>CashSortingModule_viewCashSortingList</string> </value>
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
@@ -465,8 +462,8 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>Cash Classification</string>
-                          <string>Cash Classification</string>
+                          <string>Cash Sorting</string>
+                          <string>Cash Sorting</string>
                         </tuple>
                       </list>
                     </value>
@@ -497,7 +494,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>cash_classification_list_selection</string> </value>
+                    <value> <string>cash_sorting_list_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
@@ -528,7 +525,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Cash Classifications</string> </value>
+                    <value> <string>Sorting Results</string> </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_delivery_start_date.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox_delivery_start_date.xml
similarity index 99%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_delivery_start_date.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox_delivery_start_date.xml
index c405444bd5..4f79c937a2 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_delivery_start_date.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox_delivery_start_date.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_delivery_start_date</string> </value>
@@ -295,7 +301,7 @@
                 </item>
                 <item>
                     <key> <string>required</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <int>0</int> </value>
                 </item>
                 <item>
                     <key> <string>start_datetime</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox_total_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox_source_total_asset_price.xml
similarity index 97%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox_total_price.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox_source_total_asset_price.xml
index ab934afc82..bb106fdc3b 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox_total_price.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSortingModule_viewCashSortingList/listbox_source_total_asset_price.xml
@@ -12,9 +12,15 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>listbox_total_price</string> </value>
+            <value> <string>listbox_source_total_asset_price</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -239,7 +245,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Amount</string> </value>
+                    <value> <string>Price</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view.xml
similarity index 91%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view.xml
index 74010ca234..2599065f38 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view.xml
@@ -71,7 +71,6 @@
                 <string>right</string>
                 <string>center</string>
                 <string>bottom</string>
-                <string>hidden</string>
               </list>
             </value>
         </item>
@@ -93,12 +92,6 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key>                 <string>hidden</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>left</string> </key>
                     <value>
@@ -123,7 +116,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashClassification_view</string> </value>
+            <value> <string>CashSorting_view</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
@@ -131,7 +124,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>CashClassification_view</string> </value>
+            <value> <string>CashSorting_view</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
@@ -147,7 +140,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Cash Classification</string> </value>
+            <value> <string>Sorting Result</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_description.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_description.xml
similarity index 98%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_description.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_description.xml
index b30a580c82..3226540bcb 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_description.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_description.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_description</string> </value>
@@ -239,7 +245,7 @@
                 </item>
                 <item>
                     <key> <string>height</string> </key>
-                    <value> <int>5</int> </value>
+                    <value> <int>7</int> </value>
                 </item>
                 <item>
                     <key> <string>hidden</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source.xml
similarity index 97%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source.xml
index bea2ddd06d..26d03fafc3 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source</string> </value>
@@ -302,7 +308,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Delivery_getVaultItemList(vault_type=[\'site/caveau/auxiliaire\'], exclude_vault_type=None, current_url=None, user_site=1, leaf_node=1, strict_membership=0)</string> </value>
+            <value> <string>python:here.Delivery_getVaultItemList(vault_type=[\'site/surface/salle_tri\'], exclude_vault_type=None, current_url=here.getSource(), user_site=1, leaf_node=1, strict_membership=0)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_source_reference.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source_reference.xml
similarity index 98%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_source_reference.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source_reference.xml
index ba916e569f..71a63fbe3e 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_source_reference.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source_reference.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_source_reference</string> </value>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source_total_asset_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source_total_asset_price.xml
new file mode 100644
index 0000000000..0e9063de74
--- /dev/null
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_source_total_asset_price.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.StandardFields</string>
+          <string>FloatField</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_total_asset_price</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>not_float</string> </key>
+                    <value> <string>You did not enter a floating point number.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input 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>input_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>precision</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>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> <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>input_style</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>precision</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>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>figure</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>1</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>input_style</string> </key>
+                    <value> <string>-1234.5</string> </value>
+                </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Amount</string> </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>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_start_date.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_start_date.xml
similarity index 99%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_start_date.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_start_date.xml
index e685defbf0..6aeae0aa52 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_start_date.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_start_date.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_start_date</string> </value>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_translated_simulation_state_title.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_translated_simulation_state_title.xml
similarity index 98%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_translated_simulation_state_title.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_translated_simulation_state_title.xml
index 8683bd78eb..1a14782ff7 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_translated_simulation_state_title.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_view/my_translated_simulation_state_title.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_translated_simulation_state_title</string> </value>
@@ -239,7 +245,7 @@
                 </item>
                 <item>
                     <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
+                    <value> <int>1</int> </value>
                 </item>
                 <item>
                     <key> <string>title</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineFastInputDialog.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml
similarity index 88%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineFastInputDialog.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml
index 6d4cbab0cb..b46f5463e2 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineFastInputDialog.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog.xml
@@ -66,12 +66,12 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>CashMovement_cashDetail_parameter = { \'line_portalType\'          : \'Outgoing Cash Classification Line\'             # The portal type that the fastinput will create\n
-, \'operation_currency\'       : context.Baobab_getPortalReferenceCurrencyID()                          # The operation currently\n
-, \'cashStatus_list\'          : [\'to_sort\']                    # List of possible cashStatus or None if all\n
-, \'emissionLetter_list\'      : None                           # List of possible emissionLetter or None if all\n
-, \'variation_list\'           : [\'2003\',]                      # List of possible variation or None if all\n
-, \'currencyCash_portalType\'  : \'Banknote\'                     # \'Coin\' or \'Banknote\' or None if both\n
+            <value> <string>CashMovement_cashDetail_parameter = { \'line_portalType\'          : \'Incoming Cash Sorting Line\'             # The portal type that the fastinput will create\n
+, \'operation_currency\'       :  context.Baobab_getPortalReferenceCurrencyID()                        # The operation currently\n
+, \'cashStatus_list\'          : [\'to_sort\',]                   # List of possible cashStatus or None if all\n
+, \'emissionLetter_list\'      : [\'not_defined\',]                # List of possible emissionLetter or None if all\n
+, \'variation_list\'           : [\'2003\',]                       # List of possible variation or None if all\n
+, \'currencyCash_portalType\'  : \'Banknote\'                           # \'Coin\' or \'Banknote\' or None if both\n
 , \'updatePossible\'           : True                           # If true, the fastinput will not allow change\n
 , \'columnBase\'               : \'variation\'                    # possible values : \'variation\', \'cashStatus\', \'emissionLetter\'\n
 }\n
@@ -89,7 +89,7 @@ return context.CashDetail_fastInputUpdate( listbox = None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineFastInputDialog</string> </value>
+            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineFastInputDialog</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -127,9 +127,9 @@ return context.CashDetail_fastInputUpdate( listbox = None\n
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>None</string>
                             <string>True</string>
                             <string>CashMovement_cashDetail_parameter</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
@@ -146,7 +146,7 @@ return context.CashDetail_fastInputUpdate( listbox = None\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashClassification_viewOutgoingLineFastInputDialog</string> </value>
+            <value> <string>CashSorting_viewIncomingLineFastInputDialog</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList.xml
similarity index 95%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList.xml
index 79489373d8..b5f2a91f66 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList.xml
@@ -97,8 +97,8 @@
                     <key>                 <string>hidden</string> </key>
                     <value>
                       <list>
-                        <string>listbox_total_price</string>
                         <string>listbox_quantity</string>
+                        <string>listbox_total_price</string>
                       </list>
                     </value>
                 </item>
@@ -121,7 +121,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashClassification_viewIncomingLineList</string> </value>
+            <value> <string>CashSorting_viewIncomingLineList</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
@@ -129,7 +129,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>CashClassificationLine_viewListIn</string> </value>
+            <value> <string>CashSortingLine_viewListIn</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
@@ -145,7 +145,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Source Banknotes</string> </value>
+            <value> <string>Sorting Supply</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox.xml
similarity index 97%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox.xml
index fdf319015e..3ea1953165 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
@@ -334,7 +340,7 @@
                           <string>Denomination</string>
                         </tuple>
                         <tuple>
-                          <string>cash_status_translated_title</string>
+                          <string>cash_status_title</string>
                           <string>State</string>
                         </tuple>
                         <tuple>
@@ -431,7 +437,7 @@
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>
-                    <value> <string>Folder_viewCashCurrencyListOut</string> </value>
+                    <value> <string>Folder_viewIncomingCashCurrencyList</string> </value>
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
@@ -450,8 +456,8 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>Outgoing Cash Classification Line</string>
-                          <string>Outgoing Cash Classification Line</string>
+                          <string>Incoming Cash Sorting Line</string>
+                          <string>Incoming Cash Sorting Line</string>
                         </tuple>
                         <tuple>
                           <string>Cash Delivery Cell</string>
@@ -486,7 +492,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>cash_sorting_incoming_line_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
@@ -512,7 +518,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>External Banknotes</string> </value>
+                    <value> <string>Sorting Supply</string> </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox_quantity.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox_quantity.xml
similarity index 98%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox_quantity.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox_quantity.xml
index 542d1ab63a..3d10ae40f1 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox_quantity.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox_quantity.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_quantity</string> </value>
@@ -241,7 +247,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Number</string> </value>
+                    <value> <string>Quantity</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox_total_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox_total_price.xml
similarity index 97%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox_total_price.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox_total_price.xml
index 3a3e587b69..c695eca419 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox_total_price.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/listbox_total_price.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_total_price</string> </value>
@@ -229,7 +235,7 @@
                 </item>
                 <item>
                     <key> <string>input_style</string> </key>
-                    <value> <string>-1 234.5</string> </value>
+                    <value> <string>-1234.5</string> </value>
                 </item>
                 <item>
                     <key> <string>precision</string> </key>
@@ -241,7 +247,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Amount</string> </value>
+                    <value> <string>Total Price</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/my_total_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/my_total_price.xml
similarity index 97%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/my_total_price.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/my_total_price.xml
index 33b7b12e5a..d579ecdc67 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/my_total_price.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewIncomingLineList/my_total_price.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_total_price</string> </value>
@@ -243,7 +249,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Total</string> </value>
+                    <value> <string>Total Supply</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
@@ -269,7 +275,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getTotalPrice(deliveryLineType=\'Incoming Cash Classification Line\')</string> </value>
+            <value> <string>python: here.getTotalPrice(deliveryLineType=\'Incoming Cash Sorting Line\')</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineFastInputDialog.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineFastInputDialog.xml
similarity index 89%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineFastInputDialog.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineFastInputDialog.xml
index bb5d74c671..e37bf977cb 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineFastInputDialog.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineFastInputDialog.xml
@@ -66,11 +66,11 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>CashMovement_cashDetail_parameter = { \'line_portalType\'          : \'Incoming Cash Classification Line\'             # The portal type that the fastinput will create\n
+            <value> <string>CashMovement_cashDetail_parameter = { \'line_portalType\'          : \'Outgoing Cash Sorting Line\'             # The portal type that the fastinput will create\n
 , \'operation_currency\'       : context.Baobab_getPortalReferenceCurrencyID()                          # The operation currently\n
-, \'cashStatus_list\'          : [\'to_sort\']                    #   List of possible cashStatus or None if all\n
-, \'emissionLetter_list\'      : context.Baobab_getUserEmissionLetterList() #[\'k\']                           # List of possible emissionLetter or None if all\n
-, \'variation_list\'           : [\'2003\',]                      # List of possible variation or None if all\n
+, \'cashStatus_list\'          : [\'valid\', \'cancelled\', \'to_sort\']                    # List of possible cashStatus or None if all\n
+, \'emissionLetter_list\'      : None                # List of possible emissionLetter or None if all\n
+, \'variation_list\'           : [\'2003\',]                       # List of possible variation or None if all\n
 , \'currencyCash_portalType\'  : \'Banknote\'                           # \'Coin\' or \'Banknote\' or None if both\n
 , \'updatePossible\'           : True                           # If true, the fastinput will not allow change\n
 , \'columnBase\'               : \'variation\'                    # possible values : \'variation\', \'cashStatus\', \'emissionLetter\'\n
@@ -89,7 +89,7 @@ return context.CashDetail_fastInputUpdate( listbox = None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineFastInputDialog</string> </value>
+            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineFastInputDialog</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -127,9 +127,9 @@ return context.CashDetail_fastInputUpdate( listbox = None\n
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>None</string>
                             <string>True</string>
                             <string>CashMovement_cashDetail_parameter</string>
-                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
@@ -146,7 +146,7 @@ return context.CashDetail_fastInputUpdate( listbox = None\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashClassification_viewIncomingLineFastInputDialog</string> </value>
+            <value> <string>CashSorting_viewOutgoingLineFastInputDialog</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList.xml
similarity index 93%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList.xml
index 240ad1c777..bb7df370af 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList.xml
@@ -61,7 +61,7 @@
         </item>
         <item>
             <key> <string>enctype</string> </key>
-            <value> <string>multipart/form-data</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>group_list</string> </key>
@@ -121,7 +121,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashClassification_viewOutgoingLineList</string> </value>
+            <value> <string>CashSorting_viewOutgoingLineList</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
@@ -129,7 +129,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>CashClassificationLine_viewListOut</string> </value>
+            <value> <string>CashSortingLine_viewListOut</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
@@ -145,7 +145,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>External Banknotes</string> </value>
+            <value> <string>Sorting Result</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox.xml
similarity index 96%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox.xml
index 7dc678eb92..96d761f00a 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewIncomingLineList/listbox.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox</string> </value>
@@ -334,7 +340,7 @@
                           <string>Denomination</string>
                         </tuple>
                         <tuple>
-                          <string>cash_status_translated_title</string>
+                          <string>cash_status_title</string>
                           <string>State</string>
                         </tuple>
                         <tuple>
@@ -431,7 +437,7 @@
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>
-                    <value> <string>Folder_viewCashCurrencyListIn</string> </value>
+                    <value> <string>Folder_viewOutgoingCashCurrencyList</string> </value>
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
@@ -450,12 +456,12 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>Incoming Cash Classification Line</string>
-                          <string>Incoming Cash Classification Line</string>
+                          <string>Outgoing Cash Sorting Line</string>
+                          <string>Outgoing Cash Sorting Line</string>
                         </tuple>
                         <tuple>
-                          <string>Cash Delivery Cell</string>
-                          <string>Cash Delivery Cell</string>
+                          <string>Outgoing Cash Sorting Cell</string>
+                          <string>Outgoing Cash Sorting Cell</string>
                         </tuple>
                       </list>
                     </value>
@@ -512,7 +518,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Source Banknotes</string> </value>
+                    <value> <string>Sorting Result</string> </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox_quantity.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox_quantity.xml
similarity index 98%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox_quantity.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox_quantity.xml
index 542d1ab63a..3d10ae40f1 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/listbox_quantity.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox_quantity.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>listbox_quantity</string> </value>
@@ -241,7 +247,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Number</string> </value>
+                    <value> <string>Quantity</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox_total_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox_total_price.xml
new file mode 100644
index 0000000000..485cd002c6
--- /dev/null
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/listbox_total_price.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.StandardFields</string>
+          <string>FloatField</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_total_price</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>not_float</string> </key>
+                    <value> <string>You did not enter a floating point number.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input 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>input_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>precision</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>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> <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>input_style</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>precision</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>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>figure</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>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string>align="right"</string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>input_style</string> </key>
+                    <value> <string>-1234.5</string> </value>
+                </item>
+                <item>
+                    <key> <string>precision</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Total Price</string> </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>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/my_total_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/my_total_price.xml
similarity index 97%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/my_total_price.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/my_total_price.xml
index af6417a682..44ad5d678a 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_viewOutgoingLineList/my_total_price.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashSorting_viewOutgoingLineList/my_total_price.xml
@@ -12,6 +12,12 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>my_total_price</string> </value>
@@ -243,7 +249,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Total</string> </value>
+                    <value> <string>Total Result</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
@@ -269,7 +275,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getTotalPrice(deliveryLineType=\'Outgoing Cash Classification Line\')</string> </value>
+            <value> <string>python: here.getTotalPrice(deliveryLineType=\'Outgoing Cash Sorting Line\')</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashClassificationLine_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashSortingLine_getBaobabDestination.xml
similarity index 83%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashClassificationLine_getBaobabDestination.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashSortingLine_getBaobabDestination.xml
index 32fcd84614..cc7b722fd3 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashClassificationLine_getBaobabDestination.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashSortingLine_getBaobabDestination.xml
@@ -66,13 +66,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>source = object.getBaobabSource()\n
-\n
-if source == \'\':\n
-  return \'\'\n
-\n
-root_source = source.split(\'/\')[:-2] # remove "encaisse des billets recu pour ventilation" + town\n
-return \'/\'.join(root_source[:]+[\'encaisse_des_billets_et_monnaies\'])\n
+            <value> <string>return None\n
 </string> </value>
         </item>
         <item>
@@ -83,7 +77,7 @@ return \'/\'.join(root_source[:]+[\'encaisse_des_billets_et_monnaies\'])\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/IncomingCashClassificationLine_getBaobabDestination</string> </value>
+            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/IncomingCashSortingLine_getBaobabDestination</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -93,7 +87,7 @@ return \'/\'.join(root_source[:]+[\'encaisse_des_billets_et_monnaies\'])\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>object</string> </value>
+            <value> <string>*args, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -113,17 +107,15 @@ return \'/\'.join(root_source[:]+[\'encaisse_des_billets_et_monnaies\'])\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
+                        <value> <int>0</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
-                            <string>object</string>
-                            <string>_getattr_</string>
-                            <string>source</string>
-                            <string>_getitem_</string>
-                            <string>root_source</string>
+                            <string>args</string>
+                            <string>kw</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
@@ -140,7 +132,7 @@ return \'/\'.join(root_source[:]+[\'encaisse_des_billets_et_monnaies\'])\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>IncomingCashClassificationLine_getBaobabDestination</string> </value>
+            <value> <string>IncomingCashSortingLine_getBaobabDestination</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
new file mode 100644
index 0000000000..5a22b57dd5
--- /dev/null
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
@@ -0,0 +1,188 @@
+<?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> <string encoding="base64">bfINCg==</string> </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># context.log(\'context = %s, cash status = %s\' %(context, context.getCashStatus(),), \'source = %s\'%(context.getSource().split(\'/\')))\n
+if context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancelled\' and context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList():\n
+  # remaining banknote which are not sorted yet, or cancelled one\n
+  if not \'ventilation\' in context.getSource():\n
+    return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(\'/\'.join(context.getSource().split(\'/\')[:3]),)\n
+  else:\n
+    # take classification into account here\n
+    source_list = context.getSource().split(\'/\')\n
+    return \'%s/caveau/auxiliaire/%s\' %(\'/\'.join(source_list[:3]),\'/\'.join(source_list[-2:]))\n
+elif context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList():\n
+  return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(\'/\'.join(context.getSource().split(\'/\')[:3]),)\n
+else:\n
+  return \'%s/caveau/externes/encaisse_des_externes\' %(\'/\'.join(context.getSource().split(\'/\')[:3]),)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_dav_writelocks</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>*args, **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>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>args</string>
+                            <string>kw</string>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>_getitem_</string>
+                            <string>source_list</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>OutgoingCashSortingCell_getBaobabDestination</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_container</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashClassificationLine_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingLine_getBaobabSource.xml
similarity index 84%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashClassificationLine_getBaobabDestination.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingLine_getBaobabSource.xml
index 7dfd090c81..b9ffc05961 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashClassificationLine_getBaobabDestination.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingLine_getBaobabSource.xml
@@ -66,13 +66,11 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>source = object.getBaobabSource()\n
-\n
-if source == \'\':\n
-  return \'\'\n
-\n
-root_source = source.split(\'/\')[:-2] # remove "encaisse des billets recu pour ventilation" + town\n
-return \'/\'.join(root_source[:]+[\'encaisse_des_externes\'])\n
+            <value> <string>if context.getCashStatus() == \'to_sort\':\n
+  # in this case, resource do not change\n
+  return context.getSource()\n
+else:\n
+  return None\n
 </string> </value>
         </item>
         <item>
@@ -83,7 +81,7 @@ return \'/\'.join(root_source[:]+[\'encaisse_des_externes\'])\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/OutgoingCashClassificationLine_getBaobabDestination</string> </value>
+            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/OutgoingCashSortingLine_getBaobabSource</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -93,7 +91,7 @@ return \'/\'.join(root_source[:]+[\'encaisse_des_externes\'])\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>object</string> </value>
+            <value> <string>*args, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -113,17 +111,17 @@ return \'/\'.join(root_source[:]+[\'encaisse_des_externes\'])\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
+                        <value> <int>0</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
-                            <string>object</string>
+                            <string>args</string>
+                            <string>kw</string>
                             <string>_getattr_</string>
-                            <string>source</string>
-                            <string>_getitem_</string>
-                            <string>root_source</string>
+                            <string>context</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
@@ -140,7 +138,7 @@ return \'/\'.join(root_source[:]+[\'encaisse_des_externes\'])\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>OutgoingCashClassificationLine_getBaobabDestination</string> </value>
+            <value> <string>OutgoingCashSortingLine_getBaobabSource</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList.xml
similarity index 94%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList.xml
index 270bb676d2..12d75bd973 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList.xml
@@ -100,7 +100,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashTransferModule_viewCashTransferList</string> </value>
+            <value> <string>UsualCashTransferModule_viewUsualCashTransferList</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
@@ -108,7 +108,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>CashTransferModule_viewCashTransferList</string> </value>
+            <value> <string>UsualCashTransferModule_viewUsualCashTransferList</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
@@ -124,7 +124,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Cash Transfers</string> </value>
+            <value> <string>Usual Cash Transfers</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox.xml
similarity index 98%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox.xml
index 58cba53c12..59268e38cf 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox.xml
@@ -454,7 +454,7 @@
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>
-                    <value> <string>CashTransferModule_viewCashTransferList</string> </value>
+                    <value> <string>UsualCashTransferModule_viewUsualCashTransferList</string> </value>
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
@@ -473,8 +473,8 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>Cash Transfer</string>
-                          <string>Cash Transfer</string>
+                          <string>Usual Cash Transfer</string>
+                          <string>Usual Cash Transfer</string>
                         </tuple>
                       </list>
                     </value>
@@ -531,7 +531,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Cash Transfers</string> </value>
+                    <value> <string>Usual Cash Transfers</string> </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_delivery_start_date.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox_delivery_start_date.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassificationModule_viewCashClassificationList/listbox_delivery_start_date.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox_delivery_start_date.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_destination_logical_path.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox_destination_logical_path.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_destination_logical_path.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox_destination_logical_path.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_source_logical_path.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox_source_logical_path.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_source_logical_path.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox_source_logical_path.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_source_total_asset_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox_source_total_asset_price.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransferModule_viewCashTransferList/listbox_source_total_asset_price.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransferModule_viewUsualCashTransferList/listbox_source_total_asset_price.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view.xml
similarity index 96%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view.xml
index 93f29168d3..37097221bf 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view.xml
@@ -131,7 +131,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashTransfer_view</string> </value>
+            <value> <string>UsualCashTransfer_view</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
@@ -139,7 +139,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>CashTransfer_view</string> </value>
+            <value> <string>UsualCashTransfer_view</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
@@ -155,7 +155,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Cash Transfer</string> </value>
+            <value> <string>Usual Cash Transfer</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/listbox.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/listbox.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/listbox.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/listbox.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/listbox_quantity.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/listbox_quantity.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/listbox_quantity.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/listbox_quantity.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/listbox_total_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/listbox_total_price.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/listbox_total_price.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/listbox_total_price.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_description.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_description.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_description.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_description.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_destination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_destination.xml
similarity index 98%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_destination.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_destination.xml
index 2b7fba5bd8..ea7037b284 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_destination.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_destination.xml
@@ -281,7 +281,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Delivery_getVaultItemList(current_url=here.getDestination(), vault_type=(\'site/surface\',\'site/caveau\'))</string> </value>
+            <value> <string>python:here.Delivery_getVaultItemList(current_url=here.getDestination(), vault_type=(\'site/surface/banque_interne\',\'site/surface/gros_paiement\',\'site/surface/operations_diverses\'), leaf_node=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_resource.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_resource.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_resource.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_resource.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_source.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_source.xml
similarity index 99%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_source.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_source.xml
index 47f0914550..bbccacdd1b 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_source.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_source.xml
@@ -281,7 +281,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Delivery_getVaultItemList(current_url=here.getDestination(), vault_type=(\'site/surface\',\'site/caveau\'))</string> </value>
+            <value> <string>python:here.Delivery_getVaultItemList(current_url=here.getSource(), vault_type=(\'site/surface/caisse_courante\',))</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source_reference.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_source_reference.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_source_reference.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_source_reference.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_source_total_asset_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_source_total_asset_price.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_source_total_asset_price.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_source_total_asset_price.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_start_date.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_start_date.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_start_date.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_start_date.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_total_price.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_total_price.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_view/my_total_price.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_total_price.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_translated_simulation_state_title.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_translated_simulation_state_title.xml
similarity index 100%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashClassification_view/my_translated_simulation_state_title.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_view/my_translated_simulation_state_title.xml
diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_viewLineFastInputDialog.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_viewLineFastInputDialog.xml
similarity index 97%
rename from bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_viewLineFastInputDialog.xml
rename to bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_viewLineFastInputDialog.xml
index bf81882d68..1277c94b47 100644
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashTransfer_viewLineFastInputDialog.xml
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/UsualCashTransfer_viewLineFastInputDialog.xml
@@ -113,7 +113,7 @@ return context.CashDetail_fastInputUpdate( listbox = None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/CashTransfer_viewLineFastInputDialog</string> </value>
+            <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_cash/UsualCashTransfer_viewLineFastInputDialog</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
@@ -176,7 +176,7 @@ return context.CashDetail_fastInputUpdate( listbox = None\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>CashTransfer_viewLineFastInputDialog</string> </value>
+            <value> <string>UsualCashTransfer_viewLineFastInputDialog</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-- 
2.30.9