From 1cb30f00d8591fa8f2f6510c0d4ff84982d58608 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Fri, 5 Nov 2010 16:24:06 +0000
Subject: [PATCH] update XML

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39974 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Business%20Link/predicate_view.xml            | 10 ++--------
 .../portal_types/Business%20Link/view.xml         | 10 ++--------
 .../Business%20Process%20Module/view.xml          | 10 ++--------
 .../Business%20Process/trade_model_path_view.xml  | 10 ++--------
 .../portal_types/Business%20Process/view.xml      | 10 ++--------
 .../portal_types/Container%20Line/view.xml        | 10 ++--------
 .../Container%20Line/view_quantity.xml            | 10 ++--------
 .../portal_types/Container/view.xml               | 10 ++--------
 .../portal_types/Delivery%20Cell/view.xml         | 10 ++--------
 .../Delivery%20Root%20Simulation%20Rule/view.xml  | 10 ++--------
 .../Delivery%20Simulation%20Rule/view.xml         | 10 ++--------
 .../First%20Causality%20Movement%20Group/view.xml | 10 ++--------
 .../portal_types/Internal%20Order%20Cell/view.xml | 10 ++--------
 .../Internal%20Order%20Line/price_view.xml        | 15 +++------------
 .../Internal%20Order%20Line/profile_view.xml      | 10 ++--------
 .../Internal%20Order%20Line/quantity_view.xml     | 15 +++------------
 .../portal_types/Internal%20Order%20Line/view.xml | 10 ++--------
 .../Internal%20Order%20Module/view.xml            | 10 ++--------
 .../Internal%20Order/fast_input_update.xml        | 10 ++--------
 .../jump_to_related_internal_packing_list.xml     | 10 ++--------
 .../portal_types/Internal%20Order/order_print.xml | 10 ++--------
 .../portal_types/Internal%20Order/view.xml        | 10 ++--------
 .../portal_types/Internal%20Order/view_stock.xml  | 10 ++--------
 .../Internal%20Packing%20List%20Cell/view.xml     | 10 ++--------
 .../profile_view.xml                              | 10 ++--------
 .../quantity_view.xml                             | 15 +++------------
 .../Internal%20Packing%20List%20Line/view.xml     | 10 ++--------
 .../view_price.xml                                | 15 +++------------
 .../delivery_line_report.xml                      | 10 ++--------
 .../Internal%20Packing%20List%20Module/view.xml   | 10 ++--------
 .../workflow_report.xml                           | 10 ++--------
 .../Internal%20Packing%20List/details.xml         | 10 ++--------
 .../fast_input_update.xml                         | 10 ++--------
 .../payment_condition.xml                         | 10 ++--------
 .../Internal%20Packing%20List/profile_view.xml    | 10 ++--------
 .../Internal%20Packing%20List/view.xml            | 10 ++--------
 .../Internal%20Packing%20List/view_stock.xml      | 10 ++--------
 .../portal_types/Inventory%20Cell/view.xml        | 10 ++--------
 .../Inventory%20Line/inventory_view.xml           | 15 +++------------
 .../portal_types/Inventory%20Line/price_view.xml  | 15 +++------------
 .../portal_types/Inventory%20Line/view.xml        | 10 ++--------
 .../portal_types/Inventory%20Module/view.xml      | 10 ++--------
 .../Inventory%20Module/view_stock_export.xml      | 15 +++------------
 .../Inventory%20Module/view_stock_report.xml      | 10 ++--------
 .../portal_types/Inventory/fast_input_update.xml  | 10 ++--------
 .../portal_types/Inventory/view.xml               | 10 ++--------
 .../Order%20Root%20Simulation%20Rule/view.xml     | 10 ++--------
 .../Organisation/jump_to_purchase_order.xml       | 15 +++------------
 .../jump_to_purchase_packing_list.xml             | 10 ++--------
 .../Organisation/jump_to_sale_order.xml           | 15 +++------------
 .../Organisation/jump_to_sale_packing_list.xml    | 15 +++------------
 .../portal_types/Payment%20Condition/view.xml     | 10 ++--------
 .../Person/jump_to_purchase_order.xml             | 15 +++------------
 .../Person/jump_to_purchase_packing_list.xml      | 15 +++------------
 .../portal_types/Person/jump_to_sale_order.xml    | 15 +++------------
 .../Person/jump_to_sale_packing_list.xml          | 15 +++------------
 .../portal_types/Purchase%20Order%20Cell/view.xml | 10 ++--------
 .../Purchase%20Order%20Line/price_view.xml        | 15 +++------------
 .../Purchase%20Order%20Line/profile_view.xml      | 10 ++--------
 .../Purchase%20Order%20Line/quantity_view.xml     | 15 +++------------
 .../portal_types/Purchase%20Order%20Line/view.xml | 10 ++--------
 .../Purchase%20Order%20Line/view_trade_model.xml  | 10 ++--------
 .../delivery_line_report.xml                      | 10 ++--------
 .../Purchase%20Order%20Module/order_export.xml    | 15 +++------------
 .../Purchase%20Order%20Module/order_report.xml    | 10 ++--------
 .../Purchase%20Order%20Module/view.xml            | 10 ++--------
 .../Purchase%20Order/apply_trade_condition.xml    | 10 ++--------
 .../Purchase%20Order/fast_input_update.xml        | 10 ++--------
 .../jump_to_related_purchase_packing_list.xml     | 10 ++--------
 .../portal_types/Purchase%20Order/order_print.xml | 10 ++--------
 .../Purchase%20Order/payment_condition.xml        | 10 ++--------
 .../Purchase%20Order/profile_view.xml             | 10 ++--------
 .../reset_movement_price_list.xml                 | 10 ++--------
 .../portal_types/Purchase%20Order/view.xml        | 10 ++--------
 .../portal_types/Purchase%20Order/view_stock.xml  | 10 ++--------
 .../Purchase%20Order/view_trade_model.xml         | 10 ++--------
 .../Purchase%20Packing%20List%20Cell/view.xml     | 10 ++--------
 .../profile_view.xml                              | 10 ++--------
 .../quantity_view.xml                             | 15 +++------------
 .../Purchase%20Packing%20List%20Line/view.xml     | 10 ++--------
 .../view_price.xml                                | 15 +++------------
 .../delivery_line_report.xml                      | 10 ++--------
 .../Purchase%20Packing%20List%20Module/view.xml   | 10 ++--------
 .../Purchase%20Packing%20List/details.xml         | 10 ++--------
 .../fast_input_update.xml                         | 10 ++--------
 .../jump_related_order.xml                        | 10 ++--------
 .../jump_related_purchase_invoice.xml             | 10 ++--------
 .../packing_list_print.xml                        | 10 ++--------
 .../payment_condition.xml                         | 10 ++--------
 .../Purchase%20Packing%20List/profile_view.xml    | 10 ++--------
 .../reset_movement_price_list.xml                 | 10 ++--------
 .../Purchase%20Packing%20List/view.xml            | 10 ++--------
 .../Purchase%20Packing%20List/view_stock.xml      | 10 ++--------
 .../view.xml                                      | 10 ++--------
 .../Purchase%20Trade%20Condition/view.xml         | 10 ++--------
 .../Purchase%20Trade%20Condition/view_payment.xml | 10 ++--------
 .../Purchase%20Trade%20Condition/view_profile.xml | 10 ++--------
 .../view_trade_model_line_list.xml                | 10 ++--------
 .../view.xml                                      | 10 ++--------
 .../price_view.xml                                | 15 +++------------
 .../profile_view.xml                              | 10 ++--------
 .../quantity_view.xml                             | 15 +++------------
 .../view.xml                                      | 10 ++--------
 .../delivery_line_report.xml                      | 10 ++--------
 .../view.xml                                      | 10 ++--------
 .../workflow_report.xml                           | 10 ++--------
 .../details.xml                                   | 10 ++--------
 .../jump_related_purchase_invoice.xml             | 10 ++--------
 .../payment_condition.xml                         | 10 ++--------
 .../profile_view.xml                              | 10 ++--------
 .../Returned%20Purchase%20Packing%20List/view.xml | 10 ++--------
 .../view_stock.xml                                | 10 ++--------
 .../view.xml                                      | 10 ++--------
 .../price_view.xml                                | 15 +++------------
 .../profile_view.xml                              | 10 ++--------
 .../quantity_view.xml                             | 15 +++------------
 .../view.xml                                      | 10 ++--------
 .../delivery_line_report.xml                      | 10 ++--------
 .../view.xml                                      | 10 ++--------
 .../workflow_report.xml                           | 10 ++--------
 .../Returned%20Sale%20Packing%20List/details.xml  | 10 ++--------
 .../jump_related_sale_invoice.xml                 | 10 ++--------
 .../payment_condition.xml                         | 10 ++--------
 .../profile_view.xml                              | 10 ++--------
 .../Returned%20Sale%20Packing%20List/view.xml     | 10 ++--------
 .../view_stock.xml                                | 10 ++--------
 .../portal_types/Sale%20Order%20Cell/view.xml     | 10 ++--------
 .../Sale%20Order%20Line/price_view.xml            | 15 +++------------
 .../Sale%20Order%20Line/profile_view.xml          | 10 ++--------
 .../Sale%20Order%20Line/quantity_view.xml         | 15 +++------------
 .../portal_types/Sale%20Order%20Line/view.xml     | 10 ++--------
 .../Sale%20Order%20Line/view_trade_model.xml      | 10 ++--------
 .../delivery_line_report.xml                      | 10 ++--------
 .../Sale%20Order%20Module/order_export.xml        | 15 +++------------
 .../Sale%20Order%20Module/order_report.xml        | 10 ++--------
 .../portal_types/Sale%20Order%20Module/view.xml   | 10 ++--------
 .../Sale%20Order%20Module/workflow_report.xml     | 10 ++--------
 .../Sale%20Order/apply_trade_condition.xml        | 10 ++--------
 .../Sale%20Order/fast_input_update.xml            | 10 ++--------
 .../jump_to_related_sale_packing_list.xml         | 10 ++--------
 .../portal_types/Sale%20Order/order_print.xml     | 10 ++--------
 .../portal_types/Sale%20Order/order_summary.xml   | 10 ++--------
 .../Sale%20Order/payment_condition.xml            | 10 ++--------
 .../portal_types/Sale%20Order/profile_view.xml    | 10 ++--------
 .../Sale%20Order/reference_generate.xml           | 10 ++--------
 .../Sale%20Order/reset_movement_price_list.xml    | 10 ++--------
 .../Sale%20Order/sale_order_planning.xml          | 15 +++------------
 .../portal_types/Sale%20Order/view.xml            | 10 ++--------
 .../portal_types/Sale%20Order/view_stock.xml      | 10 ++--------
 .../Sale%20Order/view_trade_model.xml             | 10 ++--------
 .../Sale%20Packing%20List%20Cell/view.xml         | 10 ++--------
 .../Sale%20Packing%20List%20Line/price_view.xml   | 15 +++------------
 .../Sale%20Packing%20List%20Line/profile_view.xml | 10 ++--------
 .../quantity_view.xml                             | 15 +++------------
 .../Sale%20Packing%20List%20Line/view.xml         | 10 ++--------
 .../delivery_line_report.xml                      | 10 ++--------
 .../Sale%20Packing%20List%20Module/view.xml       | 10 ++--------
 .../workflow_report.xml                           | 10 ++--------
 .../container_fast_input.xml                      | 10 ++--------
 .../Sale%20Packing%20List/details.xml             | 10 ++--------
 .../Sale%20Packing%20List/fast_input_update.xml   | 10 ++--------
 .../Sale%20Packing%20List/jump_related_order.xml  | 10 ++--------
 .../jump_related_sale_invoice.xml                 | 10 ++--------
 .../Sale%20Packing%20List/packing_list_print.xml  | 10 ++--------
 .../Sale%20Packing%20List/payment_condition.xml   | 10 ++--------
 .../Sale%20Packing%20List/profile_view.xml        | 10 ++--------
 .../reset_movement_price_list.xml                 | 10 ++--------
 .../portal_types/Sale%20Packing%20List/view.xml   | 10 ++--------
 .../Sale%20Packing%20List/view_container_list.xml | 10 ++--------
 .../Sale%20Packing%20List/view_stock.xml          | 10 ++--------
 .../Sale%20Trade%20Condition%20Module/view.xml    | 10 ++--------
 .../Sale%20Trade%20Condition/view.xml             | 10 ++--------
 .../Sale%20Trade%20Condition/view_payment.xml     | 10 ++--------
 .../Sale%20Trade%20Condition/view_profile.xml     | 10 ++--------
 .../view_trade_model_line_list.xml                | 10 ++--------
 .../System%20Preference/trade_preference.xml      | 10 ++--------
 .../Trade%20Model%20Line/predicate_view.xml       | 10 ++--------
 .../portal_types/Trade%20Model%20Line/view.xml    | 10 ++--------
 .../Trade%20Model%20Path/predicate_view.xml       | 10 ++--------
 .../portal_types/Trade%20Model%20Path/profile.xml | 10 ++--------
 .../portal_types/Trade%20Model%20Path/view.xml    | 10 ++--------
 bt5/erp5_trade/bt/revision                        |  2 +-
 182 files changed, 392 insertions(+), 1565 deletions(-)

diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Link/predicate_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Link/predicate_view.xml
index 5b1d8fedcd..ec8e85c880 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Link/predicate_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Link/predicate_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Link/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Link/view.xml
index 2161347e0c..f3b8b6150b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Link/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Link/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process%20Module/view.xml
index 41720b8f0d..56069c872e 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process/trade_model_path_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process/trade_model_path_view.xml
index e67e0bb662..0a71dd090e 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process/trade_model_path_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process/trade_model_path_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process/view.xml
index 4e8b921953..ac36db22c5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Business%20Process/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml
index 6f04c0835b..9890f89c58 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml
index 4db82f3508..368855f8df 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container%20Line/view_quantity.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml
index 583d1c6f69..91831a4705 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Container/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Root%20Simulation%20Rule/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Root%20Simulation%20Rule/view.xml
index 2b7a0e0ab4..4a16964623 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Root%20Simulation%20Rule/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Root%20Simulation%20Rule/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Simulation%20Rule/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Simulation%20Rule/view.xml
index 2b7a0e0ab4..4a16964623 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Simulation%20Rule/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Delivery%20Simulation%20Rule/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/First%20Causality%20Movement%20Group/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/First%20Causality%20Movement%20Group/view.xml
index 5bffd3566b..ef34a51007 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/First%20Causality%20Movement%20Group/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/First%20Causality%20Movement%20Group/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/price_view.xml
index 6ecf8f090e..f5cf5c4f95 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/price_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/profile_view.xml
index 6a27c98524..2e9b540e87 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/quantity_view.xml
index c3372f95e7..c92b1c1675 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/quantity_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/view.xml
index 6513870e8f..2544dfb712 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Module/view.xml
index 823f50abb1..da3ba9acf1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -72,10 +69,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/fast_input_update.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/fast_input_update.xml
index e2f0ae0a04..2d8db21543 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/fast_input_update.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/fast_input_update.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/jump_to_related_internal_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/jump_to_related_internal_packing_list.xml
index b95fa784ec..c8248f7a52 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/jump_to_related_internal_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/jump_to_related_internal_packing_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/order_print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/order_print.xml
index 3ae1ffb9bb..95e71c1475 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/order_print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/order_print.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/view.xml
index 474efe7a78..c2a73bad1b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -72,10 +69,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/view_stock.xml
index 9ebc7ba482..42d93b240c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Order/view_stock.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/profile_view.xml
index 8677dcf9af..245e7a3d17 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/quantity_view.xml
index c3372f95e7..c92b1c1675 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/quantity_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml
index 3573751bed..357e33107f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view_price.xml
index 9dba256ec6..520454139a 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/view_price.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/delivery_line_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/delivery_line_report.xml
index 33b69bbbf2..9180e2d1c8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/delivery_line_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/delivery_line_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml
index 01f502d3e4..81c373aa5d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/workflow_report.xml
index ebaaabbef2..0bb7a471fb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Module/workflow_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/details.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/details.xml
index b966106309..acc5e9d290 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/details.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/details.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/fast_input_update.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/fast_input_update.xml
index e2f0ae0a04..2d8db21543 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/fast_input_update.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/fast_input_update.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/payment_condition.xml
index f061668141..e1e141a8c1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/payment_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/profile_view.xml
index f0be1d6bb6..663595b98b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml
index 28f2d0f4ab..ca5c5b3de0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view_stock.xml
index 1e7c469918..ffda0d0107 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Internal%20Packing%20List/view_stock.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml
index 2a39c63631..a139bbe3fe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml
index 90a78a271b..dc48702bd3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/inventory_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml
index ba37f272aa..27809b64ab 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/price_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
index 66d9fa5398..6120a178e3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml
index b852a93bf5..e4cb25b4b8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view_stock_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view_stock_export.xml
index 500e8d3f3e..9169f3c741 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view_stock_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view_stock_export.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Base_viewStockReportBySiteDialog?your_portal_skin=ODS&your_
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view_stock_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view_stock_report.xml
index b52267c1c7..53e5bdd882 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view_stock_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Module/view_stock_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/fast_input_update.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/fast_input_update.xml
index e2f0ae0a04..2d8db21543 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/fast_input_update.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/fast_input_update.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml
index bc15587564..fdf648872c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Root%20Simulation%20Rule/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Root%20Simulation%20Rule/view.xml
index 2b7a0e0ab4..4a16964623 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Root%20Simulation%20Rule/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Order%20Root%20Simulation%20Rule/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
index 31582b0ec3..f1aaabc4ff 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=source&portal_type=P
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
index 0de22ef88b..69aa0ad101 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -72,10 +69,7 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=source&portal_type=P
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
index fb95714cbe..a38ffe62da 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=destination&portal_t
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
index 0cf09d0372..88c73169a9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=destination&portal_t
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml
index 05b1b14c9a..26235eaf56 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Payment%20Condition/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
index 8d1b64aede..6bd7accfc2 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_order.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=source&portal_type=P
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
index 37f8e2ddb9..ac67fe601f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_purchase_packing_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=source&portal_type=P
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
index d45485135b..782689571d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_order.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=destination&portal_t
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
index d9d89cc9fa..cddffad5e9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Person/jump_to_sale_packing_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/Base_jumpToRelatedObject?base_category=destination&portal_t
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml
index 6ecf8f090e..f5cf5c4f95 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/price_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/profile_view.xml
index 5e9c086493..bf860bdcd3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml
index c3372f95e7..c92b1c1675 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/quantity_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml
index 6513870e8f..2544dfb712 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml
index 652d0a864b..8d3f58fb57 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/delivery_line_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/delivery_line_report.xml
index 84edfcdbfc..1d0aa4ea21 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/delivery_line_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/delivery_line_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_export.xml
index 77d8c828c1..eea754e3f4 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_export.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/OrderModule_viewOrderReportDialog?your_portal_skin=ODS&your
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_report.xml
index c3e290ff31..2691de0f07 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml
index 2a89ab43bd..a23d9b98d8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml
index 0f782bb0bd..dfff0c0bcf 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/apply_trade_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/fast_input_update.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/fast_input_update.xml
index e2f0ae0a04..2d8db21543 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/fast_input_update.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/fast_input_update.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/jump_to_related_purchase_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/jump_to_related_purchase_packing_list.xml
index 5c35b97dda..cc45c45a9a 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/jump_to_related_purchase_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/jump_to_related_purchase_packing_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/order_print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/order_print.xml
index 3ae1ffb9bb..95e71c1475 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/order_print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/order_print.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml
index f061668141..e1e141a8c1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/payment_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml
index d6445de7d8..f12da488c7 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/reset_movement_price_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/reset_movement_price_list.xml
index d612169f1a..4e134ef3bc 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/reset_movement_price_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/reset_movement_price_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml
index b2450fcccb..109802b73a 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_stock.xml
index 9ebc7ba482..42d93b240c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_stock.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml
index e8a2578db9..d8c5e7d31a 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/profile_view.xml
index 5e9c086493..bf860bdcd3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/quantity_view.xml
index c3372f95e7..c92b1c1675 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/quantity_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml
index 3573751bed..357e33107f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view_price.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view_price.xml
index 9dba256ec6..520454139a 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view_price.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/view_price.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/delivery_line_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/delivery_line_report.xml
index 1a497031c9..c308b866b3 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/delivery_line_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/delivery_line_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml
index e2cdbd2577..956ded7e7c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/details.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/details.xml
index 7271987cf7..cab0f2ccf9 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/details.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/details.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/fast_input_update.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/fast_input_update.xml
index e2f0ae0a04..2d8db21543 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/fast_input_update.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/fast_input_update.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_order.xml
index e23c9a90ee..5a2d5b8e69 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_order.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_invoice.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_invoice.xml
index 6361ff3f97..7e0a9da4fe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_invoice.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/jump_related_purchase_invoice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/packing_list_print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/packing_list_print.xml
index 85b1fa4a4a..f95ce028da 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/packing_list_print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/packing_list_print.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/payment_condition.xml
index f061668141..e1e141a8c1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/payment_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/profile_view.xml
index 277adf8b8b..c9a5104961 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/reset_movement_price_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/reset_movement_price_list.xml
index 5a0505a3e6..1c5b47bcea 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/reset_movement_price_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/reset_movement_price_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml
index 6c2284cd5c..20d2ffd5b4 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view_stock.xml
index 1e7c469918..ffda0d0107 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List/view_stock.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml
index ec460e8695..4739b74c0b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml
index f4f6d38863..0860f89751 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml
index 58a19a2ef5..31adb120ce 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_payment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml
index d68b465a80..0f13bbb334 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_profile.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_trade_model_line_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_trade_model_line_list.xml
index 2b99b1c6c9..55165528b5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_trade_model_line_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Trade%20Condition/view_trade_model_line_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/price_view.xml
index 764d0ee5b5..00bc2ac835 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/price_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/profile_view.xml
index 8677dcf9af..245e7a3d17 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/quantity_view.xml
index c21ab88a61..3e9fc33abe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/quantity_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/view.xml
index 3573751bed..357e33107f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/delivery_line_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/delivery_line_report.xml
index 545320522f..ba4659f4e0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/delivery_line_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/delivery_line_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/view.xml
index 50018e1bf6..1a367f76df 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -72,10 +69,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/workflow_report.xml
index 5ee472ed97..7fc2fe6d61 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Module/workflow_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/details.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/details.xml
index 7f99f50d3a..1287f88c37 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/details.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/details.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/jump_related_purchase_invoice.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/jump_related_purchase_invoice.xml
index dd5bb90bc4..425ef080c0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/jump_related_purchase_invoice.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/jump_related_purchase_invoice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/payment_condition.xml
index 10e9945164..505fb02bb8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/payment_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/profile_view.xml
index 29f8952a38..9897545565 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/view.xml
index 8fd972adb6..211ee40459 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -72,10 +69,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/view_stock.xml
index fd3e1f7b01..144aad0470 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List/view_stock.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/price_view.xml
index 764d0ee5b5..00bc2ac835 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/price_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/profile_view.xml
index 8677dcf9af..245e7a3d17 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/quantity_view.xml
index c21ab88a61..3e9fc33abe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/quantity_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/view.xml
index 3573751bed..357e33107f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/delivery_line_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/delivery_line_report.xml
index 545320522f..ba4659f4e0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/delivery_line_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/delivery_line_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/view.xml
index ce7696f725..12c9f3bb1f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/workflow_report.xml
index 5ee472ed97..7fc2fe6d61 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Module/workflow_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/details.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/details.xml
index a84aed3c04..4036a21a7d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/details.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/details.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/jump_related_sale_invoice.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/jump_related_sale_invoice.xml
index 69d73b79a8..a417745545 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/jump_related_sale_invoice.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/jump_related_sale_invoice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/payment_condition.xml
index 10e9945164..505fb02bb8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/payment_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/profile_view.xml
index 29f8952a38..9897545565 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view.xml
index ca7e57e366..98cb820b2e 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view_stock.xml
index fd3e1f7b01..144aad0470 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List/view_stock.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml
index 6ecf8f090e..f5cf5c4f95 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/price_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/profile_view.xml
index b010af2dcd..d2fd68a4ec 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml
index c3372f95e7..c92b1c1675 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/quantity_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml
index 6513870e8f..2544dfb712 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml
index 652d0a864b..8d3f58fb57 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/delivery_line_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/delivery_line_report.xml
index 84edfcdbfc..1d0aa4ea21 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/delivery_line_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/delivery_line_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_export.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_export.xml
index 77d8c828c1..eea754e3f4 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_export.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -90,10 +84,7 @@ string:${object_url}/OrderModule_viewOrderReportDialog?your_portal_skin=ODS&your
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_report.xml
index c3e290ff31..2691de0f07 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml
index 8f8fc92d22..473f39a6b8 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml
index 5ee472ed97..7fc2fe6d61 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/workflow_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml
index 0606775505..2fe79baae0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/apply_trade_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/fast_input_update.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/fast_input_update.xml
index e2f0ae0a04..2d8db21543 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/fast_input_update.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/fast_input_update.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/jump_to_related_sale_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/jump_to_related_sale_packing_list.xml
index de34cd70ec..05827cf1cf 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/jump_to_related_sale_packing_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/jump_to_related_sale_packing_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_print.xml
index 3ae1ffb9bb..95e71c1475 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_print.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_summary.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_summary.xml
index 4ddd80e18a..948d91d950 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_summary.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/order_summary.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml
index f061668141..e1e141a8c1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/payment_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml
index a2e52ae475..e7ed81bc0b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/reference_generate.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/reference_generate.xml
index b3fdf0d642..93c5b8fed0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/reference_generate.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/reference_generate.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/reset_movement_price_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/reset_movement_price_list.xml
index 5a0505a3e6..1c5b47bcea 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/reset_movement_price_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/reset_movement_price_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/sale_order_planning.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/sale_order_planning.xml
index 5018102fa5..a456353ebb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/sale_order_planning.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/sale_order_planning.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml
index 010d77867a..aa5e3b986b 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml
index 9ebc7ba482..42d93b240c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_stock.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml
index e8a2578db9..d8c5e7d31a 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml
index d13ef86763..6fae3ee199 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Cell/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/price_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/price_view.xml
index 6ecf8f090e..f5cf5c4f95 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/price_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/price_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/profile_view.xml
index b010af2dcd..d2fd68a4ec 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/quantity_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/quantity_view.xml
index c3372f95e7..c92b1c1675 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/quantity_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/quantity_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,10 +80,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml
index 3573751bed..357e33107f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/delivery_line_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/delivery_line_report.xml
index 545320522f..ba4659f4e0 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/delivery_line_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/delivery_line_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml
index 75e4f98df8..fa77ab49e5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/workflow_report.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/workflow_report.xml
index 5ee472ed97..7fc2fe6d61 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/workflow_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/workflow_report.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/container_fast_input.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/container_fast_input.xml
index d12854e53a..3720699f7c 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/container_fast_input.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/container_fast_input.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/details.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/details.xml
index 93f2a256fa..c8d9077d67 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/details.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/details.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/fast_input_update.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/fast_input_update.xml
index e2f0ae0a04..2d8db21543 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/fast_input_update.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/fast_input_update.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_order.xml
index 820c654724..a98e89aed6 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_order.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_order.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_sale_invoice.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_sale_invoice.xml
index 69d73b79a8..a417745545 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_sale_invoice.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/jump_related_sale_invoice.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/packing_list_print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/packing_list_print.xml
index 3c54339145..be33d8bc16 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/packing_list_print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/packing_list_print.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/payment_condition.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/payment_condition.xml
index f061668141..e1e141a8c1 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/payment_condition.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/payment_condition.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/profile_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/profile_view.xml
index 20afc44f84..5330c1f5c5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/profile_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/profile_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/reset_movement_price_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/reset_movement_price_list.xml
index 5a0505a3e6..1c5b47bcea 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/reset_movement_price_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/reset_movement_price_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml
index 9364bf1d92..608ff2c87d 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_container_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_container_list.xml
index 15fa93e760..370c7e75cb 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_container_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_container_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_stock.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_stock.xml
index 1e7c469918..ffda0d0107 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_stock.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List/view_stock.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml
index e6d0847b8f..1939f7e8ad 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition%20Module/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml
index f6ef6b2665..ce2fedea22 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml
index 58a19a2ef5..31adb120ce 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_payment.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml
index 7f7e649f65..8f228479aa 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_profile.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_trade_model_line_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_trade_model_line_list.xml
index 2b99b1c6c9..55165528b5 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_trade_model_line_list.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Trade%20Condition/view_trade_model_line_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/System%20Preference/trade_preference.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/System%20Preference/trade_preference.xml
index 6a65f115f6..c2c9c520d2 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/System%20Preference/trade_preference.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/System%20Preference/trade_preference.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Line/predicate_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Line/predicate_view.xml
index 78c5665612..b1343b5438 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Line/predicate_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Line/predicate_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,10 +71,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Line/view.xml
index a94bad7ada..c6c692392f 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Line/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/predicate_view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/predicate_view.xml
index 5b1d8fedcd..ec8e85c880 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/predicate_view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/predicate_view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/profile.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/profile.xml
index 38f008fc3f..23ec4607f6 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/profile.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/profile.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/view.xml
index 00bb8106f1..a33c7e9a57 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Trade%20Model%20Path/view.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index f3d2a1110f..546440c6fd 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-1004
\ No newline at end of file
+1005
\ No newline at end of file
-- 
2.30.9