From 545ad599e119ebe5e803718452825b92dd6598bf Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Fri, 6 Jan 2006 13:11:37 +0000
Subject: [PATCH] Add Delivery_viewInventory

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5039 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Organisation/jump_to_purchase_order.xml   |   2 +-
 .../jump_to_purchase_packing_list.xml         |   2 +-
 .../Organisation/jump_to_sale_order.xml       |   2 +-
 .../jump_to_sale_packing_list.xml             |   2 +-
 .../allowed_content_types.xml                 |  97 ++++
 .../hidden_content_type_list.xml              |  26 +
 .../property_sheet_list.xml                   |  12 +
 .../portal_types/Container%20Line.xml         |   8 +-
 .../portal_types/Container.xml                |   5 +-
 .../portal_types/Delivery%20Rule.xml          |  18 +
 .../Internal%20Packing%20List%20Line.xml      |   8 +-
 .../Internal%20Packing%20List%20Module.xml    |  22 +-
 .../Internal%20Packing%20List.xml             |   4 +-
 .../portal_types/Inventory%20Line.xml         |   8 +-
 .../portal_types/Inventory%20Module.xml       |  22 +-
 .../portal_types/Inventory.xml                |   4 +-
 .../portal_types/Order%20Rule.xml             |  18 +
 .../portal_types/Purchase%20Order%20Line.xml  |   8 +-
 .../Purchase%20Order%20Module.xml             |  22 +-
 .../portal_types/Purchase%20Order.xml         |   6 +-
 .../Purchase%20Packing%20List%20Line.xml      |   8 +-
 .../Purchase%20Packing%20List%20Module.xml    |  22 +-
 .../Purchase%20Packing%20List.xml             |   4 +-
 .../Purchase%20Supply%20Module.xml            |   4 +-
 .../portal_types/Purchase%20Supply.xml        |   4 +-
 .../Purchase%20Trade%20Condition%20Module.xml |   4 +-
 .../Purchase%20Trade%20Condition.xml          |   5 +-
 .../portal_types/Sale%20Order%20Line.xml      |   8 +-
 .../portal_types/Sale%20Order%20Module.xml    |  22 +-
 .../portal_types/Sale%20Order.xml             | 155 ++++--
 .../Sale%20Packing%20List%20Line.xml          |   8 +-
 .../Sale%20Packing%20List%20Module.xml        |  22 +-
 .../portal_types/Sale%20Packing%20List.xml    |   5 +-
 .../portal_types/Sale%20Supply%20Module.xml   |   4 +-
 .../portal_types/Sale%20Supply.xml            |   4 +-
 .../Sale%20Trade%20Condition%20Module.xml     |   4 +-
 .../portal_types/Sale%20Trade%20Condition.xml |  10 +-
 .../portal_types/Supply%20Cell.xml            |   4 +-
 .../portal_types/Supply%20Line.xml            |   8 +-
 .../erp5_trade/ContainerLine_asCellRange.xml  |  26 +-
 .../erp5_trade/DeliveryCell_asPredicate.xml   |  12 +-
 .../erp5_trade/DeliveryLine_asCellRange.xml   |  27 +-
 ...veryLine_hashVariationCategoryItemList.xml |  40 +-
 .../erp5_trade/Delivery_confirm.xml           |  15 +-
 .../erp5_trade/Delivery_mergeDeliveryList.xml |  25 +-
 .../Delivery_setCausalityFromSimulation.xml   |  38 +-
 .../erp5_trade/Delivery_viewInventory.xml     | 153 +++++
 .../current_inventory_chart.xml               | 244 ++++++++
 .../Delivery_viewInventory/listbox.xml        | 524 ++++++++++++++++++
 .../Delivery_viewInventory/my_title.xml       | 234 ++++++++
 .../erp5_trade/InventoryLine_asCellRange.xml  |  26 +-
 .../erp5_trade/Movement_getPackedQuantity.xml |  21 +-
 .../erp5_trade/OrderLine_asCellRange.xml      |  26 +-
 .../PackingListContent_updateAfterEdit.xml    |  14 +-
 .../PackingList_copyOrderProperties.xml       |  17 +-
 .../erp5_trade/PackingList_doSolveActions.xml |  48 +-
 ...chaseOrder_applyPurchaseTradeCondition.xml |  90 +--
 .../PurchaseOrder_selectMovement.xml          |  23 +-
 ...urchasePackingList_copyOrderProperties.xml |  17 +-
 .../PurchaseTradeCondition_asPredicate.xml    |  13 +-
 .../Resource_getDefaultSupplyLine.xml         |  11 +-
 .../SaleOrder_applySaleTradeCondition.xml     | 101 +---
 .../erp5_trade/SaleOrder_selectMovement.xml   |  23 +-
 .../SalePackingList_copyOrderProperties.xml   |  21 +-
 .../erp5_trade/SalePackingList_fastInput.xml  |  81 +--
 .../SaleTradeCondition_asPredicate.xml        |  13 +-
 .../erp5_trade/SupplyCell_asPredicate.xml     |  12 +-
 ...yCell_getLocalPredicatePropertyDict%20.xml |  12 +-
 .../erp5_trade/SupplyLine_asCellRange.xml     |  56 +-
 .../erp5_trade/SupplyLine_asPredicate.xml     |  12 +-
 .../erp5_trade/SupplyLine_init.xml            |  15 +-
 .../erp5_trade/TradeCondition_getDueDate.xml  |  36 +-
 ...ondition_getLocalPredicatePropertyDict.xml |  16 +-
 .../scripts/DeliveryCell_UpdateSimulation.xml |  11 +-
 .../scripts/DeliveryLine_UpdateSimulation.xml |  11 +-
 ...ivery_ReindexRelatedSimulationMovement.xml |  27 +-
 .../scripts/Delivery_UpdateSimulation.xml     |  32 +-
 .../scripts/Order_updateAppliedRule.xml       |  13 +-
 .../Order_appliedToRelatedMovement.xml        |  12 +-
 .../scripts/Order_buildPackingList.xml        |  25 +-
 .../scripts/Order_createOrderRule.xml         |  15 +-
 .../scripts/Order_validateData.xml            |  29 +-
 .../scripts/PackingList_acceptDecision.xml    |  14 +-
 .../scripts/PackingList_adoptPrevision.xml    |  21 +-
 .../scripts/PackingList_afterEdit.xml         |  12 +-
 ...ckingList_callSplitPrevisionTransition.xml |  17 +-
 .../scripts/PackingList_split.xml             |  32 +-
 ...st_updateQuantityFromContainerQuantity.xml |  15 +-
 ...ntainer_activateUpdatePackingListState.xml |  13 +-
 .../Container_updatePackingListState.xml      |  13 +-
 .../PackingListContent_beforeDelete.xml       |  17 +-
 ...kingListContent_updatePackingListState.xml |  16 +-
 .../scripts/PackingList_updateAppliedRule.xml |  15 +-
 .../scripts/PackingList_buildInvoice.xml      |  27 +-
 .../scripts/PackingList_updateAppliedRule.xml |  32 +-
 .../SupplyLine_updateBasePriceCellRange.xml   |  15 +-
 ...upplyLine_updateDiscountRatioCellRange.xml |  15 +-
 ..._updateExclusiveDiscountRatioCellRange.xml |  16 +-
 ...updateOptionalAdditionalPriceCellRange.xml |  16 +-
 ...e_updateOptionalDiscountRatioCellRange.xml |  14 +-
 ...ptionalExclusiveDiscountRatioCellRange.xml |  15 +-
 ..._updateOptionalSurchargeRatioCellRange.xml |  14 +-
 ...pplyLine_updateSurchargeRatioCellRange.xml |  15 +-
 .../scripts/DeliveryLine_updateCellRange.xml  |  12 +-
 bt5/erp5_trade/bt/change_log                  |   3 +
 .../bt/template_catalog_full_text_key_list    |   0
 .../bt/template_catalog_keyword_key_list      |   0
 .../bt/template_catalog_multivalue_key_list   |   0
 .../bt/template_catalog_request_key_list      |   0
 .../bt/template_catalog_topic_key_list        |   0
 bt5/erp5_trade/bt/template_local_roles_list   |   0
 ...late_portal_type_allowed_content_type_list |  37 ++
 .../template_portal_type_base_category_list   |   0
 ...plate_portal_type_hidden_content_type_list |   8 +
 .../template_portal_type_property_sheet_list  |   4 +
 115 files changed, 1829 insertions(+), 1417 deletions(-)
 create mode 100755 bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
 create mode 100755 bt5/erp5_trade/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
 create mode 100755 bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
 create mode 100755 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
 create mode 100755 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/current_inventory_chart.xml
 create mode 100755 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
 create mode 100755 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/my_title.xml
 create mode 100755 bt5/erp5_trade/bt/template_catalog_full_text_key_list
 create mode 100755 bt5/erp5_trade/bt/template_catalog_keyword_key_list
 create mode 100755 bt5/erp5_trade/bt/template_catalog_multivalue_key_list
 create mode 100755 bt5/erp5_trade/bt/template_catalog_request_key_list
 create mode 100755 bt5/erp5_trade/bt/template_catalog_topic_key_list
 create mode 100755 bt5/erp5_trade/bt/template_local_roles_list
 create mode 100755 bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
 create mode 100755 bt5/erp5_trade/bt/template_portal_type_base_category_list
 create mode 100755 bt5/erp5_trade/bt/template_portal_type_hidden_content_type_list
 create mode 100755 bt5/erp5_trade/bt/template_portal_type_property_sheet_list

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 24b0a44500..9bf5e37b61 100755
--- 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
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
+            <value> <float>10.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
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 bc0cf0060e..a5551a1f5e 100755
--- 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
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
+            <value> <float>10.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
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 c1b62070e7..27239615e9 100755
--- 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
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
+            <value> <float>10.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
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 69b98e3386..ce0a164c2a 100755
--- 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
@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
+            <value> <float>10.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
new file mode 100755
index 0000000000..7a2707abdf
--- /dev/null
+++ b/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -0,0 +1,97 @@
+<allowed_content_type_list>
+ <portal_type id="Container">
+  <item>Container Line</item>
+  <item>Container</item>
+ </portal_type>
+ <portal_type id="Container Line">
+  <item>Container Cell</item>
+ </portal_type>
+ <portal_type id="Internal Packing List">
+  <item>Internal Packing List Line</item>
+ </portal_type>
+ <portal_type id="Internal Packing List Line">
+  <item>Delivery Cell</item>
+ </portal_type>
+ <portal_type id="Internal Packing List Module">
+  <item>Internal Packing List</item>
+ </portal_type>
+ <portal_type id="Inventory">
+  <item>Inventory Line</item>
+ </portal_type>
+ <portal_type id="Inventory Line">
+  <item>Inventory Cell</item>
+ </portal_type>
+ <portal_type id="Inventory Module">
+  <item>Inventory</item>
+ </portal_type>
+ <portal_type id="Purchase Order">
+  <item>Payment Condition</item>
+  <item>Purchase Order Line</item>
+  <item>Discount</item>
+ </portal_type>
+ <portal_type id="Purchase Order Line">
+  <item>Delivery Cell</item>
+ </portal_type>
+ <portal_type id="Purchase Order Module">
+  <item>Purchase Order</item>
+ </portal_type>
+ <portal_type id="Purchase Packing List">
+  <item>Purchase Packing List Line</item>
+ </portal_type>
+ <portal_type id="Purchase Packing List Line">
+  <item>Purchase Packing List Cell</item>
+ </portal_type>
+ <portal_type id="Purchase Packing List Module">
+  <item>Purchase Packing List</item>
+ </portal_type>
+ <portal_type id="Purchase Supply">
+  <item>Supply Line</item>
+ </portal_type>
+ <portal_type id="Purchase Supply Module">
+  <item>Purchase Supply</item>
+ </portal_type>
+ <portal_type id="Purchase Trade Condition">
+  <item>Payment Condition</item>
+  <item>Discount</item>
+ </portal_type>
+ <portal_type id="Purchase Trade Condition Module">
+  <item>Purchase Trade Condition</item>
+ </portal_type>
+ <portal_type id="Sale Order">
+  <item>Payment Condition</item>
+  <item>Sale Order Line</item>
+  <item>Discount</item>
+ </portal_type>
+ <portal_type id="Sale Order Line">
+  <item>Delivery Cell</item>
+ </portal_type>
+ <portal_type id="Sale Order Module">
+  <item>Sale Order</item>
+ </portal_type>
+ <portal_type id="Sale Packing List">
+  <item>Sale Packing List Line</item>
+  <item>Container</item>
+ </portal_type>
+ <portal_type id="Sale Packing List Line">
+  <item>Sale Packing List Cell</item>
+ </portal_type>
+ <portal_type id="Sale Packing List Module">
+  <item>Sale Packing List</item>
+ </portal_type>
+ <portal_type id="Sale Supply">
+  <item>Supply Line</item>
+ </portal_type>
+ <portal_type id="Sale Supply Module">
+  <item>Sale Supply</item>
+ </portal_type>
+ <portal_type id="Sale Trade Condition">
+  <item>Payment Condition</item>
+  <item>Discount</item>
+ </portal_type>
+ <portal_type id="Sale Trade Condition Module">
+  <item>Sale Trade Condition</item>
+ </portal_type>
+ <portal_type id="Supply Line">
+  <item>Supply Cell</item>
+ </portal_type>
+</allowed_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_trade/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_trade/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
new file mode 100755
index 0000000000..73ec09e9c8
--- /dev/null
+++ b/bt5/erp5_trade/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
@@ -0,0 +1,26 @@
+<hidden_content_type_list>
+ <portal_type id="Container Line">
+  <item>Container Cell</item>
+ </portal_type>
+ <portal_type id="Internal Packing List Line">
+  <item>Delivery Cell</item>
+ </portal_type>
+ <portal_type id="Inventory Line">
+  <item>Inventory Cell</item>
+ </portal_type>
+ <portal_type id="Purchase Order Line">
+  <item>Delivery Cell</item>
+ </portal_type>
+ <portal_type id="Purchase Packing List Line">
+  <item>Purchase Packing List Cell</item>
+ </portal_type>
+ <portal_type id="Sale Order Line">
+  <item>Delivery Cell</item>
+ </portal_type>
+ <portal_type id="Sale Packing List Line">
+  <item>Sale Packing List Cell</item>
+ </portal_type>
+ <portal_type id="Supply Line">
+  <item>Supply Cell</item>
+ </portal_type>
+</hidden_content_type_list>
\ No newline at end of file
diff --git a/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
new file mode 100755
index 0000000000..a23c05f944
--- /dev/null
+++ b/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
@@ -0,0 +1,12 @@
+<property_sheet_list>
+ <portal_type id="Sale Order">
+  <item>PaymentCondition</item>
+ </portal_type>
+ <portal_type id="Sale Trade Condition">
+  <item>PaymentCondition</item>
+  <item>Comment</item>
+ </portal_type>
+ <portal_type id="Supply Cell">
+  <item>Reference</item>
+ </portal_type>
+</property_sheet_list>
\ No newline at end of file
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml
index ca4d6ee322..600f766755 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml
@@ -43,9 +43,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Container Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -91,9 +89,7 @@
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Container Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml
index 86271ada10..a3494198a1 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml
@@ -42,10 +42,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Container</string>
-                <string>Container Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
index 31011c08ed..c816f4d980 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Rule.xml
@@ -42,6 +42,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>rule_icon.gif</string> </value>
@@ -62,10 +68,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Delivery Rule</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml
index 7df873119b..fa9927fddd 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml
@@ -50,9 +50,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -97,9 +95,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Module.xml
index 2ee7c01684..f555f1bd28 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Module.xml
@@ -36,9 +36,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Internal Packing List</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -61,10 +65,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Internal Packing List Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Internal Packing List Module</string> </value>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml
index 26b269d889..b4a4d9e8bc 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml
@@ -48,9 +48,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Internal Packing List Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml
index 4f568b0e26..e70d4ca409 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml
@@ -50,9 +50,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Inventory Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -97,9 +95,7 @@
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Inventory Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Module.xml
index c379e8f6a0..56a06a19e7 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Module.xml
@@ -41,9 +41,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Inventory</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -66,10 +70,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Inventory Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Inventory Module</string> </value>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml
index baf7e6bc9a..0282ce86f4 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml
@@ -42,9 +42,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Inventory Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
index 6ad5c753d1..9015a4e98f 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Order%20Rule.xml
@@ -42,6 +42,12 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_icon</string> </key>
             <value> <string>rule_icon.gif</string> </value>
@@ -62,10 +68,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Order Rule</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
index 84c242fa7f..5707113b29 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
@@ -44,9 +44,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -87,9 +85,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Module.xml
index e1952dc14a..33bc199634 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Module.xml
@@ -42,9 +42,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Purchase Order</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -67,10 +71,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Purchase Order Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Purchase Order Module</string> </value>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml
index cb84ff5507..f6faf25b05 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml
@@ -47,11 +47,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Discount</string>
-                <string>Payment Condition</string>
-                <string>Purchase Order Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml
index 9d05063ac1..520e5c9cd2 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml
@@ -44,9 +44,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Purchase Packing List Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -87,9 +85,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Purchase Packing List Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Module.xml
index 0ab8324e77..0c053e1200 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Module.xml
@@ -42,9 +42,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Purchase Packing List</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -67,10 +71,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Purchase Packing List Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Purchase Packing List Module</string> </value>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
index 86af29f7ca..bafcacbada 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
@@ -43,9 +43,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Purchase Packing List Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
index 6d0e9eabf9..16fedd3966 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply%20Module.xml
@@ -43,9 +43,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Purchase Supply</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
index 5b40d830aa..637de3f63b 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
@@ -42,9 +42,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Supply Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module.xml
index 694cf338bc..12ebc3b623 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition%20Module.xml
@@ -41,9 +41,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Purchase Trade Condition</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml
index 6468951968..c9709f2150 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml
@@ -45,10 +45,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Discount</string>
-                <string>Payment Condition</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
index bf21e5ca74..61ba9e97de 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
@@ -44,9 +44,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -87,9 +85,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Delivery Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Module.xml
index 634f243f9d..ebfa455a7a 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Module.xml
@@ -42,9 +42,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Sale Order</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -67,10 +71,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Sale Order Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Sale Order Module</string> </value>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml
index c68629e5aa..2b13a41df0 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml
@@ -31,6 +31,7 @@
                 <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
                 <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
                 <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
+                <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
               </tuple>
             </value>
         </item>
@@ -47,11 +48,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Discount</string>
-                <string>Payment Condition</string>
-                <string>Sale Order Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -105,9 +102,7 @@
         <item>
             <key> <string>property_sheet_list</string> </key>
             <value>
-              <tuple>
-                <string>PaymentCondition</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -125,7 +120,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -136,7 +131,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent>
             </value>
         </item>
         <item>
@@ -190,7 +185,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -201,7 +196,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent>
             </value>
         </item>
         <item>
@@ -255,7 +250,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -266,7 +261,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent>
             </value>
         </item>
         <item>
@@ -320,7 +315,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -331,7 +326,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent>
             </value>
         </item>
         <item>
@@ -385,7 +380,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -396,7 +391,72 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>view_stock</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Stock</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="7" aka="AAAAAAAAAAc=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAABE=</string> </persistent>
             </value>
         </item>
         <item>
@@ -446,7 +506,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="7" aka="AAAAAAAAAAc=">
+  <record id="8" aka="AAAAAAAAAAg=">
     <pickle>
       <tuple>
         <tuple>
@@ -461,7 +521,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAABI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -511,11 +571,11 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="8" aka="AAAAAAAAAAg=">
+  <record id="9" aka="AAAAAAAAAAk=">
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -526,7 +586,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAABE=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAABM=</string> </persistent>
             </value>
         </item>
         <item>
@@ -576,11 +636,11 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="9" aka="AAAAAAAAAAk=">
+  <record id="10" aka="AAAAAAAAAAo=">
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -591,7 +651,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAABI=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAABQ=</string> </persistent>
             </value>
         </item>
         <item>
@@ -641,11 +701,11 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="10" aka="AAAAAAAAAAo=">
+  <record id="11" aka="AAAAAAAAAAs=">
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -656,7 +716,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAABM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAABU=</string> </persistent>
             </value>
         </item>
         <item>
@@ -706,7 +766,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="11" aka="AAAAAAAAAAs=">
+  <record id="12" aka="AAAAAAAAAAw=">
     <pickle>
       <tuple>
         <tuple>
@@ -725,7 +785,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="12" aka="AAAAAAAAAAw=">
+  <record id="13" aka="AAAAAAAAAA0=">
     <pickle>
       <tuple>
         <tuple>
@@ -744,7 +804,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="13" aka="AAAAAAAAAA0=">
+  <record id="14" aka="AAAAAAAAAA4=">
     <pickle>
       <tuple>
         <tuple>
@@ -763,7 +823,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="14" aka="AAAAAAAAAA4=">
+  <record id="15" aka="AAAAAAAAAA8=">
     <pickle>
       <tuple>
         <tuple>
@@ -782,7 +842,26 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="15" aka="AAAAAAAAAA8=">
+  <record id="16" aka="AAAAAAAAABA=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/Delivery_viewInventory</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="17" aka="AAAAAAAAABE=">
     <pickle>
       <tuple>
         <tuple>
@@ -801,7 +880,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="16" aka="AAAAAAAAABA=">
+  <record id="18" aka="AAAAAAAAABI=">
     <pickle>
       <tuple>
         <tuple>
@@ -820,7 +899,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="17" aka="AAAAAAAAABE=">
+  <record id="19" aka="AAAAAAAAABM=">
     <pickle>
       <tuple>
         <tuple>
@@ -839,7 +918,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="18" aka="AAAAAAAAABI=">
+  <record id="20" aka="AAAAAAAAABQ=">
     <pickle>
       <tuple>
         <tuple>
@@ -858,7 +937,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="19" aka="AAAAAAAAABM=">
+  <record id="21" aka="AAAAAAAAABU=">
     <pickle>
       <tuple>
         <tuple>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml
index 7b2b5a5c1b..757286812c 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml
@@ -44,9 +44,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Sale Packing List Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -87,9 +85,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Sale Packing List Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Module.xml
index 97d109432e..33083c333f 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Module.xml
@@ -42,9 +42,13 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Sale Packing List</string>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -67,10 +71,22 @@
             <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>Sale Packing List Module</string> </value>
         </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Sale Packing List Module</string> </value>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
index 09d1b25734..4b360b7bff 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
@@ -46,10 +46,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Container</string>
-                <string>Sale Packing List Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
index 77d1e2d305..11957f10de 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply%20Module.xml
@@ -43,9 +43,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Sale Supply</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
index 4ce5778af0..01d203d952 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
@@ -42,9 +42,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Supply Line</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition%20Module.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition%20Module.xml
index 4f0e35c0e7..af3634bb7f 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition%20Module.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition%20Module.xml
@@ -42,9 +42,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Sale Trade Condition</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml
index a3bd7078fb..7c288dec59 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml
@@ -45,10 +45,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Discount</string>
-                <string>Payment Condition</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -94,10 +91,7 @@
         <item>
             <key> <string>property_sheet_list</string> </key>
             <value>
-              <tuple>
-                <string>Comment</string>
-                <string>PaymentCondition</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
index 0fb771e54b..66f88f29fa 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Cell.xml
@@ -97,9 +97,7 @@
         <item>
             <key> <string>property_sheet_list</string> </key>
             <value>
-              <tuple>
-                <string>Reference</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
index 30b02b893a..dee2c15a08 100755
--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
@@ -53,9 +53,7 @@
         <item>
             <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>Supply Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -99,9 +97,7 @@
         <item>
             <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <tuple>
-                <string>Supply Cell</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
index 148b6fd346..a0ef04e024 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
@@ -89,29 +89,9 @@ return cell_range\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMBAAAADAAA
-AAwAAABLAAAAc98AAAB0AAB0AQBkAQCDAgCDAAB9BABnAAB9BQB8BAB0BABqCQBvsgABdAAAfAQA
-ZAIAgwIAZAMAZAQAgwABfQcAeIEAdAYAfAcAgwEARF1zAH0JAHwAAGQEAGoCAG84AAF0AAB8BQBk
-BQCDAgB0CQBkBgCEAAB0AAB0AQBkBwCDAgBkCAB8CQBmAQCDAAGDAgCDAQABcUoAAXQAAHwFAGQF
-AIMCAHQAAHQBAGQJAIMCAGQIAHwJAGYBAIMAAYMBAAFxSgBXdAoAZAoAhAAAfAUAgwIAfQUAbgEA
-AXwFAFNkAABTKAsAAABOcxAAAABnZXRSZXNvdXJjZVZhbHVlcxwAAABnZXRWYXJpYXRpb25CYXNl
-Q2F0ZWdvcnlMaXN0cxkAAABvbWl0X29wdGlvbl9iYXNlX2NhdGVnb3J5aQEAAABzBgAAAGFwcGVu
-ZGMBAAAAAgAAAAQAAABDAAAAcxwAAAB0AAB8AABkAQCDAgB0AAB8AABkAgCDAgBmAgBTKAMAAABO
-aQEAAABpAAAAACgCAAAAcwkAAABfZ2V0aXRlbV9zAQAAAHgoAgAAAHMBAAAAeHMJAAAAX2dldGl0
-ZW1fKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwoAAAA8bGFtYmRhLjA+CQAAAHMAAAAA
-cxwAAABnZXRWYXJpYXRpb25DYXRlZ29yeUl0ZW1MaXN0cxIAAABiYXNlX2NhdGVnb3J5X2xpc3Rz
-GAAAAGdldFZhcmlhdGlvbkNhdGVnb3J5TGlzdGMBAAAAAQAAAAIAAABDAAAAcwoAAAB8AABnAABq
-AwBTKAEAAABOKAEAAABzAQAAAHgoAQAAAHMBAAAAeCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0
-aG9uKXMKAAAAPGxhbWJkYS4xPg0AAABzAAAAACgLAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRl
-eHRzCAAAAHJlc291cmNlcwoAAABjZWxsX3JhbmdlcwQAAABOb25lcxIAAABiYXNlX2NhdGVnb3J5
-X2xpc3RzCQAAAF9nZXRpdGVyX3MNAAAAYmFzZV9jYXRlZ29yeXMJAAAAbWF0cml4Ym94cwMAAABt
-YXBzBgAAAGZpbHRlcigMAAAAcwkAAABtYXRyaXhib3hzAgAAAGt3cwkAAABfZ2V0YXR0cl9zBwAA
-AGNvbnRleHRzCAAAAHJlc291cmNlcwoAAABjZWxsX3JhbmdlcwQAAABOb25lcxIAAABiYXNlX2Nh
-dGVnb3J5X2xpc3RzCQAAAF9nZXRpdGVyX3MNAAAAYmFzZV9jYXRlZ29yeXMDAAAAbWFwcwYAAABm
-aWx0ZXIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzGQAAAENvbnRhaW5lckxpbmVfYXND
-ZWxsUmFuZ2UBAAAAcxQAAAASAQYBDQEYAg0ABgEQAjgCKQIWAigBAAAAcxkAAABDb250YWluZXJM
-aW5lX2FzQ2VsbFJhbmdlKAEAAABzGQAAAENvbnRhaW5lckxpbmVfYXNDZWxsUmFuZ2UoAAAAACgA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_asPredicate.xml
index 7745899c00..66eefed3b5 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_asPredicate.xml
@@ -72,15 +72,9 @@
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAEAAAATwAA
-AHMdAAAAdAAAdAEAZAEAgwIAZAIAZAMAZgEAgwABU2QAAFMoBAAAAE5zEQAAAGdlbmVyYXRlUHJl
-ZGljYXRlcywAAABtdWx0aW1lbWJlcnNoaXBfY3JpdGVyaW9uX2Jhc2VfY2F0ZWdvcnlfbGlzdHMQ
-AAAAaW5kdXN0cmlhbF9waGFzZSgCAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoBAAAAHME
-AAAAYXJnc3MCAAAAa3dzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dCgAAAAAKAAAAABzDwAAAFNj
-cmlwdCAoUHl0aG9uKXMYAAAARGVsaXZlcnlDZWxsX2FzUHJlZGljYXRlAQAAAHMCAAAADwEoAQAA
-AHMYAAAARGVsaXZlcnlDZWxsX2FzUHJlZGljYXRlKAEAAABzGAAAAERlbGl2ZXJ5Q2VsbF9hc1By
-ZWRpY2F0ZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAA
-AAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_asCellRange.xml
index 8cbfe90e50..3cafaaebf8 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_asCellRange.xml
@@ -89,30 +89,9 @@ return cell_range\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGQBAGQCAGQDAIQCAFoAAGQAAFMoBAAAAE5pAAAAAHMIAAAA
-bW92ZW1lbnRjAgAAAA0AAAAMAAAASwAAAHPfAAAAdAAAdAEAZAEAgwIAgwAAfQUAZwAAfQYAfAUA
-dAQAagkAb7IAAXQAAHwFAGQCAIMCAGQDAGQEAIMAAX0IAHiBAHQGAHwIAIMBAERdcwB9CgB8AABk
-BABqAgBvOAABdAAAfAYAZAUAgwIAdAkAZAYAhAAAdAAAdAEAZAcAgwIAZAgAfAoAZgEAgwABgwIA
-gwEAAXFKAAF0AAB8BgBkBQCDAgB0AAB0AQBkCQCDAgBkCAB8CgBmAQCDAAGDAQABcUoAV3QKAGQK
-AIQAAHwGAIMCAH0GAG4BAAF8BgBTZAAAUygLAAAATnMQAAAAZ2V0UmVzb3VyY2VWYWx1ZXMcAAAA
-Z2V0VmFyaWF0aW9uQmFzZUNhdGVnb3J5TGlzdHMZAAAAb21pdF9vcHRpb25fYmFzZV9jYXRlZ29y
-eWkBAAAAcwYAAABhcHBlbmRjAQAAAAIAAAAEAAAAQwAAAHMcAAAAdAAAfAAAZAEAgwIAdAAAfAAA
-ZAIAgwIAZgIAUygDAAAATmkBAAAAaQAAAAAoAgAAAHMJAAAAX2dldGl0ZW1fcwEAAAB4KAIAAABz
-AQAAAHhzCQAAAF9nZXRpdGVtXygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMKAAAAPGxh
-bWJkYS4xPgkAAABzAAAAAHMcAAAAZ2V0VmFyaWF0aW9uQ2F0ZWdvcnlJdGVtTGlzdHMSAAAAYmFz
-ZV9jYXRlZ29yeV9saXN0cxgAAABnZXRWYXJpYXRpb25DYXRlZ29yeUxpc3RjAQAAAAEAAAACAAAA
-QwAAAHMKAAAAfAAAZwAAagMAUygBAAAATigBAAAAcwEAAAB4KAEAAABzAQAAAHgoAAAAACgAAAAA
-cw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuMj4NAAAAcwAAAAAoCwAAAHMJAAAAX2dl
-dGF0dHJfcwcAAABjb250ZXh0cwgAAAByZXNvdXJjZXMKAAAAY2VsbF9yYW5nZXMEAAAATm9uZXMS
-AAAAYmFzZV9jYXRlZ29yeV9saXN0cwkAAABfZ2V0aXRlcl9zDQAAAGJhc2VfY2F0ZWdvcnlzCQAA
-AG1hdHJpeGJveHMDAAAAbWFwcwYAAABmaWx0ZXIoDQAAAHMJAAAAbWF0cml4Ym94cwcAAABiYXNl
-X2lkcwIAAABrd3MJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwgAAAByZXNvdXJjZXMKAAAAY2Vs
-bF9yYW5nZXMEAAAATm9uZXMSAAAAYmFzZV9jYXRlZ29yeV9saXN0cwkAAABfZ2V0aXRlcl9zDQAA
-AGJhc2VfY2F0ZWdvcnlzAwAAAG1hcHMGAAAAZmlsdGVyKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQ
-eXRob24pcxgAAABEZWxpdmVyeUxpbmVfYXNDZWxsUmFuZ2UBAAAAcxQAAAASAQYBDQEYAg0ABgEQ
-AjgCKQIWAigBAAAAcxgAAABEZWxpdmVyeUxpbmVfYXNDZWxsUmFuZ2UoAQAAAHMYAAAARGVsaXZl
-cnlMaW5lX2FzQ2VsbFJhbmdlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9k
-dWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
index 3d839a2a79..1221d55245 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
@@ -111,43 +111,9 @@ return sub_field_dict.values()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGgAAGQBAGQCAIQCAFoAAGQAAFMoAwAAAE5pAAAAAGMEAAAA
-GAAAABMAAABDAAAAcyACAAB0AABkAQCEAAB8AACDAgB9AABoAAB9BQBkAgB9BgB0BAB0BQBkAwCD
-AgCDAAB9CQB8CQB0BwBqCQBvHAABdAQAfAkAZAQAgwIAZAUAZAIAgwABfQsAbgEAAXiwAXQJAHwA
-AIMBAERdogF9DQB0CwB8DQB0DAB8AwAMgwEAgwIAfRAAdAQAdA8AZAYAgwIAfBAAZAcAgwIAfRIA
-dAQAdA8AZAgAgwIAdAsAfBIAZAAAfAYAhQIAgwIAZAcAgwIAfRMAdAsAfBIAZAkAgwIAfRQAdAQA
-fAUAZAoAgwIAfBMAgwEADG+sAAF0BAB8AgBkCwCDAgCDAAB9FQB8EwB0FQB8FQCDAQBkDAA8ZAkA
-fRcAfBQAfAsAagYAbwoAAWQCAH0XAG4BAAF8FwB0FQB8FQCDAQBkDQA8ZA4AdBUAfBUAgwEAZA8A
-PGQQAHQVAHwVAIMBAGQRADxkEgBkEgBmAgBnAQB0FQB8FQCDAQBkEwA8ZwAAdBUAfBUAgwEAZBQA
-PHwVAHQVAHwFAIMBAHwTADxuAQABdAsAdAsAfAUAfBMAgwIAZBMAgwIAfA0AZwEAF3QVAHQLAHwF
-AHwTAIMCAIMBAGQTADx8EAB8AQBqBgBvNgABdAsAdAsAfAUAfBMAgwIAZBQAgwIAfBAAZwEAF3QV
-AHQLAHwFAHwTAIMCAIMBAGQUADxxZgABcWYAV3QEAHwFAGQVAIMCAIMAAFNkAABTKBYAAABOYwEA
-AAABAAAABAAAAEMAAABzHAAAAHwAAGQBAGQBAGYCAGQBAGQBAGcCAGcCAGoHAFMoAgAAAE5zAAAA
-ACgBAAAAcwEAAAB4KAEAAABzAQAAAHgoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAA
-ADxsYW1iZGEuND4CAAAAcwAAAABpAQAAAHMQAAAAZ2V0UmVzb3VyY2VWYWx1ZXMcAAAAZ2V0VmFy
-aWF0aW9uQmFzZUNhdGVnb3J5TGlzdHMZAAAAb21pdF9vcHRpb25fYmFzZV9jYXRlZ29yeXMFAAAA
-c3BsaXRzAQAAAC9zBAAAAGpvaW5pAAAAAHMHAAAAaGFzX2tleXMEAAAAY29weXMDAAAAa2V5cwgA
-AAByZXF1aXJlZHMOAAAATXVsdGlMaXN0RmllbGRzCgAAAGZpZWxkX3R5cGVpBQAAAHMEAAAAc2l6
-ZXMAAAAAcwkAAABpdGVtX2xpc3RzBQAAAHZhbHVlcwYAAAB2YWx1ZXMoGAAAAHMGAAAAZmlsdGVy
-cwkAAABpdGVtX2xpc3RzDgAAAHN1Yl9maWVsZF9kaWN0cwsAAABzcGxpdF9kZXB0aHMJAAAAX2dl
-dGF0dHJfcwcAAABjb250ZXh0cwgAAAByZXNvdXJjZXMEAAAATm9uZXMdAAAAbm90X29wdGlvbl9i
-YXNlX2NhdGVnb3J5X2xpc3RzCQAAAF9nZXRpdGVyX3MEAAAAaXRlbXMJAAAAX2dldGl0ZW1fcwMA
-AABpbnRzEAAAAGlzX3JpZ2h0X2Rpc3BsYXlzCgAAAGl0ZW1fdmFsdWVzBgAAAHN0cmluZ3MKAAAA
-aXRlbV9zcGxpdHMIAAAAaXRlbV9rZXlzDQAAAGJhc2VfY2F0ZWdvcnlzHwAAAGRlZmF1bHRfc3Vi
-X2ZpZWxkX3Byb3BlcnR5X2RpY3RzFwAAAHN1Yl9maWVsZF9wcm9wZXJ0eV9kaWN0cwcAAABfd3Jp
-dGVfcw4AAAByZXF1aXJlZF92YWx1ZXMKAAAAdmFsdWVfbGlzdCgYAAAAcwkAAABpdGVtX2xpc3Rz
-CgAAAHZhbHVlX2xpc3RzHwAAAGRlZmF1bHRfc3ViX2ZpZWxkX3Byb3BlcnR5X2RpY3RzEAAAAGlz
-X3JpZ2h0X2Rpc3BsYXlzBgAAAGZpbHRlcnMOAAAAc3ViX2ZpZWxkX2RpY3RzCwAAAHNwbGl0X2Rl
-cHRocwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzCAAAAHJlc291cmNlcwQAAABOb25lcx0AAABu
-b3Rfb3B0aW9uX2Jhc2VfY2F0ZWdvcnlfbGlzdHMJAAAAX2dldGl0ZXJfcwQAAABpdGVtcwkAAABf
-Z2V0aXRlbV9zAwAAAGludHMKAAAAaXRlbV92YWx1ZXMGAAAAc3RyaW5ncwoAAABpdGVtX3NwbGl0
-cwgAAABpdGVtX2tleXMNAAAAYmFzZV9jYXRlZ29yeXMXAAAAc3ViX2ZpZWxkX3Byb3BlcnR5X2Rp
-Y3RzBwAAAF93cml0ZV9zDgAAAHJlcXVpcmVkX3ZhbHVlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQ
-eXRob24pcyoAAABEZWxpdmVyeUxpbmVfaGFzaFZhcmlhdGlvbkNhdGVnb3J5SXRlbUxpc3QBAAAA
-cz4AAAAAAQkBCQIGAQYBEgENARwDDQAGAhYDGAEnAQ8CFwISARABBgENAQoBEAEQARABGQEQARQC
-BgEsAQ0BBgE0AigBAAAAcyoAAABEZWxpdmVyeUxpbmVfaGFzaFZhcmlhdGlvbkNhdGVnb3J5SXRl
-bUxpc3QoAQAAAHMqAAAARGVsaXZlcnlMaW5lX2hhc2hWYXJpYXRpb25DYXRlZ29yeUl0ZW1MaXN0
-KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
index 314debb407..b8fc20210f 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
@@ -82,18 +82,9 @@ packing_list.edit()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAAJAAAASwAA
-AHNoAAAAdAAAfQIAdAIAfAIAZAEAgwIAgwAAfQQAfAQAZAIAagIAby8AAXQCAHQCAHwCAGQDAIMC
-AGQEAIMCAHwCAGQFAGQGAGQHAGQIAGQJAIMCAgFuAQABdAIAfAIAZAoAgwIAgwAAAWQAAFMoCwAA
-AE5zEgAAAGdldFNpbXVsYXRpb25TdGF0ZXMFAAAAZHJhZnRzDwAAAHBvcnRhbF93b3JrZmxvd3ML
-AAAAZG9BY3Rpb25Gb3JzDgAAAGNvbmZpcm1fYWN0aW9ucwUAAAB3Zl9pZHMVAAAAcGFja2luZ19s
-aXN0X3dvcmtmbG93cwcAAABjb21tZW50cx8AAABJbml0aWFsaXplZCBieSBEZWxpdmVyeSBCdWls
-ZGVycwQAAABlZGl0KAQAAABzBwAAAGNvbnRleHRzDAAAAHBhY2tpbmdfbGlzdHMJAAAAX2dldGF0
-dHJfcxIAAABwYWNraW5nX2xpc3Rfc3RhdGUoBQAAAHMCAAAAa3dzBwAAAGNvbnRleHRzDAAAAHBh
-Y2tpbmdfbGlzdHMJAAAAX2dldGF0dHJfcxIAAABwYWNraW5nX2xpc3Rfc3RhdGUoAAAAACgAAAAA
-cw8AAABTY3JpcHQgKFB5dGhvbilzEAAAAERlbGl2ZXJ5X2NvbmZpcm0BAAAAcwoAAAAGAxIBEwEP
-AR0FKAEAAABzEAAAAERlbGl2ZXJ5X2NvbmZpcm0oAQAAAHMQAAAARGVsaXZlcnlfY29uZmlybSgA
-AAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml
index 1f169ee437..5bd691a69c 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml
@@ -90,28 +90,9 @@ return REQUEST.RESPONSE.redirect( ret_url + qs )\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5zAAAAAGMBAAAADQAA
-ABAAAABDAAAAcw8BAAB0AAB0AQBkAQCDAgB9AwB0AwB8AwBkAgCDAgB9BQB0AAB0AAB0AQBkAwCD
-AgBkBACDAgB8BQBkBQB0AQBkAQB8AwCDAQJ9BgBnAAB9BwB4JwB0BwB8BgCDAQBEXRkAfQkAdAAA
-fAcAZAYAgwIAfAkAgwEAAXFbAFd0CQB8BwCDAQBkBwBqAABvJAABdAAAdAEAZAgAgwIAgwAAZAkA
-F3wAABd9CwBkCgB9DABuPQABdAAAdAEAZAgAgwIAgwAAZAkAF3wAABd9CwBkCwB9DAB0AAB0AAB0
-AQBkDACDAgBkDQCDAgB8BwCDAQABdAAAdAAAfAMAZA4AgwIAZA8AgwIAfAsAfAwAF4MBAFNkAABT
-KBAAAABOcwcAAABSRVFVRVNUcw4AAABzZWxlY3Rpb25fbmFtZXMRAAAAcG9ydGFsX3NlbGVjdGlv
-bnNzFQAAAGdldFNlbGVjdGlvblZhbHVlTGlzdHMHAAAAY29udGV4dHMGAAAAYXBwZW5kaQIAAABz
-DAAAAGFic29sdXRlX3VybHMBAAAAL3M5AAAAP3BvcnRhbF9zdGF0dXNfbWVzc2FnZT1QbGVhc2Ur
-c2VsZWN0K21vcmUrdGhhbitvbmUraXRlbXMucx4AAAA/cG9ydGFsX3N0YXR1c19tZXNzYWdlPU1l
-cmdlZC5zEQAAAHBvcnRhbF9zaW11bGF0aW9ucxEAAABtZXJnZURlbGl2ZXJ5TGlzdHMIAAAAUkVT
-UE9OU0VzCAAAAHJlZGlyZWN0KA0AAABzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAUkVR
-VUVTVHMJAAAAX2dldGl0ZW1fcw4AAABzZWxlY3Rpb25fbmFtZXMLAAAAb2JqZWN0X2xpc3RzDQAA
-AGRlbGl2ZXJ5X2xpc3RzCQAAAF9nZXRpdGVyX3MBAAAAb3MDAAAAbGVucwcAAABmb3JtX2lkcwcA
-AAByZXRfdXJscwIAAABxcygNAAAAcwcAAABmb3JtX2lkcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRl
-eHRzBwAAAFJFUVVFU1RzCQAAAF9nZXRpdGVtX3MOAAAAc2VsZWN0aW9uX25hbWVzCwAAAG9iamVj
-dF9saXN0cw0AAABkZWxpdmVyeV9saXN0cwkAAABfZ2V0aXRlcl9zAQAAAG9zAwAAAGxlbnMHAAAA
-cmV0X3VybHMCAAAAcXMoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzGgAAAERlbGl2ZXJ5
-X21lcmdlRGVsaXZlcnlMaXN0AQAAAHMaAAAADwEPASoBBgENAAkBFAITARoBCgIaAQwBFgIoAQAA
-AHMaAAAARGVsaXZlcnlfbWVyZ2VEZWxpdmVyeUxpc3QoAQAAAHMaAAAARGVsaXZlcnlfbWVyZ2VE
-ZWxpdmVyeUxpc3QoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAA
-AHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.xml
index 9f3326ac5f..ae48aa8583 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.xml
@@ -102,44 +102,14 @@ for simulation_movement in simulation_movement_list :\n
     causality_value_set[explanation_value] = 1\n
 \n
 LOG(\'setCausalityValueList %s\'%causality_value_set.keys())\n
-delivery.setCausalityValueList(causality_value_set.keys())\n
+delivery.setCausalityValueList(causality_value_set.keys() + delivery.getCausalityValueList())\n
 </string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAwAAAASAAAAQwAA
-AHOIAQAAZAEAhAAAfQAAZAIAhAAAfQAAdAEAfQIAZwAAfQMAeF8AdAQAdAUAfAIAZAMAgwIAgwAA
-gwEARF1FAH0GAHwAAGQEAHQFAHwGAGQFAIMCAIMAABaDAQABdAUAfAMAZAYAgwIAdAUAfAYAZAcA
-gwIAZAgAZAkAgwABgwEAAXE3AFd8AABkCgB8AwAWgwEAAWgAAH0HAHi0AHQEAHwDAIMBAERdpgB9
-CAB8AABkCwB0BQB8CABkBQCDAgCDAAAWgwEAAXQFAHwIAGQMAIMCAIMAAHQFAHwIAGQNAIMCAIMA
-AGoDAG8uAAF0BQB0BQB0BQB8CABkDACDAgCDAABkDACDAgCDAABkDgCDAgCDAAB9CQBuEwABdAUA
-fAgAZA4AgwIAgwAAfQkAfAkAdAoAagkAbxQAAWQPAHQLAHwHAIMBAHwJADxxoQABcaEAV3wAAGQQ
-AHQFAHwHAGQRAIMCAIMAABaDAQABdAUAfAIAZBIAgwIAdAUAfAcAZBEAgwIAgwAAgwEAAWQAAFMo
-EwAAAE5jAQAAAAMAAAAFAAAAQwAAAHMmAAAAdAAAdAEAZAEAgwIAZAIAdAAAdAEAZAMAgwIAgwAA
-FnwAAIMCAFMoBAAAAE5zAwAAAGxvZ3MpAAAARGVsaXZlcnlfc2V0Q2F1c2FsaXR5RnJvbVNpbXVs
-YXRpb24gb24gJXNzBwAAAGdldFBhdGgoAwAAAHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwMA
-AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoAAAAACgAAAAAcw8A
-AABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuMjk+CgAAAHMCAAAAEgFjAQAAAAEAAAABAAAA
-QwAAAHMEAAAAZAEAUygCAAAATnMIAAAARElTQUJMRUQoAAAAACgBAAAAcwMAAABtc2coAAAAACgA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuMzA+DAAAAHMAAAAAcw8AAABnZXRN
-b3ZlbWVudExpc3RzDAAAAG1vdmVtZW50ICVzIHMHAAAAZ2V0UGF0aHMGAAAAZXh0ZW5kcxsAAABn
-ZXREZWxpdmVyeVJlbGF0ZWRWYWx1ZUxpc3RzCwAAAHBvcnRhbF90eXBlcxMAAABTaW11bGF0aW9u
-IE1vdmVtZW50cxwAAABzaW11bGF0aW9uX21vdmVtZW50X2xpc3QgJXMgcxcAAABzaW11bGF0aW9u
-X21vdmVtZW50ICVzIHMJAAAAZ2V0UGFyZW50cxIAAABnZXRSb290QXBwbGllZFJ1bGVzEwAAAGdl
-dEV4cGxhbmF0aW9uVmFsdWVpAQAAAHMYAAAAc2V0Q2F1c2FsaXR5VmFsdWVMaXN0ICVzcwQAAABr
-ZXlzcxUAAABzZXRDYXVzYWxpdHlWYWx1ZUxpc3QoDAAAAHMDAAAATE9HcwcAAABjb250ZXh0cwgA
-AABkZWxpdmVyeXMYAAAAc2ltdWxhdGlvbl9tb3ZlbWVudF9saXN0cwkAAABfZ2V0aXRlcl9zCQAA
-AF9nZXRhdHRyX3MIAAAAbW92ZW1lbnRzEwAAAGNhdXNhbGl0eV92YWx1ZV9zZXRzEwAAAHNpbXVs
-YXRpb25fbW92ZW1lbnRzEQAAAGV4cGxhbmF0aW9uX3ZhbHVlcwQAAABOb25lcwcAAABfd3JpdGVf
-KAwAAABzAwAAAExPR3MHAAAAY29udGV4dHMIAAAAZGVsaXZlcnlzGAAAAHNpbXVsYXRpb25fbW92
-ZW1lbnRfbGlzdHMJAAAAX2dldGl0ZXJfcwkAAABfZ2V0YXR0cl9zCAAAAG1vdmVtZW50cxMAAABj
-YXVzYWxpdHlfdmFsdWVfc2V0cxMAAABzaW11bGF0aW9uX21vdmVtZW50cxEAAABleHBsYW5hdGlv
-bl92YWx1ZXMEAAAATm9uZXMHAAAAX3dyaXRlXygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u
-KXMjAAAARGVsaXZlcnlfc2V0Q2F1c2FsaXR5RnJvbVNpbXVsYXRpb24BAAAAcyoAAAAACQkCCQIG
-AwYBGQAGAR0BDAEaAw4CBgENAAYBGgElAS4CEgENARgCHQEoAQAAAHMjAAAARGVsaXZlcnlfc2V0
-Q2F1c2FsaXR5RnJvbVNpbXVsYXRpb24oAQAAAHMjAAAARGVsaXZlcnlfc2V0Q2F1c2FsaXR5RnJv
-bVNpbXVsYXRpb24oAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAA
-AHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
new file mode 100755
index 0000000000..67b368f9c0
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Form.Form</string>
+          <string>ERP5Form</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary/>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>enctype</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <list>
+                <string>left</string>
+                <string>right</string>
+                <string>center</string>
+                <string>bottom</string>
+                <string>hidden</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key>                 <string>bottom</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox</string>
+                        <string>current_inventory_chart</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>center</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>hidden</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>left</string> </key>
+                    <value>
+                      <list>
+                        <string>my_title</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>right</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Delivery_viewInventory</string> </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string>Delivery_viewInventory</string> </value>
+        </item>
+        <item>
+            <key> <string>pt</string> </key>
+            <value> <string>form_view</string> </value>
+        </item>
+        <item>
+            <key> <string>row_length</string> </key>
+            <value> <int>4</int> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Stock</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>update_action</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/current_inventory_chart.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/current_inventory_chart.xml
new file mode 100755
index 0000000000..116db6dc65
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/current_inventory_chart.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Form.ZGDChart</string>
+          <string>ZGDChart</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>current_inventory_chart</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>bg_transparent</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>chart_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>chart_title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>data_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default_params</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>selection_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>x_title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>y_title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>bg_transparent</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>chart_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>chart_title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>data_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default_params</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>selection_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>x_title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>y_title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>bg_transparent</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>chart_style</string> </key>
+                    <value> <string>line_2d</string> </value>
+                </item>
+                <item>
+                    <key> <string>chart_title</string> </key>
+                    <value> <string>Previsions</string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>data_method</string> </key>
+                    <value> <string>getInventoryHistoryChart</string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default_params</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>selection_name</string> </key>
+                    <value> <string>resource_current_inventory_chart</string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Previsions</string> </value>
+                </item>
+                <item>
+                    <key> <string>x_title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>y_title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
new file mode 100755
index 0000000000..1c07d67a15
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
@@ -0,0 +1,524 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Form.ListBox</string>
+          <string>ListBox</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>listbox</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>all_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>all_editable_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default_params</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>domain_root_list</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>domain_tree</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>global_attributes</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>lines</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>list_action</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>list_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>meta_types</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>portal_types</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>report_root_list</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>report_tree</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>search</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>search_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>select</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>selection_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>sort</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>sort_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>stat_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>all_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>all_editable_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default_params</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>domain_root_list</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>domain_tree</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>global_attributes</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>lines</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>list_action</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>list_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>meta_types</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>portal_types</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>report_root_list</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>report_tree</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>search</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>search_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>select</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>selection_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>sort</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>sort_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>stat_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>all_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>all_editable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>node_title</string>
+                          <string>Stock</string>
+                        </tuple>
+                        <tuple>
+                          <string>resource_title</string>
+                          <string>Resource</string>
+                        </tuple>
+                        <tuple>
+                          <string>variation_text</string>
+                          <string>Variation</string>
+                        </tuple>
+                        <tuple>
+                          <string>getQuantity</string>
+                          <string>Quantity</string>
+                        </tuple>
+                        <tuple>
+                          <string>getCurrentInventory</string>
+                          <string>Current</string>
+                        </tuple>
+                        <tuple>
+                          <string>getAvailableInventory</string>
+                          <string>Available</string>
+                        </tuple>
+                        <tuple>
+                          <string>inventory</string>
+                          <string>Futur</string>
+                        </tuple>
+                        <tuple>
+                          <string>getQuantityUnit</string>
+                          <string>Unit</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>count_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default_params</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>group_by_node</string>
+                          <string>1</string>
+                        </tuple>
+                        <tuple>
+                          <string>group_by_variation</string>
+                          <string>1</string>
+                        </tuple>
+                        <tuple>
+                          <string>group_by_section</string>
+                          <string>0</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>domain_root_list</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>portal_categories/site</string>
+                          <string>Site</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>domain_tree</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>global_attributes</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>lines</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
+                <item>
+                    <key> <string>list_action</string> </key>
+                    <value> <string>Delivery_viewInventory</string> </value>
+                </item>
+                <item>
+                    <key> <string>list_method</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>meta_types</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>portal_types</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>report_root_list</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>report_tree</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>search</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>search_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>select</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>selection_name</string> </key>
+                    <value> <string>delivery_current_inventory</string> </value>
+                </item>
+                <item>
+                    <key> <string>sort</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>sort_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>stat_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>stat_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Stock By Variation</string> </value>
+                </item>
+                <item>
+                    <key> <string>url_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.MethodField</string>
+          <string>Method</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>method_name</string> </key>
+            <value> <string>getFutureInventoryList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/my_title.xml
new file mode 100755
index 0000000000..b117a4e41d
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/my_title.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.StandardFields</string>
+          <string>StringField</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_title</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <string>too_long</string> </key>
+                    <value> <string>Too much input was given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Title</string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_asCellRange.xml
index 81ef1fad52..0402e57c7c 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_asCellRange.xml
@@ -89,29 +89,9 @@ return cell_range\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMBAAAADAAA
-AAwAAABLAAAAc9kAAAB0AAB0AQBkAQCDAgCDAAB9BABnAAB9BQB8BAB0BABqCQBvrAABdAAAfAQA
-ZAIAgwIAgwAAfQcAeIEAdAYAfAcAgwEARF1zAH0JAHwAAGQDAGoCAG84AAF0AAB8BQBkBACDAgB0
-CQBkBQCEAAB0AAB0AQBkBgCDAgBkBwB8CQBmAQCDAAGDAgCDAQABcUQAAXQAAHwFAGQEAIMCAHQA
-AHQBAGQIAIMCAGQHAHwJAGYBAIMAAYMBAAFxRABXdAoAZAkAhAAAfAUAgwIAfQUAbgEAAXwFAFNk
-AABTKAoAAABOcxAAAABnZXRSZXNvdXJjZVZhbHVlcxwAAABnZXRWYXJpYXRpb25CYXNlQ2F0ZWdv
-cnlMaXN0aQEAAABzBgAAAGFwcGVuZGMBAAAAAgAAAAQAAABDAAAAcxwAAAB0AAB8AABkAQCDAgB0
-AAB8AABkAgCDAgBmAgBTKAMAAABOaQEAAABpAAAAACgCAAAAcwkAAABfZ2V0aXRlbV9zAQAAAHgo
-AgAAAHMBAAAAeHMJAAAAX2dldGl0ZW1fKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwsA
-AAA8bGFtYmRhLjEwPgkAAABzAAAAAHMcAAAAZ2V0VmFyaWF0aW9uQ2F0ZWdvcnlJdGVtTGlzdHMS
-AAAAYmFzZV9jYXRlZ29yeV9saXN0cxgAAABnZXRWYXJpYXRpb25DYXRlZ29yeUxpc3RjAQAAAAEA
-AAACAAAAQwAAAHMKAAAAfAAAZwAAagMAUygBAAAATigBAAAAcwEAAAB4KAEAAABzAQAAAHgoAAAA
-ACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuMTE+DQAAAHMAAAAAKAsAAABz
-CQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMIAAAAcmVzb3VyY2VzCgAAAGNlbGxfcmFuZ2VzBAAA
-AE5vbmVzEgAAAGJhc2VfY2F0ZWdvcnlfbGlzdHMJAAAAX2dldGl0ZXJfcw0AAABiYXNlX2NhdGVn
-b3J5cwkAAABtYXRyaXhib3hzAwAAAG1hcHMGAAAAZmlsdGVyKAwAAABzCQAAAG1hdHJpeGJveHMC
-AAAAa3dzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMIAAAAcmVzb3VyY2VzCgAAAGNlbGxfcmFu
-Z2VzBAAAAE5vbmVzEgAAAGJhc2VfY2F0ZWdvcnlfbGlzdHMJAAAAX2dldGl0ZXJfcw0AAABiYXNl
-X2NhdGVnb3J5cwMAAABtYXBzBgAAAGZpbHRlcigAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u
-KXMZAAAASW52ZW50b3J5TGluZV9hc0NlbGxSYW5nZQEAAABzFAAAABIBBgENARICDQAGARACOAIp
-AhYCKAEAAABzGQAAAEludmVudG9yeUxpbmVfYXNDZWxsUmFuZ2UoAQAAAHMZAAAASW52ZW50b3J5
-TGluZV9hc0NlbGxSYW5nZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVs
-ZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_getPackedQuantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_getPackedQuantity.xml
index 186c0c8235..97e4663766 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_getPackedQuantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_getPackedQuantity.xml
@@ -90,24 +90,9 @@ return packed_quantity\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAwAAAAOAAAAQwAA
-AHPEAAAAdAAAfQEAdAIAfAEAZAEAgwIAgwAAfQMAdAIAfAEAZAIAgwIAgwAAfQQAdAIAfAEAZAMA
-gwIAgwAAfQUAZAQAfQYAdAIAfAEAZAUAgwIAZAYAfAMAZAcAfAQAZAgAfAUAgwADfQcAdAgAfAcA
-gwEAZAQAagQAb0MAAXQCAHQJAHwHAGQEAIMCAGQJAIMCAHQKAGoJAG8gAAF0CwB0AgB0CQB8BwBk
-BACDAgBkCQCDAgCDAQBTcbwAAW4BAAF8BgBTZAAAUygKAAAATnMRAAAAZ2V0RXhwbGFuYXRpb25V
-aWRzDgAAAGdldFJlc291cmNlVWlkcxAAAABnZXRWYXJpYXRpb25UZXh0aQAAAABzGwAAAE1vdmVt
-ZW50X3pHZXRQYWNrZWRRdWFudGl0eXMPAAAAZXhwbGFuYXRpb25fdWlkcwwAAAByZXNvdXJjZV91
-aWRzDgAAAHZhcmlhdGlvbl90ZXh0cwgAAABxdWFudGl0eSgMAAAAcwcAAABjb250ZXh0cwgAAABt
-b3ZlbWVudHMJAAAAX2dldGF0dHJfcwwAAABkZWxpdmVyeV91aWRzDAAAAHJlc291cmNlX3VpZHMO
-AAAAdmFyaWF0aW9uX3RleHRzDwAAAHBhY2tlZF9xdWFudGl0eXMIAAAAc3FsX2xpc3RzAwAAAGxl
-bnMJAAAAX2dldGl0ZW1fcwQAAABOb25lcwUAAABmbG9hdCgMAAAAcwcAAABjb250ZXh0cwgAAABt
-b3ZlbWVudHMJAAAAX2dldGF0dHJfcwwAAABkZWxpdmVyeV91aWRzDAAAAHJlc291cmNlX3VpZHMO
-AAAAdmFyaWF0aW9uX3RleHRzDwAAAHBhY2tlZF9xdWFudGl0eXMIAAAAc3FsX2xpc3RzAwAAAGxl
-bnMJAAAAX2dldGl0ZW1fcwQAAABOb25lcwUAAABmbG9hdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAo
-UHl0aG9uKXMaAAAATW92ZW1lbnRfZ2V0UGFja2VkUXVhbnRpdHkBAAAAcxgAAAAGARIBEgESAQYC
-DwEGAQYBCQITAR8BJAIoAQAAAHMaAAAATW92ZW1lbnRfZ2V0UGFja2VkUXVhbnRpdHkoAQAAAHMa
-AAAATW92ZW1lbnRfZ2V0UGFja2VkUXVhbnRpdHkoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhv
-bilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_asCellRange.xml
index 285b3b81a4..8009090db5 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_asCellRange.xml
@@ -94,29 +94,9 @@ return cell_range\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMBAAAADAAA
-AAwAAABLAAAAc98AAAB0AAB0AQBkAQCDAgCDAAB9BABnAAB9BQB8BAB0BABqCQBvsgABdAAAfAQA
-ZAIAgwIAZAMAZAQAgwABfQcAeIEAdAYAfAcAgwEARF1zAH0JAHwAAGQEAGoCAG84AAF0AAB8BQBk
-BQCDAgB0CQBkBgCEAAB0AAB0AQBkBwCDAgBkCAB8CQBmAQCDAAGDAgCDAQABcUoAAXQAAHwFAGQF
-AIMCAHQAAHQBAGQJAIMCAGQIAHwJAGYBAIMAAYMBAAFxSgBXdAoAZAoAhAAAfAUAgwIAfQUAbgEA
-AXwFAFNkAABTKAsAAABOcxAAAABnZXRSZXNvdXJjZVZhbHVlcxwAAABnZXRWYXJpYXRpb25CYXNl
-Q2F0ZWdvcnlMaXN0cxkAAABvbWl0X29wdGlvbl9iYXNlX2NhdGVnb3J5aQEAAABzBgAAAGFwcGVu
-ZGMBAAAAAgAAAAQAAABDAAAAcxwAAAB0AAB8AABkAQCDAgB0AAB8AABkAgCDAgBmAgBTKAMAAABO
-aQEAAABpAAAAACgCAAAAcwkAAABfZ2V0aXRlbV9zAQAAAHgoAgAAAHMBAAAAeHMJAAAAX2dldGl0
-ZW1fKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwoAAAA8bGFtYmRhLjA+CwAAAHMAAAAA
-cxwAAABnZXRWYXJpYXRpb25DYXRlZ29yeUl0ZW1MaXN0cxIAAABiYXNlX2NhdGVnb3J5X2xpc3Rz
-GAAAAGdldFZhcmlhdGlvbkNhdGVnb3J5TGlzdGMBAAAAAQAAAAIAAABDAAAAcwoAAAB8AABnAABq
-AwBTKAEAAABOKAEAAABzAQAAAHgoAQAAAHMBAAAAeCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0
-aG9uKXMKAAAAPGxhbWJkYS4xPhIAAABzAAAAACgLAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRl
-eHRzCAAAAHJlc291cmNlcwoAAABjZWxsX3JhbmdlcwQAAABOb25lcxIAAABiYXNlX2NhdGVnb3J5
-X2xpc3RzCQAAAF9nZXRpdGVyX3MNAAAAYmFzZV9jYXRlZ29yeXMJAAAAbWF0cml4Ym94cwMAAABt
-YXBzBgAAAGZpbHRlcigMAAAAcwkAAABtYXRyaXhib3hzAgAAAGt3cwkAAABfZ2V0YXR0cl9zBwAA
-AGNvbnRleHRzCAAAAHJlc291cmNlcwoAAABjZWxsX3JhbmdlcwQAAABOb25lcxIAAABiYXNlX2Nh
-dGVnb3J5X2xpc3RzCQAAAF9nZXRpdGVyX3MNAAAAYmFzZV9jYXRlZ29yeXMDAAAAbWFwcwYAAABm
-aWx0ZXIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzFQAAAE9yZGVyTGluZV9hc0NlbGxS
-YW5nZQEAAABzGgAAABIBBgENARgDDQAGARADFQEMARcCGAERAhYCKAEAAABzFQAAAE9yZGVyTGlu
-ZV9hc0NlbGxSYW5nZSgBAAAAcxUAAABPcmRlckxpbmVfYXNDZWxsUmFuZ2UoAAAAACgAAAAAcw8A
-AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListContent_updateAfterEdit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListContent_updateAfterEdit.xml
index 58550adb4a..3657a7abbd 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListContent_updateAfterEdit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListContent_updateAfterEdit.xml
@@ -74,17 +74,9 @@ for simulation_movement in packing_list_content.getDeliveryRelatedValueList():\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAYAAAAHAAAASwAA
-AHM9AAAAdAAAfQIAeDAAdAIAdAMAfAIAZAEAgwIAgwAAgwEARF0WAH0FAHQDAHwFAGQCAIMCAIMA
-AAFxHwBXZAAAUygDAAAATnMbAAAAZ2V0RGVsaXZlcnlSZWxhdGVkVmFsdWVMaXN0cw0AAAByZWlu
-ZGV4T2JqZWN0KAUAAABzBwAAAGNvbnRleHRzFAAAAHBhY2tpbmdfbGlzdF9jb250ZW50cwkAAABf
-Z2V0aXRlcl9zCQAAAF9nZXRhdHRyX3MTAAAAc2ltdWxhdGlvbl9tb3ZlbWVudCgGAAAAcwIAAABr
-d3MHAAAAY29udGV4dHMUAAAAcGFja2luZ19saXN0X2NvbnRlbnRzCQAAAF9nZXRpdGVyX3MJAAAA
-X2dldGF0dHJfcxMAAABzaW11bGF0aW9uX21vdmVtZW50KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQ
-eXRob24pcyIAAABQYWNraW5nTGlzdENvbnRlbnRfdXBkYXRlQWZ0ZXJFZGl0AQAAAHMGAAAABgIZ
-AAkBKAEAAABzIgAAAFBhY2tpbmdMaXN0Q29udGVudF91cGRhdGVBZnRlckVkaXQoAQAAAHMiAAAA
-UGFja2luZ0xpc3RDb250ZW50X3VwZGF0ZUFmdGVyRWRpdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAo
-UHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
index a669008860..f52fa4b26b 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
@@ -86,20 +86,9 @@ packing_list.edit(\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAOAAAAQwAA
-AHOGAAAAdAAAfQEAdAIAfAEAZAEAgwIAgwAAfQMAdAIAfAEAZAIAgwIAZAMAdAIAfAMAZAQAgwIA
-gwAAZAUAdAIAfAMAZAYAgwIAgwAAZAcAdAIAfAMAZAgAgwIAgwAAZAkAdAIAfAMAZAoAgwIAgwAA
-ZAsAdAIAfAMAZAwAgwIAgwAAgwAFAWQAAFMoDQAAAE5zEQAAAGdldENhdXNhbGl0eVZhbHVlcwQA
-AABlZGl0cwcAAABjb21tZW50cwoAAABnZXRDb21tZW50cw0AAABkZWxpdmVyeV9tb2Rlcw8AAABn
-ZXREZWxpdmVyeU1vZGVzCAAAAGluY290ZXJtcwsAAABnZXRJbmNvdGVybXMbAAAAc291cmNlX2Fk
-bWluaXN0cmF0aW9uX3ZhbHVlcxwAAABnZXRTb3VyY2VBZG1pbmlzdHJhdGlvblZhbHVlcwUAAAB0
-aXRsZXMIAAAAZ2V0VGl0bGUoBAAAAHMHAAAAY29udGV4dHMMAAAAcGFja2luZ19saXN0cwkAAABf
-Z2V0YXR0cl9zDQAAAHJlbGF0ZWRfb3JkZXIoBAAAAHMHAAAAY29udGV4dHMMAAAAcGFja2luZ19s
-aXN0cwkAAABfZ2V0YXR0cl9zDQAAAHJlbGF0ZWRfb3JkZXIoAAAAACgAAAAAcw8AAABTY3JpcHQg
-KFB5dGhvbilzHwAAAFBhY2tpbmdMaXN0X2NvcHlPcmRlclByb3BlcnRpZXMBAAAAcw4AAAAGARUC
-DwESARIDEgESBSgBAAAAcx8AAABQYWNraW5nTGlzdF9jb3B5T3JkZXJQcm9wZXJ0aWVzKAEAAABz
-HwAAAFBhY2tpbmdMaXN0X2NvcHlPcmRlclByb3BlcnRpZXMoAAAAACgAAAAAcw8AAABTY3JpcHQg
-KFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_doSolveActions.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_doSolveActions.xml
index c2dcccda17..18aa8a5629 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_doSolveActions.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_doSolveActions.xml
@@ -113,51 +113,9 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url )\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5zAAAAAGMCAAAAGQAA
-ABYAAABLAAAAc8cCAAB0AAB0AQBkAQCDAgB9BQB0AAB8BQBkAgCDAgBkAwCDAQB9BgB0AAB0AQBk
-BACDAgCDAAB9BwB0AAB0AQBkBQCDAgCDAAB9CAB0AAB0AQBkBgCDAgCDAABkBwAXfQkAZAgAfQoA
-fAYAdAgAagkAbw4CAXQAAHQBAGQJAIMCAGQKAIMBAAF4+QB0CQB8BgCDAQBEXesAfQ0AdAsAfA0A
-ZAsAgwIAfQ8AdAsAfA0AZAwAgwIAfRAAdAAAdAEAZA0AgwIAfA8AgwEAfREAdAAAfBEAZA4AgwIA
-ZAwAfBAAZA8AZBAAgwIBAXQLAHwNAGQRAIMCAH0SAHwSAGQSAGoCAG9HAAFkEwB9CgB0AAB0AAB0
-AQBkFACDAgBkFQCDAgB8EQB0CABkEgBkFgB8BwBkFwB8CABkGABoAAAEZBkAfAkAAzyDAwMBcZEA
-AXwSAGQaAGoCAG8mAAF0AAB0AAB0AQBkFACDAgBkFQCDAgB8EQB0CABkGgCDAwABcZEAAXGRAFd0
-AAB0AQBkGwCDAgCDAAABfAoAb+QAAXQAAHQBAGQcAIMCAIMAAH0TAHQAAHwTAGQdAIMCAGQeAGQf
-AIMAAX0UAHQAAHwTAGQgAIMCAIMAAH0VAHwVAGQhAGoCAG8cAAF0AAB0AAB8EwBkIgCDAgBkIwCD
-AgB9FgBuKgABfBUAZCQAagIAbxwAAXQAAHQAAHwTAGQiAIMCAGQlAIMCAH0WAG4BAAF0AAB8EwBk
-JgCDAgCDAAB0AAB0AQBkJgCDAgCDAABnAgB9FwB0AAB0AAB8FgBkJwCDAgBkKABkKQBkKgB8CQCD
-AAJkKwCDAgBkLAB8FwCDAAEBcX8CAW4BAAFkLQB0AAB0AQBkLgCDAgCDAAB8AABkLwBmAwAWfRgA
-dAAAdAsAdAAAdAEAZAEAgwIAZDAAgwIAZDEAgwIAfBgAgwEAAWQAAFMoMgAAAE5zBwAAAFJFUVVF
-U1RzAwAAAGdldHMHAAAAbGlzdGJveHMMAAAAZ2V0U3RhcnREYXRlcwsAAABnZXRTdG9wRGF0ZXMH
-AAAAZ2V0UGF0aHMGAAAAX3NwbGl0aQAAAABzEQAAAHVwZGF0ZUFwcGxpZWRSdWxlcxUAAABkZWZh
-dWx0X2RlbGl2ZXJ5X3J1bGVzCwAAAGxpc3Rib3hfa2V5cwgAAABxdWFudGl0eXMSAAAAcmVzdHJp
-Y3RlZFRyYXZlcnNlcwsAAABzZXRQcm9wZXJ0eXMEAAAAdHlwZXMFAAAAZmxvYXRzBgAAAGNob2lj
-ZXMNAAAAU3BsaXRBbmREZWZlcmkBAAAAcxEAAABwb3J0YWxfc2ltdWxhdGlvbnMNAAAAc29sdmVN
-b3ZlbWVudHMKAAAAc3RhcnRfZGF0ZXMJAAAAc3RvcF9kYXRlcwsAAABhY3RpdmF0ZV9rd3MDAAAA
-dGFncwwAAABDb3B5VG9UYXJnZXRzFAAAAHVwZGF0ZUNhdXNhbGl0eVN0YXRlcxEAAABnZXRDYXVz
-YWxpdHlWYWx1ZXMYAAAAZ2V0Q2F1c2FsaXR5UmVsYXRlZFZhbHVlcwsAAABwb3J0YWxfdHlwZXMM
-AAAAQXBwbGllZCBSdWxlcw0AAABnZXRQb3J0YWxUeXBlcwoAAABTYWxlIE9yZGVycxEAAABwb3J0
-YWxfZGVsaXZlcmllc3MZAAAAc2FsZV9wYWNraW5nX2xpc3RfYnVpbGRlcnMOAAAAUHVyY2hhc2Ug
-T3JkZXJzHQAAAHB1cmNoYXNlX3BhY2tpbmdfbGlzdF9idWlsZGVycwYAAABnZXRVaWRzCAAAAGFj
-dGl2YXRlcwgAAABhY3Rpdml0eXMIAAAAU1FMUXVldWVzCQAAAGFmdGVyX3RhZ3MFAAAAYnVpbGRz
-DwAAAGV4cGxhbmF0aW9uX3VpZHMIAAAAJXMvJXM/JXNzDAAAAGFic29sdXRlX3VybHMwAAAAcG9y
-dGFsX3N0YXR1c19tZXNzYWdlPVNhbGUrUGFja2luZytMaXN0K3VwZGF0ZWQucwgAAABSRVNQT05T
-RXMIAAAAcmVkaXJlY3QoFwAAAHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwcAAAByZXF1ZXN0
-cwcAAABsaXN0Ym94cwoAAABzdGFydF9kYXRlcwkAAABzdG9wX2RhdGVzAwAAAHRhZ3MPAAAAc3Bs
-aXRfYW5kX2RlZmVycwQAAABOb25lcwkAAABfZ2V0aXRlcl9zBAAAAGxpbmVzCQAAAF9nZXRpdGVt
-X3MDAAAAdXJscwgAAABxdWFudGl0eXMIAAAAbW92ZW1lbnRzBgAAAGNob2ljZXMFAAAAb3JkZXJz
-DAAAAGFwcGxpZWRfcnVsZXMRAAAAb3JkZXJfcG9ydGFsX3R5cGVzEAAAAGRlbGl2ZXJ5X2J1aWxk
-ZXJzFAAAAGV4cGxhbmF0aW9uX3VpZF9saXN0cwcAAABmb3JtX2lkcwwAAAByZWRpcmVjdF91cmwo
-GQAAAHMHAAAAZm9ybV9pZHMJAAAAZGlhbG9nX2lkcwIAAABrd3MJAAAAX2dldGF0dHJfcwcAAABj
-b250ZXh0cwcAAAByZXF1ZXN0cwcAAABsaXN0Ym94cwoAAABzdGFydF9kYXRlcwkAAABzdG9wX2Rh
-dGVzAwAAAHRhZ3MPAAAAc3BsaXRfYW5kX2RlZmVycwQAAABOb25lcwkAAABfZ2V0aXRlcl9zBAAA
-AGxpbmVzCQAAAF9nZXRpdGVtX3MDAAAAdXJscwgAAABxdWFudGl0eXMIAAAAbW92ZW1lbnRzBgAA
-AGNob2ljZXMFAAAAb3JkZXJzDAAAAGFwcGxpZWRfcnVsZXMRAAAAb3JkZXJfcG9ydGFsX3R5cGVz
-EAAAAGRlbGl2ZXJ5X2J1aWxkZXJzFAAAAGV4cGxhbmF0aW9uX3VpZF9saXN0cwwAAAByZWRpcmVj
-dF91cmwoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzGgAAAFBhY2tpbmdMaXN0X2RvU29s
-dmVBY3Rpb25zAQAAAHNAAAAADwIVARIBEgEWAgYCEAEQAQ0ABgEPAQ8BGAEZAQ8BDQEMATsBEwEn
-Ag0CBwISARgCEgENARwBDQEcAioBMAMoAigBAAAAcxoAAABQYWNraW5nTGlzdF9kb1NvbHZlQWN0
-aW9ucygBAAAAcxoAAABQYWNraW5nTGlzdF9kb1NvbHZlQWN0aW9ucygAAAAAKAAAAABzDwAAAFNj
-cmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
index 2121bc0359..89b07e68c3 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
@@ -237,93 +237,9 @@ else:\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMCAAAAFgAA
-AEgAAABDAAAAc0YIAAB0AAB9AwBnAAB9BABkAQB9BQB0BAB8AwBkAgCDAgBkAwB8BQBmAQCDAAF9
-BAB0BQB8BACDAQBkBABqAgBvMQABdAQAdAQAdAAAZAUAgwIAZAYAgwIAfAMAZAMAZAEAZgEAZAcA
-ZAQAgwECfQQAbgEAAXQFAHwEAIMBAGQEAGoCAG8jAAFkCAB0BAB0AABkCQCDAgCDAAB8AABkCgBm
-AwAWfQgAbmgHAXQFAHwEAIMBAGQLAGoEAG8jAAFkCAB0BAB0AABkCQCDAgCDAAB8AABkDABmAwAW
-fQgAbjIHAXQEAHQIAHwEAGQEAIMCAGQNAIMCAIMAAH0KAHQEAHwDAGQOAIMCAIMAAH0LAHQEAHwD
-AGQPAIMCAIMAAHQLAGoCAG8WAAF0BAB8CgBkDwCDAgCDAAB0CwBqCQBvIQABfAsAZBAAdAQAfAoA
-ZBEAgwIAgwAAF2YBADd9CwBuAQABdAQAfAMAZBIAgwIAgwAAdAsAaggAbxYAAXQEAHwKAGQSAIMC
-AIMAAHQLAGoJAG8hAAF8CwBkEwB0BAB8CgBkFACDAgCDAAAXZgEAN30LAG4BAAF0BAB8AwBkFQCD
-AgCDAAB0CwBqCABvFgABdAQAfAoAZBUAgwIAgwAAdAsAagkAbyEAAXwLAGQWAHQEAHwKAGQXAIMC
-AIMAABdmAQA3fQsAbgEAAXQEAHwDAGQYAIMCAIMAAHQLAGoIAG8WAAF0BAB8CgBkGACDAgCDAAB0
-CwBqCQBvIQABfAsAZBkAdAQAfAoAZBoAgwIAgwAAF2YBADd9CwBuAQABdAQAfAMAZBsAgwIAgwAA
-dAsAaggAb3gAAXQEAHwKAGQbAIMCAIMAAHQLAGoJAG8hAAF8CwBkHAB0BAB8CgBkHQCDAgCDAAAX
-ZgEAN30LAHHnAgF0BAB8CgBkHgCDAgCDAAB0CwBqCQBvIQABfAsAZBwAdAQAfAMAZB8AgwIAgwAA
-F2YBADd9CwBx5wIBbgEAAXQEAHwDAGQgAIMCAGQDAGQhAIMAAXQLAGoIAG+QAAF0BAB8CgBkIACD
-AgBkAwBkIQCDAAF0CwBqCQBvMwABfAsAZCIAdAQAdAQAfAoAZCAAgwIAZAMAZCEAgwABZCMAgwIA
-gwAAF2YBADd9CwBxlgMBdAQAfAMAZB4AgwIAgwAAdAsAagkAbyEAAXwLAGQiAHQEAHwDAGQfAIMC
-AIMAABdmAQA3fQsAcZYDAW4BAAF0BAB8AwBkJACDAgCDAAB0CwBqCABvhAABdAQAfAoAZCQAgwIA
-gwAAdAsAagkAby0AAXwLAGQlAHQEAHQEAHwKAGQkAIMCAIMAAGQjAIMCAIMAABdmAQA3fQsAcTME
-AXQEAHwDAGQeAIMCAIMAAHQLAGoJAG8hAAF8CwBkJQB0BAB8AwBkHwCDAgCDAAAXZgEAN30LAHEz
-BAFuAQABdAQAfAMAZCYAgwIAgwAAdAsAaggAb3gAAXQEAHwKAGQmAIMCAIMAAHQLAGoJAG8hAAF8
-CwBkJwB0BAB8CgBkKACDAgCDAAAXZgEAN30LAHHEBAF0BAB8AwBkHgCDAgCDAAB0CwBqCQBvIQAB
-fAsAZCcAdAQAfAMAZB8AgwIAgwAAF2YBADd9CwBxxAQBbgEAAXQEAHwDAGQpAIMCAIMAAHQLAGoI
-AG8WAAF0BAB8CgBkKQCDAgCDAAB0CwBqCQBvIQABfAsAZCoAdAQAfAoAZCsAgwIAgwAAF2YBADd9
-CwBuAQABdAQAfAMAZCwAgwIAgwAAdAsAaggAbxYAAXQEAHwKAGQsAIMCAIMAAHQLAGoJAG8pAAF8
-CwB0BAB0BAB8CgBkLACDAgCDAABkIwCDAgCDAABmAQA3fQsAbgEAAXQEAHwDAGQtAIMCAIMAAHQL
-AGoIAG8WAAF0BAB8CgBkLQCDAgCDAAB0CwBqCQBvKQABfAsAdAQAdAQAfAoAZC0AgwIAgwAAZCMA
-gwIAgwAAZgEAN30LAG4BAAFkLgB9DQB0BAB8AwBkLwCDAgCDAABvFgABdAQAfAMAZDAAgwIAgwAA
-fQ0AbioAAXQEAHwKAGQvAIMCAIMAAG8WAAF0BAB8CgBkMACDAgCDAAB9DQBuAQABZDEAfQ4AdAUA
-dAQAfAMAZDIAgwIAZDMAaAAABGQDAHwOAAM8gwABgwEAZAQAagIAb28AAWcAAH0PAHQEAHwKAGQy
-AIMCAGQzAGgAAARkAwB8DgADPIMAAX0PAHQFAHwPAIMBAGQEAGoEAG8xAAF0BAB8CgBkNACDAgBk
-NQB8DwCDAAF9EAB0BAB8AwBkNgCDAgB8EACDAQB9EQBxyAYBbgEAAWQ3AH0SAHQFAHQEAHwDAGQy
-AIMCAGQzAGgAAARkAwB8EgADPIMAAYMBAGQEAGoCAG9vAAFnAAB9DwB0BAB8CgBkMgCDAgBkMwBo
-AAAEZAMAfBIAAzyDAAF9DwB0BQB8DwCDAQBkBABqBABvMQABdAQAfAoAZDQAgwIAZDUAfA8AgwAB
-fRAAdAQAfAMAZDYAgwIAfBAAgwEAfREAcWsHAW4BAAFmAAB9EwB4QgB0EwB8CwCDAQBEXTQAfRUA
-dAQAfBUAZDgAgwIAZDkAgwEAZAsAC2oCAG8RAAF8EwB8FQBmAQA3fRMAcX4HAXF+B1d8EwBkOQB0
-BAB8CgBkIwCDAgCDAAAXZgEAN30TAHQEAHwDAGQ6AIMCAGQ7AHwTAGQ8AHwNAIMAAgFkCAB0BAB0
-AABkCQCDAgCDAAB8AABkPQBmAwAWfQgAfAEAbwgAAXQLAFNuJgABdAQAdAgAdAQAdAAAZD4AgwIA
-ZD8AgwIAZEAAgwIAfAgAgwEAAWQAAFMoQQAAAE5zGAAAAFB1cmNoYXNlIFRyYWRlIENvbmRpdGlv
-bnMWAAAAZ2V0U3BlY2lhbGlzZVZhbHVlTGlzdHMLAAAAcG9ydGFsX3R5cGVpAAAAAHMOAAAAcG9y
-dGFsX2RvbWFpbnNzEwAAAHNlYXJjaFByZWRpY2F0ZUxpc3RzBAAAAHRlc3RzCAAAACVzLyVzPyVz
-cwwAAABhYnNvbHV0ZV91cmxzKQAAAHBvcnRhbF9zdGF0dXNfbWVzc2FnZT1ObytUcmFkZStDb25k
-aXRpb24uaQEAAABzLwAAAHBvcnRhbF9zdGF0dXNfbWVzc2FnZT1Ub28rbWFueStUcmFkZStDb25k
-aXRpb24ucwkAAABnZXRPYmplY3RzDwAAAGdldENhdGVnb3J5TGlzdHMTAAAAZ2V0RGVzdGluYXRp
-b25WYWx1ZXMMAAAAZGVzdGluYXRpb24vcxkAAABnZXREZXN0aW5hdGlvblJlbGF0aXZlVXJscxsA
-AABnZXREZXN0aW5hdGlvbkRlY2lzaW9uVmFsdWVzFQAAAGRlc3RpbmF0aW9uX2RlY2lzaW9uL3Mh
-AAAAZ2V0RGVzdGluYXRpb25EZWNpc2lvblJlbGF0aXZlVXJscyEAAABnZXREZXN0aW5hdGlvbkFk
-bWluaXN0cmF0aW9uVmFsdWVzGwAAAGRlc3RpbmF0aW9uX2FkbWluaXN0cmF0aW9uL3MnAAAAZ2V0
-RGVzdGluYXRpb25BZG1pbmlzdHJhdGlvblJlbGF0aXZlVXJscxoAAABnZXREZXN0aW5hdGlvblBh
-eW1lbnRWYWx1ZXMUAAAAZGVzdGluYXRpb25fcGF5bWVudC9zIAAAAGdldERlc3RpbmF0aW9uUGF5
-bWVudFJlbGF0aXZlVXJscxUAAABnZXRTb3VyY2VTZWN0aW9uVmFsdWVzDwAAAHNvdXJjZV9zZWN0
-aW9uL3MbAAAAZ2V0U291cmNlU2VjdGlvblJlbGF0aXZlVXJscw4AAABnZXRTb3VyY2VWYWx1ZXMU
-AAAAZ2V0U291cmNlUmVsYXRpdmVVcmxzFgAAAGdldFNvdXJjZURlY2lzaW9uVmFsdWVzDAAAAE9y
-Z2FuaXNhdGlvbnMQAAAAc291cmNlX2RlY2lzaW9uL3MOAAAAZ2V0UmVsYXRpdmVVcmxzHAAAAGdl
-dFNvdXJjZUFkbWluaXN0cmF0aW9uVmFsdWVzFgAAAHNvdXJjZV9hZG1pbmlzdHJhdGlvbi9zFQAA
-AGdldFNvdXJjZVBheW1lbnRWYWx1ZXMPAAAAc291cmNlX3BheW1lbnQvcxsAAABnZXRTb3VyY2VQ
-YXltZW50UmVsYXRpdmVVcmxzEAAAAGdldFJlc291cmNlVmFsdWVzCQAAAHJlc291cmNlL3MWAAAA
-Z2V0UmVzb3VyY2VSZWxhdGl2ZVVybHMQAAAAZ2V0SW5jb3Rlcm1WYWx1ZXMUAAAAZ2V0RGVsaXZl
-cnlNb2RlVmFsdWVzAAAAAHMlAAAAaGFzRGVzdGluYXRpb25EZWNpc2lvblNvdXJjZVJlZmVyZW5j
-ZXMlAAAAZ2V0RGVzdGluYXRpb25EZWNpc2lvblNvdXJjZVJlZmVyZW5jZXMRAAAAUGF5bWVudCBD
-b25kaXRpb25zCgAAAGNvbnRlbnRJZHNzBgAAAGZpbHRlcnMSAAAAbWFuYWdlX2NvcHlPYmplY3Rz
-cwMAAABpZHNzEwAAAG1hbmFnZV9wYXN0ZU9iamVjdHNzCAAAAERpc2NvdW50cwQAAABmaW5kcwsA
-AABzcGVjaWFsaXNlL3MEAAAAZWRpdHMKAAAAY2F0ZWdvcmllc3MlAAAAZGVzdGluYXRpb25fZGVj
-aXNpb25fc291cmNlX3JlZmVyZW5jZXMkAAAAcG9ydGFsX3N0YXR1c19tZXNzYWdlPU9yZGVyK3Vw
-ZGF0ZWQucwcAAABSRVFVRVNUcwgAAABSRVNQT05TRXMIAAAAcmVkaXJlY3QoFgAAAHMHAAAAY29u
-dGV4dHMFAAAAb3JkZXJzFAAAAHRyYWRlX2NvbmRpdGlvbl9saXN0cxsAAAB0cmFkZV9jb25kaXRp
-b25fcG9ydGFsX3R5cGVzCQAAAF9nZXRhdHRyX3MDAAAAbGVucwcAAABmb3JtX2lkcwwAAAByZWRp
-cmVjdF91cmxzCQAAAF9nZXRpdGVtX3MPAAAAdHJhZGVfY29uZGl0aW9ucwoAAABjYXRlZ29yaWVz
-cwQAAABOb25lcyUAAABkZXN0aW5hdGlvbl9kZWNpc2lvbl9zb3VyY2VfcmVmZXJlbmNlcx0AAABw
-YXltZW50X2NvbmRpdGlvbl9wb3J0YWxfdHlwZXMHAAAAdG9fY29weXMJAAAAY29weV9kYXRhcwsA
-AABuZXdfaWRfbGlzdHMUAAAAZGlzY291bnRfcG9ydGFsX3R5cGVzEAAAAGZpbmFsX2NhdGVnb3Jp
-ZXNzCQAAAF9nZXRpdGVyX3MNAAAAY2F0ZWdvcnlfaXRlbXMKAAAAYmF0Y2hfbW9kZSgWAAAAcwcA
-AABmb3JtX2lkcwoAAABiYXRjaF9tb2RlcwcAAABjb250ZXh0cwUAAABvcmRlcnMUAAAAdHJhZGVf
-Y29uZGl0aW9uX2xpc3RzGwAAAHRyYWRlX2NvbmRpdGlvbl9wb3J0YWxfdHlwZXMJAAAAX2dldGF0
-dHJfcwMAAABsZW5zDAAAAHJlZGlyZWN0X3VybHMJAAAAX2dldGl0ZW1fcw8AAAB0cmFkZV9jb25k
-aXRpb25zCgAAAGNhdGVnb3JpZXNzBAAAAE5vbmVzJQAAAGRlc3RpbmF0aW9uX2RlY2lzaW9uX3Nv
-dXJjZV9yZWZlcmVuY2VzHQAAAHBheW1lbnRfY29uZGl0aW9uX3BvcnRhbF90eXBlcwcAAAB0b19j
-b3B5cwkAAABjb3B5X2RhdGFzCwAAAG5ld19pZF9saXN0cxQAAABkaXNjb3VudF9wb3J0YWxfdHlw
-ZXMQAAAAZmluYWxfY2F0ZWdvcmllc3MJAAAAX2dldGl0ZXJfcw0AAABjYXRlZ29yeV9pdGVtKAAA
-AAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcykAAABQdXJjaGFzZU9yZGVyX2FwcGx5UHVyY2hh
-c2VUcmFkZUNvbmRpdGlvbgEAAABzqgAAAAACBgEGAgYBDwEMAhMCMQMTASMCEwEjAxsDFQIvASQC
-GQEWASQCGQEWASQCGQEWASEDGQIZASEBGQElBB8DFQAKATMDGQElAhkCGQEtAxkBJQIZAhkBIQIZ
-ASgDGQEWASQeGQEWASwCGQEWASkCCQEQARkBEAEWAwYBLgEGASEBEwEYAR0DBgEuAQYBIQETARgB
-HQMGAQ0ABgEdARUCIAISAwcCHwMHARECKAEAAABzKQAAAFB1cmNoYXNlT3JkZXJfYXBwbHlQdXJj
-aGFzZVRyYWRlQ29uZGl0aW9uKAEAAABzKQAAAFB1cmNoYXNlT3JkZXJfYXBwbHlQdXJjaGFzZVRy
-YWRlQ29uZGl0aW9uKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEA
-AABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml
index efb9815233..3bbee7c0b5 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_selectMovement.xml
@@ -82,26 +82,9 @@ else:\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMBAAAACwAA
-AA8AAABLAAAAc/QAAABkAQBkAgBnAgB0AAB8AQCDAQBkAwA8ZAQAdAAAfAEAgwEAZAUAPGQGAHQA
-AHwBAIMBAGQHADxkCAB0AAB8AQCDAQBkCQA8dAIAfAEAZAoAgwIAdAMAdAIAdAIAdAQAZAsAgwIA
-ZAwAgwIAfAEAjQEAgwEAAXwAAGQNAGoCAG9TAAFnAAAEaQYAfQcAdAgAdAMAdAIAdAQAZA4AgwIA
-fAEAjQEAgwEARF0cAH0JAHwHAHQCAHwJAGQPAIMCAIMAAIMBAAFxpwB+BwB9CgB8CgBTbh0AAXQD
-AHQCAHQEAGQOAIMCAGQQAGQRAHwBAI0BAVNkAABTKBIAAABOcwoAAABPcmRlciBSdWxlcw0AAABE
-ZWxpdmVyeSBSdWxlcx0AAABwYXJlbnRfc3BlY2lhbGlzZV9wb3J0YWxfdHlwZXMOAAAAUHVyY2hh
-c2UgT3JkZXJzFwAAAGV4cGxhbmF0aW9uX3BvcnRhbF90eXBlcxMAAABTaW11bGF0aW9uIE1vdmVt
-ZW50cwsAAABwb3J0YWxfdHlwZXMJAAAAY29uZmlybWVkcxAAAABzaW11bGF0aW9uX3N0YXRlcwYA
-AAB1cGRhdGVzDgAAAHBvcnRhbF9jYXRhbG9ncw0AAABidWlsZFNRTFF1ZXJ5aQAAAABzFQAAAE9y
-ZGVyX3pTZWxlY3RNb3ZlbWVudHMJAAAAZ2V0T2JqZWN0cwUAAABzcmNfX2kBAAAAKAsAAABzBwAA
-AF93cml0ZV9zAgAAAGt3cwkAAABfZ2V0YXR0cl9zBwAAAF9hcHBseV9zBwAAAGNvbnRleHRzBQAA
-AHNyY19fcwYAAABhcHBlbmRzCAAAACRhcHBlbmQwcwkAAABfZ2V0aXRlcl9zAQAAAHhzDQAAAG1v
-dmVtZW50X2xpc3QoCwAAAHMFAAAAc3JjX19zAgAAAGt3cwcAAABfd3JpdGVfcwkAAABfZ2V0YXR0
-cl9zBwAAAF9hcHBseV9zBwAAAGNvbnRleHRzBgAAAGFwcGVuZHMIAAAAJGFwcGVuZDBzCQAAAF9n
-ZXRpdGVyX3MBAAAAeHMNAAAAbW92ZW1lbnRfbGlzdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0
-aG9uKXMcAAAAUHVyY2hhc2VPcmRlcl9zZWxlY3RNb3ZlbWVudAEAAABzEgAAABYBEAEQARMCKwIN
-ASYAJQEIAigBAAAAcxwAAABQdXJjaGFzZU9yZGVyX3NlbGVjdE1vdmVtZW50KAEAAABzHAAAAFB1
-cmNoYXNlT3JkZXJfc2VsZWN0TW92ZW1lbnQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilz
-CAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml
index b0fd712a71..b9e9b229cf 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_copyOrderProperties.xml
@@ -86,20 +86,9 @@ packing_list.activate(after_method_id=(\'immediateReindexObject\',\'recursiveImm
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAHAAAAQwAA
-AHODAAAAdAAAfQEAdAIAfAEAZAEAgwIAgwAAAXQCAHwBAGQCAIMCAGQDAGQEAGQFAGcCAIMAAX0D
-AHQCAHwDAGQGAIMCAIMAAAF0AgB8AQBkBwCDAgCDAAABdAIAdAIAfAEAZAIAgwIAZAMAZAQAZAUA
-ZAYAZgMAgwABZAgAgwIAgwAAAWQAAFMoCQAAAE5zHwAAAFBhY2tpbmdMaXN0X2NvcHlPcmRlclBy
-b3BlcnRpZXNzCAAAAGFjdGl2YXRlcw8AAABhZnRlcl9tZXRob2RfaWRzFgAAAGltbWVkaWF0ZVJl
-aW5kZXhPYmplY3RzHwAAAHJlY3Vyc2l2ZUltbWVkaWF0ZVJlaW5kZXhPYmplY3RzEAAAAERlbGl2
-ZXJ5X2NvbmZpcm1zDQAAAHN0YXJ0QnVpbGRpbmdzFAAAAHVwZGF0ZUNhdXNhbGl0eVN0YXRlKAQA
-AABzBwAAAGNvbnRleHRzDAAAAHBhY2tpbmdfbGlzdHMJAAAAX2dldGF0dHJfcwgAAABhY3Rpdml0
-eSgEAAAAcwcAAABjb250ZXh0cwwAAABwYWNraW5nX2xpc3RzCQAAAF9nZXRhdHRyX3MIAAAAYWN0
-aXZpdHkoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzJwAAAFB1cmNoYXNlUGFja2luZ0xp
-c3RfY29weU9yZGVyUHJvcGVydGllcwEAAABzDAAAAAkDDQMPARICEAMTAygBAAAAcycAAABQdXJj
-aGFzZVBhY2tpbmdMaXN0X2NvcHlPcmRlclByb3BlcnRpZXMoAQAAAHMnAAAAUHVyY2hhc2VQYWNr
-aW5nTGlzdF9jb3B5T3JkZXJQcm9wZXJ0aWVzKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
-cwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml
index 85da327a69..5d04d24a55 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml
@@ -72,16 +72,9 @@
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAGAAAATwAA
-AHMpAAAAdAAAdAEAZAEAgwIAZAIAZAMAZAQAZgIAZAUAZAYAZgEAgwACU2QAAFMoBwAAAE5zEQAA
-AGdlbmVyYXRlUHJlZGljYXRlcywAAABtdWx0aW1lbWJlcnNoaXBfY3JpdGVyaW9uX2Jhc2VfY2F0
-ZWdvcnlfbGlzdHMGAAAAc291cmNlcw4AAABzb3VyY2Vfc2VjdGlvbnMXAAAAY3JpdGVyaW9uX3By
-b3BlcnR5X2xpc3RzCgAAAHN0YXJ0X2RhdGUoAgAAAHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0
-KAQAAABzBAAAAGFyZ3NzAgAAAGt3cwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoAAAAACgAAAAA
-cw8AAABTY3JpcHQgKFB5dGhvbilzIgAAAFB1cmNoYXNlVHJhZGVDb25kaXRpb25fYXNQcmVkaWNh
-dGUBAAAAcwIAAAAbASgBAAAAcyIAAABQdXJjaGFzZVRyYWRlQ29uZGl0aW9uX2FzUHJlZGljYXRl
-KAEAAABzIgAAAFB1cmNoYXNlVHJhZGVDb25kaXRpb25fYXNQcmVkaWNhdGUoAAAAACgAAAAAcw8A
-AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultSupplyLine.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultSupplyLine.xml
index 82edcaf3d4..d1b5215c34 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultSupplyLine.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_getDefaultSupplyLine.xml
@@ -71,14 +71,9 @@
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAAFAAAATwAA
-AHMUAAAAdAAAdAEAZAEAdAIAgwMAU2QAAFMoAgAAAE5zEwAAAGRlZmF1bHRfc3VwcGx5X2xpbmUo
-AwAAAHMHAAAAZ2V0YXR0cnMHAAAAY29udGV4dHMEAAAATm9uZSgFAAAAcwQAAABhcmdzcwIAAABr
-d3MHAAAAZ2V0YXR0cnMHAAAAY29udGV4dHMEAAAATm9uZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAo
-UHl0aG9uKXMdAAAAUmVzb3VyY2VfZ2V0RGVmYXVsdFN1cHBseUxpbmUBAAAAcwAAAAAoAQAAAHMd
-AAAAUmVzb3VyY2VfZ2V0RGVmYXVsdFN1cHBseUxpbmUoAQAAAHMdAAAAUmVzb3VyY2VfZ2V0RGVm
-YXVsdFN1cHBseUxpbmUoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+
-AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
index 01b77ea971..4dc73c8f60 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
@@ -208,104 +208,9 @@ else:\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGQBAGQCAGQDAIQCAFoAAGQAAFMoBAAAAE5pAAAAAGkBAAAA
-YwMAAAAXAAAASQAAAEMAAABzkgoAAHQAAH0EAGcAAH0FAGQBAH0GAHQEAHwEAGQCAIMCAGQDAHwG
-AGYBAIMAAX0FAHQFAHwFAIMBAGQEAGoCAG9HAAF0BAB0BAB0AABkBQCDAgBkBgCDAgB8BABkAwB8
-BgBmAQBkBwBkBACDAQJ9BQB0BAB0AABkCACDAgBkCQB8BQCDAgABbgEAAXQFAHwFAIMBAGQEAGoC
-AG8jAAFkCgB0BAB0AABkCwCDAgCDAAB8AABkDABmAwAWfQkAbp4JAXQFAHwFAIMBAGQNAGoEAG8j
-AAFkCgB0BAB0AABkCwCDAgCDAAB8AABkDgBmAwAWfQkAbmgJAXQEAHQIAHwFAGQEAIMCAGQPAIMC
-AIMAAH0LAHQEAHwEAGQQAIMCAIMAAH0MAHQEAHwEAGQRAIMCAIMAAHQLAGoIAG8aAAF0BAB0AABk
-EgCDAgB0DACDAACDAQABbgEAAXQEAHwEAGQTAIMCAIMAAHQLAGoCAHAKAAF8AgBkDQBqAgBvFgAB
-dAQAfAsAZBMAgwIAgwAAdAsAagkAbyYAAXQEAHwEAGQUAIMCAHQEAHwLAGQVAIMCAIMAAGYBAIMB
-AAFuAQABdAQAfAQAZBYAgwIAgwAAdAsAaggAcAoAAXwCAGQNAGoCAG8WAAF0BAB8CwBkFgCDAgCD
-AAB0CwBqCQBvJgABdAQAfAQAZBcAgwIAdAQAfAsAZBgAgwIAgwAAZgEAgwEAAW4BAAF0BAB8BABk
-GQCDAgCDAAB0CwBqCABwCgABfAIAZA0AagIAbxYAAXQEAHwLAGQZAIMCAIMAAHQLAGoJAG8mAAF0
-BAB8BABkGgCDAgB0BAB8CwBkGwCDAgCDAABmAQCDAQABbgEAAXQEAHwEAGQcAIMCAIMAAHQLAGoI
-AHAKAAF8AgBkDQBqAgBvFgABdAQAfAsAZBwAgwIAgwAAdAsAagkAbyYAAXQEAHwEAGQdAIMCAHQE
-AHwLAGQeAIMCAIMAAGYBAIMBAAFuAQABdAQAfAQAZB8AgwIAgwAAdAsAaggAcAoAAXwCAGQNAGoC
-AG8WAAF0BAB8CwBkHwCDAgCDAAB0CwBqCQBvIwABdAQAfAQAZCAAgwIAdAQAfAsAZCEAgwIAgwAA
-gwEAAW4BAAF0BAB8BABkIgCDAgCDAAB0CwBqCABwCgABfAIAZA0AagIAb4IAAXQEAHwLAGQiAIMC
-AIMAAHQLAGoJAG8mAAF0BAB8BABkIwCDAgB0BAB8CwBkJACDAgCDAABmAQCDAQABcfEDAXQEAHwL
-AGQlAIMCAIMAAHQLAGoJAG8mAAF0BAB8BABkIwCDAgB0BAB8BABkJgCDAgCDAABmAQCDAQABcfED
-AW4BAAF0BAB8BABkJQCDAgCDAAB0CwBqCABwCgABfAIAZA0AagIAb4IAAXQEAHwLAGQlAIMCAIMA
-AHQLAGoJAG8mAAF0BAB8BABkJwCDAgB0BAB8CwBkJgCDAgCDAABmAQCDAQABcZkEAXQEAHwEAGQi
-AIMCAIMAAHQLAGoJAG8mAAF0BAB8BABkJwCDAgB0BAB8BABkJgCDAgCDAABmAQCDAQABcZkEAW4B
-AAF0BQB0BAB8BABkKACDAgCDAACDAQBkBABqAgBwCgABfAIAZA0AagIAb6sAAXQFAHQEAHwLAGQo
-AIMCAIMAAIMBAGQEAGoEAG9JAAF4hQB0DgB0BAB8CwBkKACDAgCDAACDAQBEXSgAfRAAdAQAfAQA
-ZCkAgwIAdAQAfBAAZCoAgwIAgwAAZgEAgwEAAXH9BFdxcAUBdAQAfAQAZCUAgwIAgwAAdAsAagkA
-byYAAXQEAHwEAGQpAIMCAHQEAHwEAGQmAIMCAIMAAGYBAIMBAAFxcAUBbgEAAXQEAHwEAGQrAIMC
-AIMAAHQLAGoIAHAKAAF8AgBkDQBqAgBvjgABdAQAfAsAZCsAgwIAgwAAdAsAagkAbzIAAXQEAHwE
-AGQsAIMCAHQEAHQEAHwLAGQrAIMCAIMAAGQqAIMCAIMAAGYBAIMBAAFxJAYBdAQAfAQAZCUAgwIA
-gwAAdAsAagkAbyYAAXQEAHwEAGQsAIMCAHQEAHwEAGQmAIMCAIMAAGYBAIMBAAFxJAYBbgEAAXQE
-AHwEAGQtAIMCAIMAAHQLAGoIAHAKAAF8AgBkDQBqAgBvggABdAQAfAsAZC0AgwIAgwAAdAsAagkA
-byYAAXQEAHwEAGQuAIMCAHQEAHwLAGQvAIMCAIMAAGYBAIMBAAFxzAYBdAQAfAQAZCUAgwIAgwAA
-dAsAagkAbyYAAXQEAHwEAGQuAIMCAHQEAHwEAGQmAIMCAIMAAGYBAIMBAAFxzAYBbgEAAXQEAHwE
-AGQwAIMCAIMAAHQLAGoIAHAKAAF8AgBkDQBqAgBvFgABdAQAfAsAZDAAgwIAgwAAdAsAagkAbzIA
-AXQEAHwEAGQxAIMCAHQEAHQEAHwLAGQwAIMCAIMAAGQqAIMCAIMAAGYBAIMBAAFuAQABdAQAfAQA
-ZDIAgwIAgwAAdAsAaggAcAoAAXwCAGQNAGoCAG8WAAF0BAB8CwBkMgCDAgCDAAB0CwBqCQBvMgAB
-dAQAfAQAZDMAgwIAdAQAdAQAfAsAZDIAgwIAgwAAZCoAgwIAgwAAZgEAgwEAAW4BAAFkNAB9EQB0
-BQB0BAB8BABkNQCDAgBkNgBoAAAEZAMAfBEAAzyDAAGDAQBkBABqAgBwCgABfAIAZA0AagIAb7QA
-AXwCAGQNAGoCAG84AAF0BAB8BABkNQCDAgBkNgBoAAAEZAMAfBEAAzyDAAF9EgB0BAB8BABkNwCD
-AgB8EgCDAQABbgEAAWcAAH0TAHQEAHwLAGQ1AIMCAGQ2AGgAAARkAwB8EQADPIMAAX0TAHQFAHwT
-AIMBAGQEAGoEAG8xAAF0BAB8CwBkOACDAgBkOQB8EwCDAAF9FAB0BAB8BABkOgCDAgB8FACDAQB9
-FQBxowgBbgEAAXQEAHwEAGQ7AIMCAIMAAHQLAGoIAHAKAAF8AgBkDQBqAgBvFgABdAQAfAsAZDsA
-gwIAgwAAdAsAagkAbzIAAXQEAHwEAGQ8AIMCAHQEAHQEAHwLAGQ7AIMCAIMAAGQqAIMCAIMAAGYB
-AIMBAAFuAQABZD0AfRYAdAUAdAQAfAQAZDUAgwIAZDYAaAAABGQDAHwWAAM8gwABgwEAZAQAagIA
-cAoAAXwCAGQNAGoCAG+0AAF8AgBkDQBqAgBvOAABdAQAfAQAZDUAgwIAZDYAaAAABGQDAHwWAAM8
-gwABfRIAdAQAfAQAZDcAgwIAfBIAgwEAAW4BAAFnAAB9EwB0BAB8CwBkNQCDAgBkNgBoAAAEZAMA
-fBYAAzyDAAF9EwB0BQB8EwCDAQBkBABqBABvMQABdAQAfAsAZDgAgwIAZDkAfBMAgwABfRQAdAQA
-fAQAZDoAgwIAfBQAgwEAfRUAcQkKAW4BAAF0BAB8BABkPgCDAgB0BAB8CwBkKgCDAgCDAABmAQCD
-AQABdAQAfAQAZD8AgwIAgwAAAWQKAHQEAHQAAGQLAIMCAIMAAHwAAGRAAGYDABZ9CQB8AQBvCAAB
-dAsAU24mAAF0BAB0CAB0BAB0AABkQQCDAgBkQgCDAgBkQwCDAgB8CQCDAQABZAAAUyhEAAAATnMU
-AAAAU2FsZSBUcmFkZSBDb25kaXRpb25zFgAAAGdldFNwZWNpYWxpc2VWYWx1ZUxpc3RzCwAAAHBv
-cnRhbF90eXBlaQAAAABzDgAAAHBvcnRhbF9kb21haW5zcxMAAABzZWFyY2hQcmVkaWNhdGVMaXN0
-cwQAAAB0ZXN0cwMAAABsb2dzFQAAAHRyYWRlX2NvbmRpdGlvbl9saXN0LHMIAAAAJXMvJXM/JXNz
-DAAAAGFic29sdXRlX3VybHMpAAAAcG9ydGFsX3N0YXR1c19tZXNzYWdlPU5vK1RyYWRlK0NvbmRp
-dGlvbi5pAQAAAHMvAAAAcG9ydGFsX3N0YXR1c19tZXNzYWdlPVRvbyttYW55K1RyYWRlK0NvbmRp
-dGlvbi5zCQAAAGdldE9iamVjdHMPAAAAZ2V0Q2F0ZWdvcnlMaXN0cw8AAABnZXRSZWNlaXZlZERh
-dGVzDwAAAHNldFJlY2VpdmVkRGF0ZXMOAAAAZ2V0U291cmNlVmFsdWVzDQAAAHNldFNvdXJjZUxp
-c3RzFAAAAGdldFNvdXJjZVJlbGF0aXZlVXJscxUAAABnZXRTb3VyY2VTZWN0aW9uVmFsdWVzFAAA
-AHNldFNvdXJjZVNlY3Rpb25MaXN0cxsAAABnZXRTb3VyY2VTZWN0aW9uUmVsYXRpdmVVcmxzFgAA
-AGdldFNvdXJjZURlY2lzaW9uVmFsdWVzFQAAAHNldFNvdXJjZURlY2lzaW9uTGlzdHMcAAAAZ2V0
-U291cmNlRGVjaXNpb25SZWxhdGl2ZVVybHMcAAAAZ2V0U291cmNlQWRtaW5pc3RyYXRpb25WYWx1
-ZXMbAAAAc2V0U291cmNlQWRtaW5pc3RyYXRpb25MaXN0cyIAAABnZXRTb3VyY2VBZG1pbmlzdHJh
-dGlvblJlbGF0aXZlVXJscxUAAABnZXRTb3VyY2VQYXltZW50VmFsdWVzFAAAAHNldFNvdXJjZVBh
-eW1lbnRMaXN0cxsAAABnZXRTb3VyY2VQYXltZW50UmVsYXRpdmVVcmxzGgAAAGdldERlc3RpbmF0
-aW9uU2VjdGlvblZhbHVlcxkAAABzZXREZXN0aW5hdGlvblNlY3Rpb25MaXN0cyAAAABnZXREZXN0
-aW5hdGlvblNlY3Rpb25SZWxhdGl2ZVVybHMTAAAAZ2V0RGVzdGluYXRpb25WYWx1ZXMZAAAAZ2V0
-RGVzdGluYXRpb25SZWxhdGl2ZVVybHMSAAAAc2V0RGVzdGluYXRpb25MaXN0cx8AAABnZXREZXN0
-aW5hdGlvbkRlY2lzaW9uVmFsdWVMaXN0cxoAAABzZXREZXN0aW5hdGlvbkRlY2lzaW9uTGlzdHMO
-AAAAZ2V0UmVsYXRpdmVVcmxzIQAAAGdldERlc3RpbmF0aW9uQWRtaW5pc3RyYXRpb25WYWx1ZXMg
-AAAAc2V0RGVzdGluYXRpb25BZG1pbmlzdHJhdGlvbkxpc3RzGgAAAGdldERlc3RpbmF0aW9uUGF5
-bWVudFZhbHVlcxkAAABzZXREZXN0aW5hdGlvblBheW1lbnRMaXN0cyAAAABnZXREZXN0aW5hdGlv
-blBheW1lbnRSZWxhdGl2ZVVybHMVAAAAZ2V0UHJpY2VDdXJyZW5jeVZhbHVlcxQAAABzZXRQcmlj
-ZUN1cnJlbmN5TGlzdHMUAAAAZ2V0RGVsaXZlcnlNb2RlVmFsdWVzEwAAAHNldERlbGl2ZXJ5TW9k
-ZUxpc3RzEQAAAFBheW1lbnQgQ29uZGl0aW9ucwoAAABjb250ZW50SWRzcwYAAABmaWx0ZXJzEQAA
-AG1hbmFnZV9kZWxPYmplY3RzcxIAAABtYW5hZ2VfY29weU9iamVjdHNzAwAAAGlkc3MTAAAAbWFu
-YWdlX3Bhc3RlT2JqZWN0c3MQAAAAZ2V0SW5jb3Rlcm1WYWx1ZXMPAAAAc2V0SW5jb3Rlcm1MaXN0
-cwgAAABEaXNjb3VudHMRAAAAc2V0U3BlY2lhbGlzZUxpc3RzFgAAAHJlY3Vyc2l2ZVJlaW5kZXhP
-YmplY3RzJAAAAHBvcnRhbF9zdGF0dXNfbWVzc2FnZT1PcmRlcit1cGRhdGVkLnMHAAAAUkVRVUVT
-VHMIAAAAUkVTUE9OU0VzCAAAAHJlZGlyZWN0KBcAAABzBwAAAGNvbnRleHRzBQAAAG9yZGVycxQA
-AAB0cmFkZV9jb25kaXRpb25fbGlzdHMbAAAAdHJhZGVfY29uZGl0aW9uX3BvcnRhbF90eXBlcwkA
-AABfZ2V0YXR0cl9zAwAAAGxlbnMHAAAAZm9ybV9pZHMMAAAAcmVkaXJlY3RfdXJscwkAAABfZ2V0
-aXRlbV9zDwAAAHRyYWRlX2NvbmRpdGlvbnMKAAAAY2F0ZWdvcmllc3MEAAAATm9uZXMIAAAARGF0
-ZVRpbWVzBQAAAGZvcmNlcwkAAABfZ2V0aXRlcl9zBgAAAG9iamVjdHMdAAAAcGF5bWVudF9jb25k
-aXRpb25fcG9ydGFsX3R5cGVzCQAAAHRvX2RlbGV0ZXMHAAAAdG9fY29weXMJAAAAY29weV9kYXRh
-cwsAAABuZXdfaWRfbGlzdHMUAAAAZGlzY291bnRfcG9ydGFsX3R5cGVzCgAAAGJhdGNoX21vZGUo
-FwAAAHMHAAAAZm9ybV9pZHMKAAAAYmF0Y2hfbW9kZXMFAAAAZm9yY2VzBwAAAGNvbnRleHRzBQAA
-AG9yZGVycxQAAAB0cmFkZV9jb25kaXRpb25fbGlzdHMbAAAAdHJhZGVfY29uZGl0aW9uX3BvcnRh
-bF90eXBlcwkAAABfZ2V0YXR0cl9zAwAAAGxlbnMMAAAAcmVkaXJlY3RfdXJscwkAAABfZ2V0aXRl
-bV9zDwAAAHRyYWRlX2NvbmRpdGlvbnMKAAAAY2F0ZWdvcmllc3MEAAAATm9uZXMIAAAARGF0ZVRp
-bWVzCQAAAF9nZXRpdGVyX3MGAAAAb2JqZWN0cx0AAABwYXltZW50X2NvbmRpdGlvbl9wb3J0YWxf
-dHlwZXMJAAAAdG9fZGVsZXRlcwcAAAB0b19jb3B5cwkAAABjb3B5X2RhdGFzCwAAAG5ld19pZF9s
-aXN0cxQAAABkaXNjb3VudF9wb3J0YWxfdHlwZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u
-KXMhAAAAU2FsZU9yZGVyX2FwcGx5U2FsZVRyYWRlQ29uZGl0aW9uAQAAAHO2AAAAAAIGAQYCBgEb
-AhMBMAEXAhMBIwITASMDGwMSAhwBGgM/ASYCJgEZASYCJgEZASYCJgEZASYCJgEZASMDIwIcASMB
-HAEqAiMCHAEjARwBJwIsAh8BGQAJAScBHAEqAiMCHAEvARwBKgIjAhwBIwEcASoDJgEZATIDJgEZ
-AS8DBgE7AQ0BJAEUAQYBIQETARgBIAMmARkBLwMGATsBDQEkARQBBgEhARMBGAEgAyIBDQIfAwcB
-EQIoAQAAAHMhAAAAU2FsZU9yZGVyX2FwcGx5U2FsZVRyYWRlQ29uZGl0aW9uKAEAAABzIQAAAFNh
-bGVPcmRlcl9hcHBseVNhbGVUcmFkZUNvbmRpdGlvbigAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0
-aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml
index a1cb376b57..736deb94ce 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml
@@ -85,26 +85,9 @@ else:\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMBAAAACwAA
-AA8AAABLAAAAc/QAAABkAQBkAgBnAgB0AAB8AQCDAQBkAwA8ZAQAdAAAfAEAgwEAZAUAPGQGAHQA
-AHwBAIMBAGQHADxkCAB0AAB8AQCDAQBkCQA8dAIAfAEAZAoAgwIAdAMAdAIAdAIAdAQAZAsAgwIA
-ZAwAgwIAfAEAjQEAgwEAAXwAAGQNAGoCAG9TAAFnAAAEaQYAfQcAdAgAdAMAdAIAdAQAZA4AgwIA
-fAEAjQEAgwEARF0cAH0JAHwHAHQCAHwJAGQPAIMCAIMAAIMBAAFxpwB+BwB9CgB8CgBTbh0AAXQD
-AHQCAHQEAGQOAIMCAGQQAGQRAHwBAI0BAVNkAABTKBIAAABOcwoAAABPcmRlciBSdWxlcw0AAABE
-ZWxpdmVyeSBSdWxlcx0AAABwYXJlbnRfc3BlY2lhbGlzZV9wb3J0YWxfdHlwZXMKAAAAU2FsZSBP
-cmRlcnMXAAAAZXhwbGFuYXRpb25fcG9ydGFsX3R5cGVzEwAAAFNpbXVsYXRpb24gTW92ZW1lbnRz
-CwAAAHBvcnRhbF90eXBlcwkAAABjb25maXJtZWRzEAAAAHNpbXVsYXRpb25fc3RhdGVzBgAAAHVw
-ZGF0ZXMOAAAAcG9ydGFsX2NhdGFsb2dzDQAAAGJ1aWxkU1FMUXVlcnlpAAAAAHMVAAAAT3JkZXJf
-elNlbGVjdE1vdmVtZW50cwkAAABnZXRPYmplY3RzBQAAAHNyY19faQEAAAAoCwAAAHMHAAAAX3dy
-aXRlX3MCAAAAa3dzCQAAAF9nZXRhdHRyX3MHAAAAX2FwcGx5X3MHAAAAY29udGV4dHMFAAAAc3Jj
-X19zBgAAAGFwcGVuZHMIAAAAJGFwcGVuZDBzCQAAAF9nZXRpdGVyX3MBAAAAeHMNAAAAbW92ZW1l
-bnRfbGlzdCgLAAAAcwUAAABzcmNfX3MCAAAAa3dzBwAAAF93cml0ZV9zCQAAAF9nZXRhdHRyX3MH
-AAAAX2FwcGx5X3MHAAAAY29udGV4dHMGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGl0
-ZXJfcwEAAAB4cw0AAABtb3ZlbWVudF9saXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
-cxgAAABTYWxlT3JkZXJfc2VsZWN0TW92ZW1lbnQBAAAAcxIAAAAWARABEAETAisEDQEmACUCCAIo
-AQAAAHMYAAAAU2FsZU9yZGVyX3NlbGVjdE1vdmVtZW50KAEAAABzGAAAAFNhbGVPcmRlcl9zZWxl
-Y3RNb3ZlbWVudCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAA
-cwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
index 6cf7471d72..08d056dffd 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
@@ -90,24 +90,9 @@ packing_list.activate(after_method_id=(\'immediateReindexObject\',\'recursiveImm
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAKAAAAQwAA
-AHOjAAAAdAAAfQEAdAIAfAEAZAEAgwIAgwAAAXQCAHwBAGQCAIMCAIMAAH0DAHwDAGQDAGoCAG8v
-AAF0AgB0AgB8AQBkBACDAgBkBQCDAgB8AQBkBgBkBwBkCABkCQBkCgCDAgIBbgEAAXQCAHwBAGQL
-AIMCAIMAAAF0AgB0AgB8AQBkDACDAgBkDQBkDgBkDwBkEABmAwCDAAFkEQCDAgCDAAABZAAAUygS
-AAAATnMfAAAAUGFja2luZ0xpc3RfY29weU9yZGVyUHJvcGVydGllc3MSAAAAZ2V0U2ltdWxhdGlv
-blN0YXRlcwUAAABkcmFmdHMPAAAAcG9ydGFsX3dvcmtmbG93cwsAAABkb0FjdGlvbkZvcnMOAAAA
-Y29uZmlybV9hY3Rpb25zBQAAAHdmX2lkcxUAAABwYWNraW5nX2xpc3Rfd29ya2Zsb3dzBwAAAGNv
-bW1lbnRzHwAAAEluaXRpYWxpemVkIGJ5IERlbGl2ZXJ5IEJ1aWxkZXJzDQAAAHN0YXJ0QnVpbGRp
-bmdzCAAAAGFjdGl2YXRlcw8AAABhZnRlcl9tZXRob2RfaWRzFgAAAGltbWVkaWF0ZVJlaW5kZXhP
-YmplY3RzHwAAAHJlY3Vyc2l2ZUltbWVkaWF0ZVJlaW5kZXhPYmplY3RzEAAAAERlbGl2ZXJ5X2Nv
-bmZpcm1zFAAAAHVwZGF0ZUNhdXNhbGl0eVN0YXRlKAQAAABzBwAAAGNvbnRleHRzDAAAAHBhY2tp
-bmdfbGlzdHMJAAAAX2dldGF0dHJfcxIAAABwYWNraW5nX2xpc3Rfc3RhdGUoBAAAAHMHAAAAY29u
-dGV4dHMMAAAAcGFja2luZ19saXN0cwkAAABfZ2V0YXR0cl9zEgAAAHBhY2tpbmdfbGlzdF9zdGF0
-ZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMjAAAAU2FsZVBhY2tpbmdMaXN0X2NvcHlP
-cmRlclByb3BlcnRpZXMBAAAAcw4AAAAJAw0DEgITAQ8BHQYTAygBAAAAcyMAAABTYWxlUGFja2lu
-Z0xpc3RfY29weU9yZGVyUHJvcGVydGllcygBAAAAcyMAAABTYWxlUGFja2luZ0xpc3RfY29weU9y
-ZGVyUHJvcGVydGllcygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4B
-AAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInput.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInput.xml
index ee0e893fc3..82ca1521e8 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInput.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_fastInput.xml
@@ -185,84 +185,9 @@ context.REQUEST[ \'RESPONSE\' ].redirect(redirect_url)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAACwAAAEAAAABzKwAAAGQBAGUAAGQBAGQCAGQDAGQBAGQDAGUAAGQBAGQEAGQFAIQK
-AFoBAGQAAFMoBgAAAE5zAAAAAHMPAAAAb2JqZWN0X2V4Y2hhbmdlaQAAAABpAQAAAGMKAAAAMwAA
-AC0AAABLAAAAc8AEAABkAQBrAABsAQB9DAABdAIAfQ4AfAkAfQ8AaAAAfRAAaAAAfREAeEIBdAgA
-fAcAgwEARF00AX0TAHQLAHwTAGQCAIMCAH0VAHQLAHwTAGQDAIMCAH0WAHwWAG8JAQF0DgB0AgBk
-BACDAgB8FQCDAQB9GAB8GAB0EABqCQBv4wABdA4AfBgAZAUAgwIAgwAAfRoAfBoAdBAAagkAb8AA
-AXQOAHwYAGQGAIMCAIMAAHQSAHwRAIMBAHQOAHwaAGQHAIMCAIMAADx0DgB8GgBkBwCDAgCDAAB0
-DgB8EABkCACDAgCDAABqBgBvPgABdA4AdAsAfBAAdA4AfBoAZAcAgwIAgwAAgwIAZAkAgwIAdA4A
-fBgAZAoAgwIAgwAAfBYAZgIAgwEAAXFeAQF0DgB8GABkCgCDAgCDAAB8FgBmAgBnAQB0EgB8EACD
-AQB0DgB8GgBkBwCDAgCDAAA8cWIBAXFmAQFxMgABcTIAV3jTAnQIAHQTAHwEAIMBAIMBAERdvwJ9
-HQBkCwB0FgB8DwCDAQAXfR8AdA4AfA4AZAwAgwIAZA0AZA4AZA8AfB8AZBAAfA8AZBEAZBIAdBgA
-dA4AfA4AZBMAgwIAgwAAgwEAfA8AZgIAFmQUAHwFAGQVAHwGAIMABmEbAHwPAGQWADd9DwB4SgJ0
-CAB0DgB8EABkCACDAgCDAACDAQBEXTACfSIAaAAAfSMAZwAAfSQAeL0AdAgAdAsAfBAAfCIAgwIA
-gwEARF2mAHQIAAKDAQBcAgB9JQB9JgB4fgB0CAB8JQCDAQBEXXAAfScAfCcAfCQAagYADG9cAAF0
-DgB8JABkCQCDAgB8JwCDAQABdA4AfCcAZBcAgwIAZBgAgwEAfSgAdCMAfCgAgwEAZBkAagQAbx0A
-AWQWAHQSAHwjAIMBAHQLAHwoAGQZAIMCADxxwAIBcVACAXFQAld0DgB8IwBkCACDAgCDAAB9KgBx
-MAJXfCIAfSIAdBYAdA4AdBsAZBoAgwIAgwAAgwEAfSsAdA4AdBsAZAwAgwIAZA0AZBsAZA8AfCsA
-ZBQAfCIAZBwAdAsAfBEAfCIAgwIAZB0AfCQAgwAFfSwAeAQBdAgAdAsAfBAAfCIAgwIAgwEARF3t
-AHQIAAKDAQBcAgB9LQB9JgB8JQBnAABqAgBvGgABdA4AfCwAZB4AgwIAZB8AfCYAgwABAXFHAwFk
-IAB9LgB0KQB0DgB8LABkIQCDAgBkIgB8LgB8LQCMAQEMb40AAXQpAHQOAHwsAGQjAIMCAGQiAHwu
-AGQNAGQkAHwtAIwBAn0wAHQOAHwwAGQlAIMCAHwtAIMBAAF0DgB8MABkJgCDAgBkHwBnAQCDAQAB
-dA4AfDAAZCcAgwIAfC0AgwEAAXQOAHwwAGQoAIMCAHwqAIMBAAF0DgB8MABkHgCDAgBkHwB8JgCD
-AAEBcUcDAXFHA1dxCAJXcX0BV3QOAHQbAGQpAIMCAIMAAAF8DABkKgB8AgBkKwB8AwBkLAB8AABk
-LQB8CABkLgBkLwB8BAAWgwAFfTEAZDAAdA4AdAIAZDEAgwIAgwAAfDEAZgIAFn0yAHQOAHQLAHQO
-AHQCAGQyAIMCAGQzAIMCAGQ0AIMCAHwyAIMBAAFkAABTKDUAAABOKAEAAABzCgAAAG1ha2VfcXVl
-cnlzCwAAAGxpc3Rib3hfa2V5cxIAAABjb250YWluZXJfcXVhbnRpdHlzEgAAAHJlc3RyaWN0ZWRU
-cmF2ZXJzZXMQAAAAZ2V0UmVzb3VyY2VWYWx1ZXMPAAAAZ2V0UXVhbnRpdHlVbml0cw4AAABnZXRS
-ZWxhdGl2ZVVybHMEAAAAa2V5c3MGAAAAYXBwZW5kcxgAAABnZXRWYXJpYXRpb25DYXRlZ29yeUxp
-c3RzAQAAAGNzCgAAAG5ld0NvbnRlbnRzCwAAAHBvcnRhbF90eXBlcwkAAABDb250YWluZXJzBQAA
-AHRpdGxlcwkAAABpbnRfaW5kZXhzDQAAAHNlcmlhbF9udW1iZXJzCAAAACUwNmQlMDRkcwUAAABn
-ZXRJZHMIAAAAcmVzb3VyY2VzDAAAAGdyb3NzX3dlaWdodGkBAAAAcwUAAABzcGxpdHMBAAAAL2kA
-AAAAcw0AAABnZW5lcmF0ZU5ld0lkcw4AAABDb250YWluZXIgTGluZXMNAAAAcXVhbnRpdHlfdW5p
-dHMXAAAAdmFyaWF0aW9uX2NhdGVnb3J5X2xpc3RzBAAAAGVkaXRzCAAAAHF1YW50aXR5cwgAAABt
-b3ZlbWVudHMHAAAAaGFzQ2VsbHMHAAAAYmFzZV9pZHMHAAAAbmV3Q2VsbHMOAAAAQ29udGFpbmVy
-IENlbGxzDwAAAHNldENhdGVnb3J5TGlzdHMaAAAAc2V0TWFwcGVkVmFsdWVQcm9wZXJ0eUxpc3Rz
-IgAAAHNldE1lbWJlcnNoaXBDcml0ZXJpb25DYXRlZ29yeUxpc3RzJgAAAHNldE1lbWJlcnNoaXBD
-cml0ZXJpb25CYXNlQ2F0ZWdvcnlMaXN0cx8AAAByZWN1cnNpdmVJbW1lZGlhdGVSZWluZGV4T2Jq
-ZWN0cw4AAABzZWxlY3Rpb25fbmFtZXMPAAAAZGlhbG9nX2NhdGVnb3J5cwcAAABmb3JtX2lkcwoA
-AABjYW5jZWxfdXJscxUAAABwb3J0YWxfc3RhdHVzX21lc3NhZ2VzGAAAACVzIGNvbnRhaW5lcihz
-KSBjcmVhdGVkLnMjAAAAJXMvU2FsZVBhY2tpbmdMaXN0X2Zhc3RJbnB1dEZvcm0/JXNzDAAAAGFi
-c29sdXRlX3VybHMHAAAAUkVRVUVTVHMIAAAAUkVTUE9OU0VzCAAAAHJlZGlyZWN0KDEAAABzBwAA
-AFpUVXRpbHNzCgAAAG1ha2VfcXVlcnlzBwAAAGNvbnRleHRzCAAAAGRlbGl2ZXJ5cxgAAABuZXh0
-X2NvbnRhaW5lcl9pbnRfaW5kZXhzFQAAAG5leHRfY29udGFpbmVyX251bWJlcnMNAAAAZGVzaXJl
-ZF9saW5lc3MSAAAAcXVhbnRpdHlfdW5pdF9kaWN0cwkAAABfZ2V0aXRlcl9zBwAAAGxpc3Rib3hz
-CAAAAGxpc3RpdGVtcwkAAABfZ2V0aXRlbV9zFQAAAG1vdmVtZW50X3JlbGF0aXZlX3VybHMSAAAA
-Y29udGFpbmVyX3F1YW50aXR5cwkAAABfZ2V0YXR0cl9zCAAAAG1vdmVtZW50cwQAAABOb25lcwgA
-AAByZXNvdXJjZXMHAAAAX3dyaXRlX3MFAAAAcmFuZ2VzDwAAAGNvbnRhaW5lcl9jb3VudHMQAAAA
-Y29udGFpbmVyX251bWJlcnMDAAAAc3RycxAAAABuZXdfY29udGFpbmVyX2lkcwMAAABpbnRzDgAA
-AGNvbnRhaW5lcl90eXBlcwwAAABncm9zc193ZWlnaHRzCQAAAGNvbnRhaW5lcnMMAAAAcmVzb3Vy
-Y2VfdXJscyEAAABsaW5lX3ZhcmlhdGlvbl9iYXNlX2NhdGVnb3J5X2RpY3RzHAAAAGxpbmVfdmFy
-aWF0aW9uX2NhdGVnb3J5X2xpc3RzFwAAAHZhcmlhdGlvbl9jYXRlZ29yeV9saXN0cwgAAABxdWFu
-dGl0eXMOAAAAdmFyaWF0aW9uX2l0ZW1zHQAAAHZhcmlhdGlvbl9iYXNlX2NhdGVnb3J5X2l0ZW1z
-cwMAAABsZW5zIQAAAGxpbmVfdmFyaWF0aW9uX2Jhc2VfY2F0ZWdvcnlfbGlzdHMVAAAAbmV3X2Nv
-bnRhaW5lcl9saW5lX2lkcw4AAABjb250YWluZXJfbGluZXMIAAAAY2VsbF9rZXlzBwAAAGJhc2Vf
-aWRzBwAAAF9hcHBseV9zBAAAAGNlbGxzDgAAAHNlbGVjdGlvbl9uYW1lcw8AAABkaWFsb2dfY2F0
-ZWdvcnlzBwAAAGZvcm1faWRzCgAAAGNhbmNlbF91cmxzCgAAAHVybF9wYXJhbXNzDAAAAHJlZGly
-ZWN0X3VybCgzAAAAcwcAAABmb3JtX2lkcw8AAABzZWxlY3Rpb25faW5kZXhzDgAAAHNlbGVjdGlv
-bl9uYW1lcw8AAABkaWFsb2dfY2F0ZWdvcnlzDwAAAGNvbnRhaW5lcl9jb3VudHMOAAAAY29udGFp
-bmVyX3R5cGVzDAAAAGdyb3NzX3dlaWdodHMHAAAAbGlzdGJveHMKAAAAY2FuY2VsX3VybHMYAAAA
-bmV4dF9jb250YWluZXJfaW50X2luZGV4cwIAAABrd3MHAAAAWlRVdGlsc3MKAAAAbWFrZV9xdWVy
-eXMHAAAAY29udGV4dHMIAAAAZGVsaXZlcnlzFQAAAG5leHRfY29udGFpbmVyX251bWJlcnMNAAAA
-ZGVzaXJlZF9saW5lc3MSAAAAcXVhbnRpdHlfdW5pdF9kaWN0cwkAAABfZ2V0aXRlcl9zCAAAAGxp
-c3RpdGVtcwkAAABfZ2V0aXRlbV9zFQAAAG1vdmVtZW50X3JlbGF0aXZlX3VybHMSAAAAY29udGFp
-bmVyX3F1YW50aXR5cwkAAABfZ2V0YXR0cl9zCAAAAG1vdmVtZW50cwQAAABOb25lcwgAAAByZXNv
-dXJjZXMHAAAAX3dyaXRlX3MFAAAAcmFuZ2VzEAAAAGNvbnRhaW5lcl9udW1iZXJzAwAAAHN0cnMQ
-AAAAbmV3X2NvbnRhaW5lcl9pZHMDAAAAaW50cwkAAABjb250YWluZXJzDAAAAHJlc291cmNlX3Vy
-bHMhAAAAbGluZV92YXJpYXRpb25fYmFzZV9jYXRlZ29yeV9kaWN0cxwAAABsaW5lX3ZhcmlhdGlv
-bl9jYXRlZ29yeV9saXN0cxcAAAB2YXJpYXRpb25fY2F0ZWdvcnlfbGlzdHMIAAAAcXVhbnRpdHlz
-DgAAAHZhcmlhdGlvbl9pdGVtcx0AAAB2YXJpYXRpb25fYmFzZV9jYXRlZ29yeV9pdGVtc3MDAAAA
-bGVucyEAAABsaW5lX3ZhcmlhdGlvbl9iYXNlX2NhdGVnb3J5X2xpc3RzFQAAAG5ld19jb250YWlu
-ZXJfbGluZV9pZHMOAAAAY29udGFpbmVyX2xpbmVzCAAAAGNlbGxfa2V5cwcAAABiYXNlX2lkcwcA
-AABfYXBwbHlfcwQAAABjZWxscwoAAAB1cmxfcGFyYW1zcwwAAAByZWRpcmVjdF91cmwoAAAAACgA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzGQAAAFNhbGVQYWNraW5nTGlzdF9mYXN0SW5wdXQBAAAA
-c54AAAAAAw0CBgEGAgYBBgINAAYBDwEPAQcBFQENARIBDQEDASUBKwEbAQ8BDgIAAQ8BMgMTAAYC
-EAMVAgYBCQEVAQoBBgEJAwoDGQAGAwYBBgIWABMCDQAGAREBEAEVARMBJQIWAwYBGAEVAgYBCQEM
-AQkDFgATARABFwMGASABEgEJAgwCEwEWARMBCQEKASYEDQIMAQYBBgEJAgoCAwEiAigCAAAAcwQA
-AABOb25lcxkAAABTYWxlUGFja2luZ0xpc3RfZmFzdElucHV0KAIAAABzBAAAAE5vbmVzGQAAAFNh
-bGVQYWNraW5nTGlzdF9mYXN0SW5wdXQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAA
-ADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml
index bad49eb058..c936e60bdc 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml
@@ -72,16 +72,9 @@
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAGAAAATwAA
-AHMsAAAAdAAAdAEAZAEAgwIAZAIAZAMAZAQAZAUAZgMAZAYAZAcAZgEAgwACU2QAAFMoCAAAAE5z
-EQAAAGdlbmVyYXRlUHJlZGljYXRlcywAAABtdWx0aW1lbWJlcnNoaXBfY3JpdGVyaW9uX2Jhc2Vf
-Y2F0ZWdvcnlfbGlzdHMLAAAAZGVzdGluYXRpb25zEwAAAGRlc3RpbmF0aW9uX3NlY3Rpb25zBQAA
-AGdyb3VwcxcAAABjcml0ZXJpb25fcHJvcGVydHlfbGlzdHMKAAAAc3RhcnRfZGF0ZSgCAAAAcwkA
-AABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoBAAAAHMEAAAAYXJnc3MCAAAAa3dzCQAAAF9nZXRhdHRy
-X3MHAAAAY29udGV4dCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMeAAAAU2FsZVRyYWRl
-Q29uZGl0aW9uX2FzUHJlZGljYXRlAQAAAHMCAAAAHgEoAQAAAHMeAAAAU2FsZVRyYWRlQ29uZGl0
-aW9uX2FzUHJlZGljYXRlKAEAAABzHgAAAFNhbGVUcmFkZUNvbmRpdGlvbl9hc1ByZWRpY2F0ZSgA
-AAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml
index ca0cc95c36..786345020e 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_asPredicate.xml
@@ -72,15 +72,9 @@
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAGAAAATwAA
-AHMmAAAAdAAAdAEAZAEAgwIAZAIAZAMAZgEAZAQAZAUAZgEAgwACU2QAAFMoBgAAAE5zEQAAAGdl
-bmVyYXRlUHJlZGljYXRlcywAAABtdWx0aW1lbWJlcnNoaXBfY3JpdGVyaW9uX2Jhc2VfY2F0ZWdv
-cnlfbGlzdHMIAAAAcmVzb3VyY2VzFwAAAGNyaXRlcmlvbl9wcm9wZXJ0eV9saXN0cwoAAABzdGFy
-dF9kYXRlKAIAAABzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dCgEAAAAcwQAAABhcmdzcwIAAABr
-d3MJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
-cxYAAABTdXBwbHlMaW5lX2FzUHJlZGljYXRlAQAAAHMCAAAAGAEoAQAAAHMWAAAAU3VwcGx5TGlu
-ZV9hc1ByZWRpY2F0ZSgBAAAAcxYAAABTdXBwbHlMaW5lX2FzUHJlZGljYXRlKAAAAAAoAAAAAHMP
-AAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_getLocalPredicatePropertyDict%20.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_getLocalPredicatePropertyDict%20.xml
index 2e6078aa9d..3c42308298 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_getLocalPredicatePropertyDict%20.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyCell_getLocalPredicatePropertyDict%20.xml
@@ -71,15 +71,9 @@
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAAFAAAATwAA
-AHMdAAAAdAAAdAEAdAIAZAEAgwIAfAAAfAEAjgEAU2QAAFMoAgAAAE5zKAAAAFN1cHBseUxpbmVf
-Z2V0TG9jYWxQcmVkaWNhdGVQcm9wZXJ0eURpY3QoBQAAAHMHAAAAX2FwcGx5X3MJAAAAX2dldGF0
-dHJfcwcAAABjb250ZXh0cwQAAABhcmdzcwIAAABrdygFAAAAcwQAAABhcmdzcwIAAABrd3MHAAAA
-X2FwcGx5X3MJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQ
-eXRob24pcykAAABTdXBwbHlDZWxsX2dldExvY2FsUHJlZGljYXRlUHJvcGVydHlEaWN0IAEAAABz
-AAAAACgBAAAAcykAAABTdXBwbHlDZWxsX2dldExvY2FsUHJlZGljYXRlUHJvcGVydHlEaWN0ICgB
-AAAAcykAAABTdXBwbHlDZWxsX2dldExvY2FsUHJlZGljYXRlUHJvcGVydHlEaWN0ICgAAAAAKAAA
-AABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asCellRange.xml
index f87a0d1ead..73816abe2c 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asCellRange.xml
@@ -151,59 +151,9 @@ return cell_range\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAABQAAAEAAAABzGQAAAGQBAGQCAGQDAGQCAGQEAIQEAFoAAGQAAFMoBQAAAE5zBAAA
-AHBhdGhpAAAAAGkBAAAAYwQAAAAaAAAAIgAAAEsAAABz7wMAAGcAAH0FAGQBAH0GAHwDAGQBAGoC
-AG+SAAFkAgB9BgB0AwB0BABkAwCDAgBkBABkAQCDAAF9CQB0AwB0BABkAwCDAgCDAAB9CgBnAAAE
-aQcAfQwAdAkAfAoAgwEARF0hAH0OAHwOAHwJAGoHAG8OAAF8DAB8DgCDAQABcV0AAXFdAH4MAH0P
-AHwPAGcAAGoCAG8KAAFnAAB9EABxswEBfA8AZwEAfRAAbgkBAXwAAGQFAGoCAG8KAAFkAgB9BgBu
-AQABfAAAZAYAZAUAZgIAagYAb3oAAXQDAHQEAGQHAIMCAIMAAH0RAHwRAGcAAGoCAG9XAAF0AwB0
-AwB0BABkCACDAgCDAABkCQCDAgCDAAB0AwB0BABkCgCDAgCDAABqBgBvIgABdAMAdAMAdAQAZAgA
-gwIAgwAAZAcAgwIAgwAAfREAcUsBAXGDAQFuNQABZAsAdA8AfAAAdBAAZAwAgwEAZAAAhQIAgwIA
-Fn0UAHQDAHQEAGQNAIMCAHwUAIMBAH0RAGcAAARpBwB9DAB0CQB8EQCDAQBEXRMAfQ4AfAwAfA4A
-ZwEAgwEAAXGXAX4MAH0QAHiNAHQJAHwQAIMBAERdfwB9CgB8AQBkAQBqAgBvQQABdAMAfAUAZA4A
-gwIAdBMAZA8AhAAAdAMAdAQAZBAAgwIAZBEAfAoAZBIAfAIAZBMAZBQAgwADgwIAgwEAAXHAAQF0
-AwB8BQBkDgCDAgB0AwB0BABkFQCDAgBkEQB8CgBkEwBkFACDAAKDAQABccABV3wDAGQBAGoCAG8b
-AAF8BQBnAABqAwBvCgABZAEAfQYAcWsCAW4BAAF8BgBkAQBqAgBvMQEBfAAAZAYAagIAbwoAAWQW
-AH0WAG5XAAF0DwB8AAB0EABkDACDAQBkAACFAgCDAgB9FgBkFwB9FwB0AwB8FgBkGACDAgB8FwCD
-AQBvHwABdA8AfBYAdBAAfBcAgwEAZAAAhQIAgwIAfRYAbgEAAXQDAHQEAGQZAIMCAHwWAIMBAH0Y
-AHwBAGQBAGoCAG9PAAFnAAAEaQcAfQwAdAkAfBgAgwEARF0uAH0OAHwMAHQDAHwOAGQaAIMCAIMA
-AHQDAHwOAGQbAIMCAIMAAGYCAIMBAAFxGwN+DAB9GQBuOgABZwAABGkHAH0MAHQJAHwYAIMBAERd
-HAB9DgB8DAB0AwB8DgBkGgCDAgCDAACDAQABcWoDfgwAfRkAdAMAfAUAZBwAgwIAZAEAfBkAgwIA
-AW4BAAFnAAAEaQcAfQwAdAkAfAUAgwEARF0hAH0OAHwOAGcAAGoDAG8OAAF8DAB8DgCDAQABcb0D
-AXG9A34MAH0FAHwFAFNkAABTKB0AAABOaQEAAABpAAAAAHMhAAAAZ2V0VmFyaWF0aW9uUmFuZ2VC
-YXNlQ2F0ZWdvcnlMaXN0cxkAAABvbWl0X29wdGlvbl9iYXNlX2NhdGVnb3J5cwkAAAByZWZlcmVu
-Y2VzBAAAAHBhdGhzHQAAAGdldFBWYXJpYXRpb25CYXNlQ2F0ZWdvcnlMaXN0cwkAAABnZXRQYXJl
-bnRzDQAAAGdldFBvcnRhbFR5cGVzGQAAAGdldFBvcnRhbFJlc291cmNlVHlwZUxpc3RzHwAAACVz
-X3ZhcmlhdGlvbl9iYXNlX2NhdGVnb3J5X2xpc3RzBQAAAHBhdGhfcwsAAABnZXRQcm9wZXJ0eXMG
-AAAAYXBwZW5kYwEAAAACAAAABAAAAEMAAABzHAAAAHQAAHwAAGQBAIMCAHQAAHwAAGQCAIMCAGYC
-AFMoAwAAAE5pAQAAAGkAAAAAKAIAAABzCQAAAF9nZXRpdGVtX3MBAAAAeCgCAAAAcwEAAAB4cwkA
-AABfZ2V0aXRlbV8oAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuMjk+
-KgAAAHMAAAAAcyEAAABnZXRWYXJpYXRpb25SYW5nZUNhdGVnb3J5SXRlbUxpc3RzEgAAAGJhc2Vf
-Y2F0ZWdvcnlfbGlzdHMVAAAAZGlzcGxheV9iYXNlX2NhdGVnb3J5cwcAAABzb3J0X2lkcwIAAABp
-ZHMdAAAAZ2V0VmFyaWF0aW9uUmFuZ2VDYXRlZ29yeUxpc3RzCgAAAGJhc2VfcHJpY2VzCQAAAG9w
-dGlvbmFsX3MKAAAAc3RhcnRzd2l0aHMdAAAAZ2V0UXVhbnRpdHlQcmVkaWNhdGVWYWx1ZUxpc3Rz
-DgAAAGdldFJlbGF0aXZlVXJscwgAAABnZXRUaXRsZXMGAAAAaW5zZXJ0KBkAAABzCgAAAGNlbGxf
-cmFuZ2VzDQAAAGFkZF9wcmVkaWNhdGVzEAAAAG9wdGlvbl92YXJpYXRpb25zCQAAAF9nZXRhdHRy
-X3MHAAAAY29udGV4dHMcAAAAbm9fb3B0aW9uX2Jhc2VfY2F0ZWdvcnlfbGlzdHMSAAAAYmFzZV9j
-YXRlZ29yeV9saXN0cwYAAABhcHBlbmRzCAAAACRhcHBlbmQwcwkAAABfZ2V0aXRlcl9zAQAAAHhz
-GQAAAG9wdGlvbl9iYXNlX2NhdGVnb3J5X2xpc3RzFwAAAGJhc2VfY2F0ZWdvcnlfbGlzdF9saXN0
-cwcAAABiYXNlX2lkcxsAAABzZWxlY3RlZF9iYXNlX2NhdGVnb3J5X2xpc3RzCQAAAF9nZXRpdGVt
-X3MDAAAAbGVucwsAAABwcm9wZXJ0eV9pZHMJAAAAbWF0cml4Ym94cwMAAABtYXBzFQAAAGRpc3Bs
-YXlfYmFzZV9jYXRlZ29yeXMPAAAAcHJpY2VfcGFyYW1ldGVycxkAAABvcHRpb25fYmFzZV9pZF9i
-ZWdpbl93aXRocw4AAABwcmVkaWNhdGVfbGlzdHMIAAAAcHJlZF9pZHMoGgAAAHMHAAAAYmFzZV9p
-ZHMJAAAAbWF0cml4Ym94cxUAAABkaXNwbGF5X2Jhc2VfY2F0ZWdvcnlzEAAAAG9wdGlvbl92YXJp
-YXRpb25zAgAAAGt3cwoAAABjZWxsX3Jhbmdlcw0AAABhZGRfcHJlZGljYXRlcwkAAABfZ2V0YXR0
-cl9zBwAAAGNvbnRleHRzHAAAAG5vX29wdGlvbl9iYXNlX2NhdGVnb3J5X2xpc3RzEgAAAGJhc2Vf
-Y2F0ZWdvcnlfbGlzdHMGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGl0ZXJfcwEAAAB4
-cxkAAABvcHRpb25fYmFzZV9jYXRlZ29yeV9saXN0cxcAAABiYXNlX2NhdGVnb3J5X2xpc3RfbGlz
-dHMbAAAAc2VsZWN0ZWRfYmFzZV9jYXRlZ29yeV9saXN0cwkAAABfZ2V0aXRlbV9zAwAAAGxlbnML
-AAAAcHJvcGVydHlfaWRzAwAAAG1hcHMPAAAAcHJpY2VfcGFyYW1ldGVycxkAAABvcHRpb25fYmFz
-ZV9pZF9iZWdpbl93aXRocw4AAABwcmVkaWNhdGVfbGlzdHMIAAAAcHJlZF9pZHMoAAAAACgAAAAA
-cw8AAABTY3JpcHQgKFB5dGhvbilzFgAAAFN1cHBseUxpbmVfYXNDZWxsUmFuZ2UBAAAAc2wAAAAG
-AQYEDQIGARgCEgEUAAYBJAENAQoCDQMNAQoCEwISAQ0CHgETASoDHwEVARQAHAMNAAYBEAMVAQwB
-BgEaAwwBDAEUAw0BDQEOAg0DDQIKAhsBCQETAR8BFQENARQAOwIUACgCFwIUAAYAJAEoAQAAAHMW
-AAAAU3VwcGx5TGluZV9hc0NlbGxSYW5nZSgBAAAAcxYAAABTdXBwbHlMaW5lX2FzQ2VsbFJhbmdl
-KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml
index eeae9675f8..8f80530952 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_asPredicate.xml
@@ -72,15 +72,9 @@
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAGAAAATwAA
-AHMmAAAAdAAAdAEAZAEAgwIAZAIAZAMAZgEAZAQAZAUAZgEAgwACU2QAAFMoBgAAAE5zEQAAAGdl
-bmVyYXRlUHJlZGljYXRlcywAAABtdWx0aW1lbWJlcnNoaXBfY3JpdGVyaW9uX2Jhc2VfY2F0ZWdv
-cnlfbGlzdHMIAAAAcmVzb3VyY2VzFwAAAGNyaXRlcmlvbl9wcm9wZXJ0eV9saXN0cwoAAABzdGFy
-dF9kYXRlKAIAAABzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dCgEAAAAcwQAAABhcmdzcwIAAABr
-d3MJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
-cxYAAABTdXBwbHlMaW5lX2FzUHJlZGljYXRlAQAAAHMCAAAAGAEoAQAAAHMWAAAAU3VwcGx5TGlu
-ZV9hc1ByZWRpY2F0ZSgBAAAAcxYAAABTdXBwbHlMaW5lX2FzUHJlZGljYXRlKAAAAAAoAAAAAHMP
-AAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_init.xml
index 443542e716..7e859b85fd 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_init.xml
@@ -80,18 +80,9 @@ context.setMappedValuePropertyList([\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAMAAAALAAAASwAA
-AHN6AAAAdAAAdAAAdAEAZAEAgwIAgwAAZAIAgwIAgwAAdAAAdAEAZAMAgwIAgwAAagYAbyMAAXQA
-AHQBAGQEAIMCAHQAAHQBAGQBAIMCAIMAAIMBAAFuAQABdAAAdAEAZAUAgwIAZAYAZAcAZAgAZAkA
-ZAoAZwUAgwEAAWQAAFMoCwAAAE5zCQAAAGdldFBhcmVudHMNAAAAZ2V0UG9ydGFsVHlwZXMZAAAA
-Z2V0UG9ydGFsUmVzb3VyY2VUeXBlTGlzdHMQAAAAc2V0UmVzb3VyY2VWYWx1ZXMaAAAAc2V0TWFw
-cGVkVmFsdWVQcm9wZXJ0eUxpc3RzCgAAAGJhc2VfcHJpY2VzEAAAAGFkZGl0aW9uYWxfcHJpY2Vz
-DgAAAGRpc2NvdW50X3JhdGlvcxgAAABleGNsdXNpdmVfZGlzY291bnRfcmF0aW9zDwAAAHN1cmNo
-YXJnZV9yYXRpbygCAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoAwAAAHMCAAAAa3dzCQAA
-AF9nZXRhdHRyX3MHAAAAY29udGV4dCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMPAAAA
-U3VwcGx5TGluZV9pbml0AQAAAHMIAAAAAAEeARYBIwIoAQAAAHMPAAAAU3VwcGx5TGluZV9pbml0
-KAEAAABzDwAAAFN1cHBseUxpbmVfaW5pdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMI
-AAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml
index 9f00234c9c..3280b007fd 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml
@@ -117,39 +117,9 @@ return due_date\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAwAAAAQAAAAQwAA
-AHM9AgAAZAEAawAAbAAAfQAAAWQCAIQAAH0BAGQDAIQAAH0BAGgAAAR0AgB0AwB0BABkBACDAgAD
-PARkBQB0AwB0BABkBACDAgADPARkBgB0AwB0BABkBACDAgADPARkBwB0AwB0BABkBACDAgADPH0F
-AHwBAGQIAHQDAHQEAGQJAIMCAIMAABaDAQABdAMAfAUAZAoAgwIAdAMAdAQAZAkAgwIAgwAAdAMA
-dAQAZAQAgwIAgwIAgwAAfQYAfAYAdAMAdAQAZAsAgwIAZAwAgwEAN30GAHQDAHQEAGQNAIMCAIMA
-AH0HAHwBAGQOAHwHABaDAQABdAMAdAQAZAsAgwIAgwAAfQgAfAEAZA8AfAgAFoMBAAF0AwB0BABk
-EACDAgCDAAB9CQB8AQBkEQB8CQAWgwEAAXwHAG+PAAFkDAB9CgB0AwB8BgBkEgCDAgCDAAB9CwB4
-LAB8CwB0AwB8BgB8CgAXZBIAgwIAgwAAagIAbw4AAXwKAGQTADd9CgBxUgEBV3wGAHwKABdkEwAY
-fQYAfAgAdAIAagMAbw4AAXwGAHwIADd9BgBuAQABfAkAdAIAagMAbw4AAXwGAHwJADd9BgBxNQIB
-bnAAAXwJAHQCAGQUAGQMAGcDAGoHAG9ZAAFkDAB9CgB0AwB8BgBkEgCDAgCDAAB9CwB4LAB8CwB0
-AwB8BgB8CgAXZBIAgwIAgwAAagIAbw4AAXwKAGQTADh9CgBx9wEBV3wGAHwKABd8CQAXfQYAbgEA
-AXwGAFNkAABTKBUAAABOKAEAAABzCAAAAERhdGVUaW1lYwEAAAADAAAAAwAAAEMAAABzFgAAAHQA
-AHQBAGQBAIMCAGQCAHwAAIMCAFMoAwAAAE5zAwAAAGxvZ3MZAAAAVHJhZGVDb25kaXRpb25fZ2V0
-RHVlRGF0ZSgDAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzAwAAAG1zZygDAAAAcwMAAABt
-c2dzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u
-KXMLAAAAPGxhbWJkYS4yNT4EAAAAcwAAAABjAQAAAAIAAAABAAAAQwAAAHMEAAAAdAAAUygBAAAA
-TigBAAAAcwQAAABOb25lKAIAAABzAwAAAG1zZ3MEAAAATm9uZSgAAAAAKAAAAABzDwAAAFNjcmlw
-dCAoUHl0aG9uKXMLAAAAPGxhbWJkYS4yNj4FAAAAcwAAAABzDAAAAGdldFN0YXJ0RGF0ZXMHAAAA
-aW52b2ljZXMFAAAAb3JkZXJzDAAAAHBhY2tpbmcgbGlzdHMfAAAAY29udGV4dC5nZXRUcmFkZURh
-dGVJZCgpID0+ICVzIHMcAAAAZ2V0UGF5bWVudENvbmRpdGlvblRyYWRlRGF0ZXMDAAAAZ2V0cx4A
-AABnZXRQYXltZW50Q29uZGl0aW9uUGF5bWVudFRlcm1pAAAAAHMkAAAAZ2V0UGF5bWVudENvbmRp
-dGlvblBheW1lbnRFbmRPZk1vbnRocwkAAABwb2VtIDogJXNzBwAAAHB0IDogJXNzKAAAAGdldFBh
-eW1lbnRDb25kaXRpb25QYXltZW50QWRkaXRpb25hbFRlcm1zCAAAAHBhdCA6ICVzcwUAAABtb250
-aGkBAAAAcwAAAAAoDAAAAHMIAAAARGF0ZVRpbWVzAwAAAExPR3MEAAAATm9uZXMJAAAAX2dldGF0
-dHJfcwcAAABjb250ZXh0cwQAAABjYXNlcwgAAABkdWVfZGF0ZXMEAAAAcGVvbXMCAAAAcHRzAwAA
-AHBhdHMBAAAAaXMFAAAAbW9udGgoDAAAAHMIAAAARGF0ZVRpbWVzAwAAAExPR3MEAAAATm9uZXMJ
-AAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwQAAABjYXNlcwgAAABkdWVfZGF0ZXMEAAAAcGVvbXMC
-AAAAcHRzAwAAAHBhdHMBAAAAaXMFAAAAbW9udGgoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhv
-bilzGQAAAFRyYWRlQ29uZGl0aW9uX2dldER1ZURhdGUBAAAAc0gAAAAAAg0BCQEJAgQBGAESARIB
-DgIaATABGQISAQ4BEgEOARIBDgIHAQYBEgEDAB0BDwEOAQ0BDgENARIDFgEGARIBAwAdAQ8BEgIo
-AQAAAHMZAAAAVHJhZGVDb25kaXRpb25fZ2V0RHVlRGF0ZSgBAAAAcxkAAABUcmFkZUNvbmRpdGlv
-bl9nZXREdWVEYXRlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEA
-AABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getLocalPredicatePropertyDict.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getLocalPredicatePropertyDict.xml
index ed41510322..e1154905a0 100755
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getLocalPredicatePropertyDict.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getLocalPredicatePropertyDict.xml
@@ -74,19 +74,9 @@ return  property_dict\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAHAAAATwAA
-AHNGAAAAaAAAfQIAZAEAZAIAZAMAZAQAZAUAZAYAZgYAdAEAfAIAgwEAZAcAPGQIAGQJAGYCAHQB
-AHwCAIMBAGQKADx8AgBTZAAAUygLAAAATnMIAAAAcmVzb3VyY2VzBgAAAHNvdXJjZXMLAAAAZGVz
-dGluYXRpb25zBQAAAGdyb3Vwcw4AAABzb3VyY2Vfc2VjdGlvbnMTAAAAZGVzdGluYXRpb25fc2Vj
-dGlvbnMsAAAAbXVsdGltZW1iZXJzaGlwX2NyaXRlcmlvbl9iYXNlX2NhdGVnb3J5X2xpc3RzCgAA
-AHN0YXJ0X2RhdGVzCQAAAHN0b3BfZGF0ZXMXAAAAY3JpdGVyaW9uX3Byb3BlcnR5X2xpc3QoAgAA
-AHMNAAAAcHJvcGVydHlfZGljdHMHAAAAX3dyaXRlXygEAAAAcwQAAABhcmdzcwIAAABrd3MNAAAA
-cHJvcGVydHlfZGljdHMHAAAAX3dyaXRlXygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMw
-AAAAU2FsZVRyYWRlQ29uZGl0aW9uX2dldExvY2FsUHJlZGljYXRlUHJvcGVydHlEaWN0AQAAAHMG
-AAAABgEiARYBKAEAAABzMAAAAFNhbGVUcmFkZUNvbmRpdGlvbl9nZXRMb2NhbFByZWRpY2F0ZVBy
-b3BlcnR5RGljdCgBAAAAczAAAABTYWxlVHJhZGVDb25kaXRpb25fZ2V0TG9jYWxQcmVkaWNhdGVQ
-cm9wZXJ0eURpY3QoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAA
-AHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
index cc4794c5ea..97535f7a17 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
@@ -72,14 +72,9 @@ sci[\'object\'].getParent().edit()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAMAAAAGAAAAQwAA
-AHMpAAAAdAAAdAAAdAEAfAAAZAEAgwIAZAIAgwIAgwAAZAMAgwIAgwAAAWQAAFMoBAAAAE5zBgAA
-AG9iamVjdHMJAAAAZ2V0UGFyZW50cwQAAABlZGl0KAMAAABzCQAAAF9nZXRhdHRyX3MJAAAAX2dl
-dGl0ZW1fcwMAAABzY2koAwAAAHMDAAAAc2NpcwkAAABfZ2V0YXR0cl9zCQAAAF9nZXRpdGVtXygA
-AAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMdAAAARGVsaXZlcnlDZWxsX1VwZGF0ZVNpbXVs
-YXRpb24BAAAAcwIAAAAJASgBAAAAcx0AAABEZWxpdmVyeUNlbGxfVXBkYXRlU2ltdWxhdGlvbigB
-AAAAcx0AAABEZWxpdmVyeUNlbGxfVXBkYXRlU2ltdWxhdGlvbigAAAAAKAAAAABzDwAAAFNjcmlw
-dCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
index f5df12c5dd..b50615705d 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
@@ -72,14 +72,9 @@ sci[\'object\'].getParent().edit()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAMAAAAGAAAAQwAA
-AHMpAAAAdAAAdAAAdAEAfAAAZAEAgwIAZAIAgwIAgwAAZAMAgwIAgwAAAWQAAFMoBAAAAE5zBgAA
-AG9iamVjdHMJAAAAZ2V0UGFyZW50cwQAAABlZGl0KAMAAABzCQAAAF9nZXRhdHRyX3MJAAAAX2dl
-dGl0ZW1fcwMAAABzY2koAwAAAHMDAAAAc2NpcwkAAABfZ2V0YXR0cl9zCQAAAF9nZXRpdGVtXygA
-AAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMcAAAASW52b2ljZUxpbmVfVXBkYXRlU2ltdWxh
-dGlvbgEAAABzAgAAAAkBKAEAAABzHAAAAEludm9pY2VMaW5lX1VwZGF0ZVNpbXVsYXRpb24oAQAA
-AHMcAAAASW52b2ljZUxpbmVfVXBkYXRlU2ltdWxhdGlvbigAAAAAKAAAAABzDwAAAFNjcmlwdCAo
-UHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
index fff0823cb3..7aff796991 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
@@ -99,30 +99,9 @@ LOG(\'END\')\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAgAAAAPAAAAAwAA
-AHOsAAAAdAAAfAAAZAEAgwIAiQAAhwAAZAIAhgAAfQMAZAMAhAAAfQMAfAMAZAQAgwEAAXhtAHQE
-AHQFAIgAAGQFAIMCAIMAAIMBAERdUwB9BgB4SgB0BAB0BQB8BgBkBgCDAgCDAACDAQBEXTAAfQcA
-dAUAfAcAZAcAgwIAgwAAAXwDAGQIAHQFAHwHAGQJAIMCAIMAABaDAQABcWYAV3FHAFd8AwBkCgCD
-AQABZAAAUygLAAAATnMGAAAAb2JqZWN0YwEAAAADAAAABQAAAAMAAABzJgAAAHQAAIgAAGQBAIMC
-AGQCAHQAAIgAAGQDAIMCAIMAABZ8AACDAgBTKAQAAABOcwMAAABsb2dzRgAAAGRlbGl2ZXJ5X2Vk
-aXRfd29ya2Zsb3cuRGVsaXZlcnlfUmVpbmRleFJlbGF0ZWRTaW11bGF0aW9uTW92ZW1lbnQgKCVz
-KQpzBwAAAGdldFBhdGgoAwAAAHMJAAAAX2dldGF0dHJfcwgAAABkZWxpdmVyeXMDAAAAbXNnKAMA
-AABzAwAAAG1zZ3MJAAAAX2dldGF0dHJfcwgAAABkZWxpdmVyeSgBAAAAcwgAAABkZWxpdmVyeSgA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuOD4TAAAAcwAAAABjAQAAAAIAAAAB
-AAAAQwAAAHMEAAAAdAAAUygBAAAATigBAAAAcwQAAABOb25lKAIAAABzAwAAAG1zZ3MEAAAATm9u
-ZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMKAAAAPGxhbWJkYS45PhQAAABzAAAAAHMF
-AAAAQkVHSU5zDwAAAGdldE1vdmVtZW50TGlzdHMbAAAAZ2V0RGVsaXZlcnlSZWxhdGVkVmFsdWVM
-aXN0cxYAAAByZWN1cnNpdmVSZWluZGV4T2JqZWN0cxEAAAByZWluZGV4aW5nIFNNIEAlc3MHAAAA
-Z2V0UGF0aHMDAAAARU5EKAgAAABzCQAAAF9nZXRpdGVtX3MDAAAAc2NpcwgAAABkZWxpdmVyeXMD
-AAAATE9HcwkAAABfZ2V0aXRlcl9zCQAAAF9nZXRhdHRyX3MIAAAAbW92ZW1lbnRzEwAAAHNpbXVs
-YXRpb25fbW92ZW1lbnQoCAAAAHMDAAAAc2NpcwkAAABfZ2V0aXRlbV9zCAAAAGRlbGl2ZXJ5cwMA
-AABMT0dzCQAAAF9nZXRpdGVyX3MJAAAAX2dldGF0dHJfcwgAAABtb3ZlbWVudHMTAAAAc2ltdWxh
-dGlvbl9tb3ZlbWVudCgAAAAAKAEAAABzCAAAAGRlbGl2ZXJ5cw8AAABTY3JpcHQgKFB5dGhvbilz
-KQAAAERlbGl2ZXJ5X1JlaW5kZXhSZWxhdGVkU2ltdWxhdGlvbk1vdmVtZW50AQAAAHMWAAAAABEP
-AQwBCQIKAhkABgEZAAkBDQEiAigBAAAAcykAAABEZWxpdmVyeV9SZWluZGV4UmVsYXRlZFNpbXVs
-YXRpb25Nb3ZlbWVudCgBAAAAcykAAABEZWxpdmVyeV9SZWluZGV4UmVsYXRlZFNpbXVsYXRpb25N
-b3ZlbWVudCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAA
-AAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
index 94668e0d8e..a061eed7ea 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
@@ -104,35 +104,9 @@ LOG(\'END\')\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAgAAAALAAAAAwAA
-AHP1AAAAdAAAfAAAZAEAgwIAiQAAdAMAiAAAZAIAgwIAgwAAfQQAdAMAfAAAZAMAgwIAgwAAfQUA
-hwAAZAQAhgAAfQYAZAUAhAAAfQYAfAYAZAYAgwEAAWgAAARkBwBkCAADPARkCQBkCAADPARkCgBk
-CAADPARkCwBkDAADPARkDQBkDAADPH0HAHQDAHwHAGQOAIMCAHwEAIMBAG8+AAF0AwB0AwCIAABk
-DwCDAgBkEABkEQBkEgBkEwBnAwCDAAFkFACDAgBkFQB0AAB8BwB8BACDAgCDAAEBbg8AAXwGAGQW
-AHwEABaDAQABfAYAZBcAgwEAAWQAAFMoGAAAAE5zBgAAAG9iamVjdHMNAAAAZ2V0UG9ydGFsVHlw
-ZXMJAAAAZ2V0UG9ydGFsYwEAAAADAAAABQAAAAMAAABzJgAAAHQAAIgAAGQBAIMCAGQCAHQAAIgA
-AGQDAIMCAIMAABZ8AACDAgBTKAQAAABOcwMAAABsb2dzNgAAAGRlbGl2ZXJ5X2VkaXRfd29ya2Zs
-b3cuRGVsaXZlcnlfVXBkYXRlU2ltdWxhdGlvbiAoJXMpCnMHAAAAZ2V0UGF0aCgDAAAAcwkAAABf
-Z2V0YXR0cl9zCAAAAGRlbGl2ZXJ5cwMAAABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9z
-CAAAAGRlbGl2ZXJ5KAEAAABzCAAAAGRlbGl2ZXJ5KAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMK
-AAAAPGxhbWJkYS40PgsAAABzAAAAAGMBAAAAAgAAAAEAAABDAAAAcwQAAAB0AABTKAEAAABOKAEA
-AABzBAAAAE5vbmUoAgAAAHMDAAAAbXNncwQAAABOb25lKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQ
-eXRob24pcwoAAAA8bGFtYmRhLjU+DAAAAHMAAAAAcwUAAABCRUdJTnMYAAAAU2FsZSBJbnZvaWNl
-IFRyYW5zYWN0aW9ucxQAAABkZWZhdWx0X2ludm9pY2VfcnVsZXMVAAAAUGF5IFNoZWV0IFRyYW5z
-YWN0aW9ucxwAAABQdXJjaGFzZSBJbnZvaWNlIFRyYW5zYWN0aW9ucxEAAABTYWxlIFBhY2tpbmcg
-TGlzdHMVAAAAZGVmYXVsdF9kZWxpdmVyeV9ydWxlcxUAAABQdXJjaGFzZSBQYWNraW5nIExpc3Rz
-BwAAAGhhc19rZXlzCAAAAGFjdGl2YXRlcw8AAABhZnRlcl9tZXRob2RfaWRzFgAAAGltbWVkaWF0
-ZVJlaW5kZXhPYmplY3RzHwAAAHJlY3Vyc2l2ZUltbWVkaWF0ZVJlaW5kZXhPYmplY3RzBgAAAGV4
-cGFuZHMRAAAAdXBkYXRlQXBwbGllZFJ1bGVzBwAAAHJ1bGVfaWRzNgAAAG5vIHJ1bGVfaWQgZm9y
-ICVzLCBkb24ndCBrbm93IGhvdyB0byB1cGRhdGVBcHBsaWVkUnVsZXMDAAAARU5EKAgAAABzCQAA
-AF9nZXRpdGVtX3MDAAAAc2NpcwgAAABkZWxpdmVyeXMJAAAAX2dldGF0dHJfcxQAAABkZWxpdmVy
-eV9wb3J0YWxfdHlwZXMGAAAAcG9ydGFscwMAAABMT0dzDQAAAHJ1bGVfYnlfcHR5cGUoCAAAAHMD
-AAAAc2NpcwkAAABfZ2V0aXRlbV9zCAAAAGRlbGl2ZXJ5cwkAAABfZ2V0YXR0cl9zFAAAAGRlbGl2
-ZXJ5X3BvcnRhbF90eXBlcwYAAABwb3J0YWxzAwAAAExPR3MNAAAAcnVsZV9ieV9wdHlwZSgAAAAA
-KAEAAABzCAAAAGRlbGl2ZXJ5cw8AAABTY3JpcHQgKFB5dGhvbilzGQAAAERlbGl2ZXJ5X1VwZGF0
-ZVNpbXVsYXRpb24BAAAAcxoAAAAABw8BEgESAQwBCQIKAzYIGQEMARsDEQIOAigBAAAAcxkAAABE
-ZWxpdmVyeV9VcGRhdGVTaW11bGF0aW9uKAEAAABzGQAAAERlbGl2ZXJ5X1VwZGF0ZVNpbXVsYXRp
-b24oAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_interaction_workflow/scripts/Order_updateAppliedRule.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_interaction_workflow/scripts/Order_updateAppliedRule.xml
index 0b6469242b..e8da5a698c 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_interaction_workflow/scripts/Order_updateAppliedRule.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_interaction_workflow/scripts/Order_updateAppliedRule.xml
@@ -74,16 +74,9 @@ if order.getSimulationState() in order.getPortalPlannedOrderStateList():\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAMAAAAGAAAAQwAA
-AHNSAAAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAgwAAdAAAfAIAZAMAgwIAgwAAagYAbxoA
-AXQAAHwCAGQEAIMCAGQFAGQGAIMAAQFuAQABZAAAUygHAAAATnMGAAAAb2JqZWN0cxIAAABnZXRT
-aW11bGF0aW9uU3RhdGVzHgAAAGdldFBvcnRhbFBsYW5uZWRPcmRlclN0YXRlTGlzdHMRAAAAdXBk
-YXRlQXBwbGllZFJ1bGVzBwAAAHJ1bGVfaWRzCgAAAG9yZGVyX3J1bGUoAwAAAHMJAAAAX2dldGF0
-dHJfcwwAAABzdGF0ZV9jaGFuZ2VzBQAAAG9yZGVyKAMAAABzDAAAAHN0YXRlX2NoYW5nZXMJAAAA
-X2dldGF0dHJfcwUAAABvcmRlcigAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMXAAAAT3Jk
-ZXJfdXBkYXRlQXBwbGllZFJ1bGUBAAAAcwQAAAAPAigBKAEAAABzFwAAAE9yZGVyX3VwZGF0ZUFw
-cGxpZWRSdWxlKAEAAABzFwAAAE9yZGVyX3VwZGF0ZUFwcGxpZWRSdWxlKAAAAAAoAAAAAHMPAAAA
-U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_appliedToRelatedMovement.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_appliedToRelatedMovement.xml
index dd541dc9ef..8237a30436 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_appliedToRelatedMovement.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_appliedToRelatedMovement.xml
@@ -73,15 +73,9 @@ order.applyToOrderRelatedMovement(method_id=\'expand\')\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAMAAAAEAAAAQwAA
-AHMpAAAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAZAMAZAQAgwABAWQAAFMoBQAAAE5zBgAA
-AG9iamVjdHMbAAAAYXBwbHlUb09yZGVyUmVsYXRlZE1vdmVtZW50cwkAAABtZXRob2RfaWRzBgAA
-AGV4cGFuZCgDAAAAcwkAAABfZ2V0YXR0cl9zDAAAAHN0YXRlX2NoYW5nZXMFAAAAb3JkZXIoAwAA
-AHMMAAAAc3RhdGVfY2hhbmdlcwkAAABfZ2V0YXR0cl9zBQAAAG9yZGVyKAAAAAAoAAAAAHMPAAAA
-U2NyaXB0IChQeXRob24pcx4AAABPcmRlcl9hcHBsaWVkVG9SZWxhdGVkTW92ZW1lbnQBAAAAcwIA
-AAASAigBAAAAcx4AAABPcmRlcl9hcHBsaWVkVG9SZWxhdGVkTW92ZW1lbnQoAQAAAHMeAAAAT3Jk
-ZXJfYXBwbGllZFRvUmVsYXRlZE1vdmVtZW50KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
-cwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
index be98c3592d..b27eae2738 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_buildPackingList.xml
@@ -85,28 +85,9 @@ delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(expl
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAgAAAAOAAAAQwAA
-AHMpAQAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAgwAAZAMAF30DAHQAAHwCAGQCAIMCAIMA
-AGQEABd9BABoAAAEZAUAfAQAAzwEZAYAZAcAAzx9BQB0AAB0AAB8AgBkCACDAgBkBQB8BABkCQB8
-AwCDAAJkCgCDAgBkCwBkDABkDQB8BQCDAAIBdAAAfAIAZA4AgwIAgwAAfQYAfAYAZA8AagIAbxwA
-AXQAAHQAAHwCAGQQAIMCAGQRAIMCAH0HAG4qAAF8BgBkEgBqAgBvHAABdAAAdAAAfAIAZBAAgwIA
-ZBMAgwIAfQcAbgEAAXQAAHQAAHwHAGQIAIMCAGQUAGQVAGQJAHwEAIMAAmQWAIMCAGQXAHQAAHwC
-AGQYAIMCAIMAAIMAAQFkAABTKBkAAABOcwYAAABvYmplY3RzBwAAAGdldFBhdGhzFwAAAF9maXJz
-dFVwZGF0ZUFwcGxpZWRSdWxlcwcAAABfZXhwYW5kcwMAAAB0YWdzCAAAAHByaW9yaXR5aQMAAABz
-CAAAAGFjdGl2YXRlcwkAAABhZnRlcl90YWdzEQAAAHVwZGF0ZUFwcGxpZWRSdWxlcwcAAABydWxl
-X2lkcxIAAABkZWZhdWx0X29yZGVyX3J1bGVzCwAAAGFjdGl2YXRlX2t3cw0AAABnZXRQb3J0YWxU
-eXBlcwoAAABTYWxlIE9yZGVycxEAAABwb3J0YWxfZGVsaXZlcmllc3MZAAAAc2FsZV9wYWNraW5n
-X2xpc3RfYnVpbGRlcnMOAAAAUHVyY2hhc2UgT3JkZXJzHQAAAHB1cmNoYXNlX3BhY2tpbmdfbGlz
-dF9idWlsZGVycwgAAABhY3Rpdml0eXMIAAAAU1FMUXVldWVzBQAAAGJ1aWxkcw8AAABleHBsYW5h
-dGlvbl91aWRzBgAAAGdldFVpZCgIAAAAcwkAAABfZ2V0YXR0cl9zDAAAAHN0YXRlX2NoYW5nZXMF
-AAAAb3JkZXJzDAAAAHByZXZpb3VzX3RhZ3MKAAAAZXhwYW5kX3RhZ3MLAAAAYWN0aXZhdGVfa3dz
-EQAAAG9yZGVyX3BvcnRhbF90eXBlcxAAAABkZWxpdmVyeV9idWlsZGVyKAgAAABzDAAAAHN0YXRl
-X2NoYW5nZXMJAAAAX2dldGF0dHJfcwUAAABvcmRlcnMMAAAAcHJldmlvdXNfdGFncwoAAABleHBh
-bmRfdGFncwsAAABhY3RpdmF0ZV9rd3MRAAAAb3JkZXJfcG9ydGFsX3R5cGVzEAAAAGRlbGl2ZXJ5
-X2J1aWxkZXIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzFgAAAE9yZGVyX2J1aWxkUGFj
-a2luZ0xpc3QBAAAAcxQAAAAPAhYBFgEeAS4DEgENARwBDQEiAigBAAAAcxYAAABPcmRlcl9idWls
-ZFBhY2tpbmdMaXN0KAEAAABzFgAAAE9yZGVyX2J1aWxkUGFja2luZ0xpc3QoAAAAACgAAAAAcw8A
-AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
index b6f4ba51a3..08fba02587 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_createOrderRule.xml
@@ -75,18 +75,9 @@ order.activate(tag=tag).updateAppliedRule(rule_id = \'default_order_rule\',activ
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAYAAAAGAAAASwAA
-AHNvAAAAdAAAfAAAZAEAgwIAfQMAdAAAfAMAZAIAgwIAgwAAZAMAF30EAGgAAARkBAB8BAADPARk
-BQBkBgADPH0FAHQAAHQAAHwDAGQHAIMCAGQEAHwEAIMAAWQIAIMCAGQJAGQKAGQLAHwFAIMAAgFk
-AABTKAwAAABOcwYAAABvYmplY3RzBwAAAGdldFBhdGhzFwAAAF9maXJzdFVwZGF0ZUFwcGxpZWRS
-dWxlcwMAAAB0YWdzCAAAAHByaW9yaXR5aQMAAABzCAAAAGFjdGl2YXRlcxEAAAB1cGRhdGVBcHBs
-aWVkUnVsZXMHAAAAcnVsZV9pZHMSAAAAZGVmYXVsdF9vcmRlcl9ydWxlcwsAAABhY3RpdmF0ZV9r
-dygFAAAAcwkAAABfZ2V0YXR0cl9zDAAAAHN0YXRlX2NoYW5nZXMFAAAAb3JkZXJzAwAAAHRhZ3ML
-AAAAYWN0aXZhdGVfa3coBgAAAHMMAAAAc3RhdGVfY2hhbmdlcwIAAABrd3MJAAAAX2dldGF0dHJf
-cwUAAABvcmRlcnMDAAAAdGFncwsAAABhY3RpdmF0ZV9rdygAAAAAKAAAAABzDwAAAFNjcmlwdCAo
-UHl0aG9uKXMVAAAAT3JkZXJfY3JlYXRlT3JkZXJSdWxlAQAAAHMGAAAADwIWAR4BKAEAAABzFQAA
-AE9yZGVyX2NyZWF0ZU9yZGVyUnVsZSgBAAAAcxUAAABPcmRlcl9jcmVhdGVPcmRlclJ1bGUoAAAA
-ACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_validateData.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_validateData.xml
index 6b7973689f..3da366f8dc 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_validateData.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/scripts/Order_validateData.xml
@@ -94,32 +94,9 @@ if len(message_list) > 0:\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAwAAAAZAAAASwAA
-AHO5AQAAZAEAawAAbAEAfQMAAXQCAHwAAGQCAIMCAH0FAGQDAH0GAGcAAH0HAHQCAHwFAGQEAIMC
-AIMAAHQHAGoIAG8XAAF0AgB8BwBkBQCDAgBkBgCDAQABbgEAAXQCAHwFAGQHAIMCAIMAAHQHAGoI
-AG8WAAF0AgB8BQBkCACDAgCDAAB0BwBqCQBvIwABdAIAfAUAZAkAgwIAdAIAfAUAZAgAgwIAgwAA
-gwEAAW4BAAF0AgB8BQBkBwCDAgCDAAB0BwBqCABvFwABdAIAfAcAZAUAgwIAZAoAgwEAAW4BAAF0
-AgB8BQBkCwCDAgCDAAB0BwBqCABvFwABdAIAfAcAZAUAgwIAZAwAgwEAAW4BAAF4cgB0CAB0AgB8
-BQBkDQCDAgBkDgB0AgB8BQBkDwCDAgCDAACDAAGDAQBEXUYAfQoAdAIAfAoAZBAAgwIAgwAAdAcA
-aggAbycAAXQCAHwHAGQFAIMCAGQRAHQCAHwKAGQSAIMCAIMAABaDAQABcTgBAXE4AVd0CgB8BwCD
-AQBkEwBqBABvIAABfAMAZBQAdAIAZBUAZBYAgwIAfAcAgwEAF4ICAG4BAAFkAABTKBcAAABOKAEA
-AABzEAAAAFZhbGlkYXRpb25GYWlsZWRzBgAAAG9iamVjdHMAAAAAcwkAAABnZXRTb3VyY2VzBgAA
-AGFwcGVuZHMJAAAATm8gU291cmNlcwwAAABnZXRTdGFydERhdGVzCwAAAGdldFN0b3BEYXRlcwwA
-AABzZXRTdGFydERhdGVzBwAAAE5vIERhdGVzDgAAAGdldERlc3RpbmF0aW9ucw4AAABObyBEZXN0
-aW5hdGlvbnMMAAAAb2JqZWN0VmFsdWVzcwsAAABwb3J0YWxfdHlwZXMeAAAAZ2V0UG9ydGFsT3Jk
-ZXJNb3ZlbWVudFR5cGVMaXN0cxAAAABnZXRSZXNvdXJjZVZhbHVlcyAAAABObyBSZXNvdXJjZSBm
-b3IgbGluZSB3aXRoIGlkOiAlc3MFAAAAZ2V0SWRpAAAAAHMJAAAAV2FybmluZzogcwUAAAAgLS0t
-IHMEAAAAam9pbigLAAAAcx4AAABQcm9kdWN0cy5EQ1dvcmtmbG93LkRDV29ya2Zsb3dzEAAAAFZh
-bGlkYXRpb25GYWlsZWRzCQAAAF9nZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdlcwUAAABvcmRlcnMN
-AAAAZXJyb3JfbWVzc2FnZXMMAAAAbWVzc2FnZV9saXN0cwQAAABOb25lcwkAAABfZ2V0aXRlcl9z
-BAAAAGxpbmVzAwAAAGxlbigMAAAAcwwAAABzdGF0ZV9jaGFuZ2VzAgAAAGt3cx4AAABQcm9kdWN0
-cy5EQ1dvcmtmbG93LkRDV29ya2Zsb3dzEAAAAFZhbGlkYXRpb25GYWlsZWRzCQAAAF9nZXRhdHRy
-X3MFAAAAb3JkZXJzDQAAAGVycm9yX21lc3NhZ2VzDAAAAG1lc3NhZ2VfbGlzdHMEAAAATm9uZXMJ
-AAAAX2dldGl0ZXJfcwQAAABsaW5lcwMAAABsZW4oAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhv
-bilzEgAAAE9yZGVyX3ZhbGlkYXRlRGF0YQEAAABzJAAAAAABDQEPAQYBBgIcARcBMgEgARwBFAEc
-ARQBKwAGARwBKAITASgBAAAAcxIAAABPcmRlcl92YWxpZGF0ZURhdGEoAQAAAHMSAAAAT3JkZXJf
-dmFsaWRhdGVEYXRhKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEA
-AABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
index e416fdd7b5..863a154c66 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_acceptDecision.xml
@@ -84,17 +84,9 @@ packing_list.activate().updateCausalityState()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAQAAAAFAAAAQwAA
-AHNhAAAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAgwAAAXQAAHQAAHwCAGQDAIMCAGQEAIMC
-AHwCAHQDAGQFAIMDAAF0AAB0AAB8AgBkBgCDAgCDAABkBwCDAgCDAAABZAAAUygIAAAATnMGAAAA
-b2JqZWN0cxEAAAB1cGRhdGVBcHBsaWVkUnVsZXMRAAAAcG9ydGFsX3NpbXVsYXRpb25zDQAAAHNv
-bHZlRGVsaXZlcnlzDAAAAENvcHlUb1RhcmdldHMIAAAAYWN0aXZhdGVzFAAAAHVwZGF0ZUNhdXNh
-bGl0eVN0YXRlKAQAAABzCQAAAF9nZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdlcwwAAABwYWNraW5n
-X2xpc3RzBAAAAE5vbmUoBAAAAHMMAAAAc3RhdGVfY2hhbmdlcwkAAABfZ2V0YXR0cl9zDAAAAHBh
-Y2tpbmdfbGlzdHMEAAAATm9uZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMaAAAAUGFj
-a2luZ0xpc3RfYWNjZXB0RGVjaXNpb24BAAAAcwYAAAASAxMGIgQoAQAAAHMaAAAAUGFja2luZ0xp
-c3RfYWNjZXB0RGVjaXNpb24oAQAAAHMaAAAAUGFja2luZ0xpc3RfYWNjZXB0RGVjaXNpb24oAAAA
-ACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
index a369b6e4b4..bda04306d3 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_adoptPrevision.xml
@@ -90,24 +90,9 @@ packing_list.activate().updateCausalityState()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAYAAAAJAAAAQwAA
-AHPIAAAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAgwAAAXQAAHwCAGQDAIMCAIMAAH0DAHwD
-AGQEAGoCAG8cAAF0AAB0AAB8AgBkBQCDAgBkBgCDAgB9BABuKgABfAMAZAcAagIAbxwAAXQAAHQA
-AHwCAGQFAIMCAGQIAIMCAH0EAG4BAAF0AAB8AgBkCQCDAgCDAAB9BQB0AAB8BABkCgCDAgB8BQCD
-AQABdAAAdAAAfAIAZAsAgwIAgwAAZAwAgwIAgwAAAWQAAFMoDQAAAE5zBgAAAG9iamVjdHMRAAAA
-dXBkYXRlQXBwbGllZFJ1bGVzDQAAAGdldFBvcnRhbFR5cGVzEQAAAFNhbGUgUGFja2luZyBMaXN0
-cxEAAABwb3J0YWxfZGVsaXZlcmllc3MZAAAAc2FsZV9wYWNraW5nX2xpc3RfYnVpbGRlcnMVAAAA
-UHVyY2hhc2UgUGFja2luZyBMaXN0cx0AAABwdXJjaGFzZV9wYWNraW5nX2xpc3RfYnVpbGRlcnMO
-AAAAZ2V0UmVsYXRpdmVVcmxzFAAAAHVwZGF0ZUZyb21TaW11bGF0aW9ucwgAAABhY3RpdmF0ZXMU
-AAAAdXBkYXRlQ2F1c2FsaXR5U3RhdGUoBgAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFu
-Z2VzDAAAAHBhY2tpbmdfbGlzdHMYAAAAcGFja2luZ19saXN0X3BvcnRhbF90eXBlcxAAAABkZWxp
-dmVyeV9idWlsZGVycxkAAABwYWNraW5nX2xpc3RfcmVsYXRpdmVfdXJsKAYAAABzDAAAAHN0YXRl
-X2NoYW5nZXMJAAAAX2dldGF0dHJfcwwAAABwYWNraW5nX2xpc3RzGAAAAHBhY2tpbmdfbGlzdF9w
-b3J0YWxfdHlwZXMQAAAAZGVsaXZlcnlfYnVpbGRlcnMZAAAAcGFja2luZ19saXN0X3JlbGF0aXZl
-X3VybCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMaAAAAUGFja2luZ0xpc3RfYWRvcHRQ
-cmV2aXNpb24BAAAAcxIAAAASAw0GEgENARwBDQEcAhUBFgMoAQAAAHMaAAAAUGFja2luZ0xpc3Rf
-YWRvcHRQcmV2aXNpb24oAQAAAHMaAAAAUGFja2luZ0xpc3RfYWRvcHRQcmV2aXNpb24oAAAAACgA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit.xml
index 59055feaa5..16ae76b818 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_afterEdit.xml
@@ -73,15 +73,9 @@ if context.getSimulationState()!=\'draft\':\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAQAAAAGAAAASwAA
-AHNMAAAAdAAAfAAAZAEAgwIAYQIAdAAAdAIAZAIAgwIAgwAAZAMAagMAbyAAAXQAAHQAAHQCAGQE
-AIMCAIMAAGQFAIMCAIMAAAFuAQABZAAAUygGAAAATnMGAAAAb2JqZWN0cxIAAABnZXRTaW11bGF0
-aW9uU3RhdGVzBQAAAGRyYWZ0cwgAAABhY3RpdmF0ZXMUAAAAdXBkYXRlQ2F1c2FsaXR5U3RhdGUo
-AwAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2VzBwAAAGNvbnRleHQoBAAAAHMMAAAA
-c3RhdGVfY2hhbmdlcwIAAABrd3MJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0KAAAAAAoAAAAAHMP
-AAAAU2NyaXB0IChQeXRob24pcxUAAABQYWNraW5nTGlzdF9hZnRlckVkaXQBAAAAcwQAAAAPAR8B
-KAEAAABzFQAAAFBhY2tpbmdMaXN0X2FmdGVyRWRpdCgBAAAAcxUAAABQYWNraW5nTGlzdF9hZnRl
-ckVkaXQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
index c7d1f3db84..155153a290 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_callSplitPrevisionTransition.xml
@@ -84,20 +84,9 @@ packing_list.portal_workflow.doActionFor(\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAYAAAAKAAAAQwAA
-AHN0AAAAdAAAfAAAZAEAgwIAfQIAdAMAdAAAfAAAZAIAgwIAZAMAgwIAfQQAdAMAdAAAfAAAZAIA
-gwIAZAQAgwIAfQUAdAAAdAAAfAIAZAUAgwIAZAYAgwIAfAIAZAcAZAgAZAkAZAQAfAUAZAMAfAQA
-gwIDAWQAAFMoCgAAAE5zBgAAAG9iamVjdHMGAAAAa3dhcmdzcwkAAABzdG9wX2RhdGVzCgAAAHN0
-YXJ0X2RhdGVzDwAAAHBvcnRhbF93b3JrZmxvd3MLAAAAZG9BY3Rpb25Gb3JzDwAAAHNwbGl0X3By
-ZXZpc2lvbnMFAAAAd2ZfaWRzHwAAAHBhY2tpbmdfbGlzdF9jYXVzYWxpdHlfd29ya2Zsb3coBgAA
-AHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2VzDAAAAHBhY2tpbmdfbGlzdHMJAAAAX2dl
-dGl0ZW1fcwkAAABzdG9wX2RhdGVzCgAAAHN0YXJ0X2RhdGUoBgAAAHMMAAAAc3RhdGVfY2hhbmdl
-cwkAAABfZ2V0YXR0cl9zDAAAAHBhY2tpbmdfbGlzdHMJAAAAX2dldGl0ZW1fcwkAAABzdG9wX2Rh
-dGVzCgAAAHN0YXJ0X2RhdGUoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzKAAAAFBhY2tp
-bmdMaXN0X2NhbGxTcGxpdFByZXZpc2lvblRyYW5zaXRpb24BAAAAcwwAAAAPAhgBHgUPAQ8DBgEo
-AQAAAHMoAAAAUGFja2luZ0xpc3RfY2FsbFNwbGl0UHJldmlzaW9uVHJhbnNpdGlvbigBAAAAcygA
-AABQYWNraW5nTGlzdF9jYWxsU3BsaXRQcmV2aXNpb25UcmFuc2l0aW9uKAAAAAAoAAAAAHMPAAAA
-U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_split.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_split.xml
index d49b304104..373c326174 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_split.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_causality_workflow/scripts/PackingList_split.xml
@@ -107,35 +107,9 @@ delivery_builder.activate(activity=\'SQLQueue\',after_tag=tag).build(explanation
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAA0AAAAVAAAAQwAA
-AHOiAQAAdAAAfAAAZAEAgwIAfQIAdAMAdAAAfAAAZAIAgwIAZAMAgwIAfQQAdAMAdAAAfAAAZAIA
-gwIAZAQAgwIAfQUAdAAAfAIAZAUAgwIAgwAAAXQAAHwCAGQGAIMCAIMAAGQHABd9BgB0AAB0AAB8
-AgBkCACDAgBkCQCDAgB8AgB0BwBkCgBkBAB8BQBkAwB8BABkCwBoAAAEZAwAfAYAAzyDAwMBdAAA
-dAAAfAIAZA0AgwIAgwAAZA4AgwIAgwAAAXQAAHwCAGQPAIMCAIMAAH0IAHQAAHwIAGQQAIMCAGQR
-AGQSAIMAAX0JAHQAAHwIAGQTAIMCAIMAAH0KAHwKAGQUAGoCAG8cAAF0AAB0AAB8CABkFQCDAgBk
-FgCDAgB9CwBuKgABfAoAZBcAagIAbxwAAXQAAHQAAHwIAGQVAIMCAGQYAIMCAH0LAG4BAAF0AAB8
-CABkGQCDAgCDAAB0AAB8AgBkGQCDAgCDAABnAgB9DAB0AAB0AAB8CwBkDQCDAgBkGgBkGwBkHAB8
-BgCDAAJkHQCDAgBkHgB8DACDAAEBZAAAUygfAAAATnMGAAAAb2JqZWN0cwYAAABrd2FyZ3NzCQAA
-AHN0b3BfZGF0ZXMKAAAAc3RhcnRfZGF0ZXMRAAAAdXBkYXRlQXBwbGllZFJ1bGVzBwAAAGdldFBh
-dGhzBgAAAF9zcGxpdHMRAAAAcG9ydGFsX3NpbXVsYXRpb25zDQAAAHNvbHZlRGVsaXZlcnlzDQAA
-AFNwbGl0QW5kRGVmZXJzCwAAAGFjdGl2YXRlX2t3cwMAAAB0YWdzCAAAAGFjdGl2YXRlcxQAAAB1
-cGRhdGVDYXVzYWxpdHlTdGF0ZXMRAAAAZ2V0Q2F1c2FsaXR5VmFsdWVzGAAAAGdldENhdXNhbGl0
-eVJlbGF0ZWRWYWx1ZXMLAAAAcG9ydGFsX3R5cGVzDAAAAEFwcGxpZWQgUnVsZXMNAAAAZ2V0UG9y
-dGFsVHlwZXMKAAAAU2FsZSBPcmRlcnMRAAAAcG9ydGFsX2RlbGl2ZXJpZXNzGQAAAHNhbGVfcGFj
-a2luZ19saXN0X2J1aWxkZXJzDgAAAFB1cmNoYXNlIE9yZGVycx0AAABwdXJjaGFzZV9wYWNraW5n
-X2xpc3RfYnVpbGRlcnMGAAAAZ2V0VWlkcwgAAABhY3Rpdml0eXMIAAAAU1FMUXVldWVzCQAAAGFm
-dGVyX3RhZ3MFAAAAYnVpbGRzDwAAAGV4cGxhbmF0aW9uX3VpZCgNAAAAcwkAAABfZ2V0YXR0cl9z
-DAAAAHN0YXRlX2NoYW5nZXMMAAAAcGFja2luZ19saXN0cwkAAABfZ2V0aXRlbV9zCQAAAHN0b3Bf
-ZGF0ZXMKAAAAc3RhcnRfZGF0ZXMDAAAAdGFncwQAAABOb25lcwUAAABvcmRlcnMMAAAAYXBwbGll
-ZF9ydWxlcxEAAABvcmRlcl9wb3J0YWxfdHlwZXMQAAAAZGVsaXZlcnlfYnVpbGRlcnMUAAAAZXhw
-bGFuYXRpb25fdWlkX2xpc3QoDQAAAHMMAAAAc3RhdGVfY2hhbmdlcwkAAABfZ2V0YXR0cl9zDAAA
-AHBhY2tpbmdfbGlzdHMJAAAAX2dldGl0ZW1fcwkAAABzdG9wX2RhdGVzCgAAAHN0YXJ0X2RhdGVz
-AwAAAHRhZ3MEAAAATm9uZXMFAAAAb3JkZXJzDAAAAGFwcGxpZWRfcnVsZXMRAAAAb3JkZXJfcG9y
-dGFsX3R5cGVzEAAAAGRlbGl2ZXJ5X2J1aWxkZXJzFAAAAGV4cGxhbmF0aW9uX3VpZF9saXN0KAAA
-AAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcxEAAABQYWNraW5nTGlzdF9zcGxpdAEAAABzJAAA
-AA8CGAEbAw0GHAEbAgYBBgEWAxYDEgEYBBIBDQEcAQ0BHAMqASgBAAAAcxEAAABQYWNraW5nTGlz
-dF9zcGxpdCgBAAAAcxEAAABQYWNraW5nTGlzdF9zcGxpdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAo
-UHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_updateQuantityFromContainerQuantity.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_updateQuantityFromContainerQuantity.xml
index 0c14a9fe9d..6952d89dea 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_updateQuantityFromContainerQuantity.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/scripts/PackingList_updateQuantityFromContainerQuantity.xml
@@ -76,18 +76,9 @@ packing_list.edit()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAUAAAAIAAAAQwAA
-AHNlAAAAdAAAfAAAZAEAgwIAfQIAeD8AdAMAdAAAfAIAZAIAgwIAgwAAgwEARF0lAH0EAHQAAHwE
-AGQDAIMCAHQAAHwEAGQEAIMCAIMAAIMBAAFxKABXdAAAfAIAZAUAgwIAgwAAAWQAAFMoBgAAAE5z
-BgAAAG9iamVjdHMPAAAAZ2V0TW92ZW1lbnRMaXN0cwsAAABzZXRRdWFudGl0eXMaAAAATW92ZW1l
-bnRfZ2V0UGFja2VkUXVhbnRpdHlzBAAAAGVkaXQoBQAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0
-ZV9jaGFuZ2VzDAAAAHBhY2tpbmdfbGlzdHMJAAAAX2dldGl0ZXJfcwgAAABtb3ZlbWVudCgFAAAA
-cwwAAABzdGF0ZV9jaGFuZ2VzCQAAAF9nZXRhdHRyX3MMAAAAcGFja2luZ19saXN0cwkAAABfZ2V0
-aXRlcl9zCAAAAG1vdmVtZW50KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcy8AAABQYWNr
-aW5nTGlzdF91cGRhdGVRdWFudGl0eUZyb21Db250YWluZXJRdWFudGl0eQEAAABzCAAAAA8CGQAJ
-ASMCKAEAAABzLwAAAFBhY2tpbmdMaXN0X3VwZGF0ZVF1YW50aXR5RnJvbUNvbnRhaW5lclF1YW50
-aXR5KAEAAABzLwAAAFBhY2tpbmdMaXN0X3VwZGF0ZVF1YW50aXR5RnJvbUNvbnRhaW5lclF1YW50
-aXR5KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_activateUpdatePackingListState.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_activateUpdatePackingListState.xml
index 5124396190..91fa5ba277 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_activateUpdatePackingListState.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_activateUpdatePackingListState.xml
@@ -73,16 +73,9 @@ packing_list_content.getExplanationValue().activate().edit()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAMAAAAGAAAAQwAA
-AHM7AAAAdAAAfAAAZAEAgwIAfQIAdAAAdAAAdAAAfAIAZAIAgwIAgwAAZAMAgwIAgwAAZAQAgwIA
-gwAAAWQAAFMoBQAAAE5zBgAAAG9iamVjdHMTAAAAZ2V0RXhwbGFuYXRpb25WYWx1ZXMIAAAAYWN0
-aXZhdGVzBAAAAGVkaXQoAwAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2VzFAAAAHBh
-Y2tpbmdfbGlzdF9jb250ZW50KAMAAABzDAAAAHN0YXRlX2NoYW5nZXMJAAAAX2dldGF0dHJfcxQA
-AABwYWNraW5nX2xpc3RfY29udGVudCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMoAAAA
-Q29udGFpbmVyX2FjdGl2YXRlVXBkYXRlUGFja2luZ0xpc3RTdGF0ZQEAAABzAgAAABgCKAEAAABz
-KAAAAENvbnRhaW5lcl9hY3RpdmF0ZVVwZGF0ZVBhY2tpbmdMaXN0U3RhdGUoAQAAAHMoAAAAQ29u
-dGFpbmVyX2FjdGl2YXRlVXBkYXRlUGFja2luZ0xpc3RTdGF0ZSgAAAAAKAAAAABzDwAAAFNjcmlw
-dCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_updatePackingListState.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_updatePackingListState.xml
index 98bfab47ed..35bd98e3fe 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_updatePackingListState.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/Container_updatePackingListState.xml
@@ -75,16 +75,9 @@ packing_list_content.getExplanationValue().activate().edit()\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAMAAAAGAAAAQwAA
-AHM7AAAAdAAAfAAAZAEAgwIAfQIAdAAAdAAAdAAAfAIAZAIAgwIAgwAAZAMAgwIAgwAAZAQAgwIA
-gwAAAWQAAFMoBQAAAE5zBgAAAG9iamVjdHMTAAAAZ2V0RXhwbGFuYXRpb25WYWx1ZXMIAAAAYWN0
-aXZhdGVzBAAAAGVkaXQoAwAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2VzFAAAAHBh
-Y2tpbmdfbGlzdF9jb250ZW50KAMAAABzDAAAAHN0YXRlX2NoYW5nZXMJAAAAX2dldGF0dHJfcxQA
-AABwYWNraW5nX2xpc3RfY29udGVudCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMgAAAA
-Q29udGFpbmVyX3VwZGF0ZVBhY2tpbmdMaXN0U3RhdGUBAAAAcwIAAAAYBCgBAAAAcyAAAABDb250
-YWluZXJfdXBkYXRlUGFja2luZ0xpc3RTdGF0ZSgBAAAAcyAAAABDb250YWluZXJfdXBkYXRlUGFj
-a2luZ0xpc3RTdGF0ZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4B
-AAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
index c86f7ada61..7e88964f66 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_beforeDelete.xml
@@ -92,20 +92,9 @@ for simulation_movement in simulation_movement_list:\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAcAAAAGAAAAQwAA
-AHNVAAAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAZAMAZAQAgwABfQMAeCcAdAQAfAMAgwEA
-RF0ZAH0FAHQAAHwFAGQFAIMCAHQGAIMBAAFxNABXZAAAUygGAAAATnMGAAAAb2JqZWN0cxsAAABn
-ZXREZWxpdmVyeVJlbGF0ZWRWYWx1ZUxpc3RzCwAAAHBvcnRhbF90eXBlcxMAAABTaW11bGF0aW9u
-IE1vdmVtZW50cwsAAABzZXREZWxpdmVyeSgHAAAAcwkAAABfZ2V0YXR0cl9zDAAAAHN0YXRlX2No
-YW5nZXMUAAAAcGFja2luZ19saXN0X2NvbnRlbnRzGAAAAHNpbXVsYXRpb25fbW92ZW1lbnRfbGlz
-dHMJAAAAX2dldGl0ZXJfcxMAAABzaW11bGF0aW9uX21vdmVtZW50cwQAAABOb25lKAcAAABzDAAA
-AHN0YXRlX2NoYW5nZXMJAAAAX2dldGF0dHJfcxQAAABwYWNraW5nX2xpc3RfY29udGVudHMYAAAA
-c2ltdWxhdGlvbl9tb3ZlbWVudF9saXN0cwkAAABfZ2V0aXRlcl9zEwAAAHNpbXVsYXRpb25fbW92
-ZW1lbnRzBAAAAE5vbmUoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzHwAAAFBhY2tpbmdM
-aXN0Q29udGVudF9iZWZvcmVEZWxldGUBAAAAcwgAAAAPAxgCDQAJAigBAAAAcx8AAABQYWNraW5n
-TGlzdENvbnRlbnRfYmVmb3JlRGVsZXRlKAEAAABzHwAAAFBhY2tpbmdMaXN0Q29udGVudF9iZWZv
-cmVEZWxldGUoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMA
-AAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
index 2c80429d4c..a7993743e8 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingListContent_updatePackingListState.xml
@@ -75,19 +75,9 @@ if packing_list_content.getSimulationState()!=\'draft\':\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAQAAAAGAAAAQwAA
-AHNuAAAAdAAAfAAAZAEAgwIAfQIAdAAAfAIAZAIAgwIAgwAAZAMAagMAb0IAAXQAAHwCAGQEAIMC
-AIMAAH0DAHQAAHwDAGQFAIMCAIMAAAF0AAB0AAB8AgBkBgCDAgCDAABkBwCDAgCDAAABbgEAAWQA
-AFMoCAAAAE5zBgAAAG9iamVjdHMSAAAAZ2V0U2ltdWxhdGlvblN0YXRlcwUAAABkcmFmdHMTAAAA
-Z2V0RXhwbGFuYXRpb25WYWx1ZXMEAAAAZWRpdHMIAAAAYWN0aXZhdGVzIgAAAFBhY2tpbmdMaXN0
-Q29udGVudF91cGRhdGVBZnRlckVkaXQoBAAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFu
-Z2VzFAAAAHBhY2tpbmdfbGlzdF9jb250ZW50cxEAAABleHBsYW5hdGlvbl92YWx1ZSgEAAAAcwwA
-AABzdGF0ZV9jaGFuZ2VzCQAAAF9nZXRhdHRyX3MUAAAAcGFja2luZ19saXN0X2NvbnRlbnRzEQAA
-AGV4cGxhbmF0aW9uX3ZhbHVlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcykAAABQYWNr
-aW5nTGlzdENvbnRlbnRfdXBkYXRlUGFja2luZ0xpc3RTdGF0ZQEAAABzCAAAAA8BGQEVARMBKAEA
-AABzKQAAAFBhY2tpbmdMaXN0Q29udGVudF91cGRhdGVQYWNraW5nTGlzdFN0YXRlKAEAAABzKQAA
-AFBhY2tpbmdMaXN0Q29udGVudF91cGRhdGVQYWNraW5nTGlzdFN0YXRlKAAAAAAoAAAAAHMPAAAA
-U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
index 2088048d5c..0e5bc4e4f9 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/scripts/PackingList_updateAppliedRule.xml
@@ -81,18 +81,9 @@ if packing_list.getSimulationState()!=\'draft\':\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAQAAAAHAAAASwAA
-AHNeAAAAdAAAfAAAZAEAgwIAfQMAdAAAfAMAZAIAgwIAgwAAZAMAagMAbzIAAXQAAHQAAHwDAGQE
-AIMCAGQFAGQGAGQHAGYCAIMAAWQIAIMCAGQJAGQKAIMAAQFuAQABZAAAUygLAAAATnMGAAAAb2Jq
-ZWN0cxIAAABnZXRTaW11bGF0aW9uU3RhdGVzBQAAAGRyYWZ0cwgAAABhY3RpdmF0ZXMPAAAAYWZ0
-ZXJfbWV0aG9kX2lkcxYAAABpbW1lZGlhdGVSZWluZGV4T2JqZWN0cx8AAAByZWN1cnNpdmVJbW1l
-ZGlhdGVSZWluZGV4T2JqZWN0cxEAAAB1cGRhdGVBcHBsaWVkUnVsZXMHAAAAcnVsZV9pZHMVAAAA
-ZGVmYXVsdF9kZWxpdmVyeV9ydWxlKAMAAABzCQAAAF9nZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdl
-cwwAAABwYWNraW5nX2xpc3QoBAAAAHMMAAAAc3RhdGVfY2hhbmdlcwIAAABrd3MJAAAAX2dldGF0
-dHJfcwwAAABwYWNraW5nX2xpc3QoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzHQAAAFBh
-Y2tpbmdMaXN0X3VwZGF0ZUFwcGxpZWRSdWxlAQAAAHMEAAAADwEfASgBAAAAcx0AAABQYWNraW5n
-TGlzdF91cGRhdGVBcHBsaWVkUnVsZSgBAAAAcx0AAABQYWNraW5nTGlzdF91cGRhdGVBcHBsaWVk
-UnVsZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml
index 5c5bfd51aa..891831d93a 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_buildInvoice.xml
@@ -87,30 +87,9 @@ else :\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAcAAAALAAAAQwAA
-AHPIAAAAZAEAhAAAfQEAZAIAhAAAfQEAdAEAfAAAZAMAgwIAfQMAdAEAdAEAfAAAZAQAgwIAgwAA
-ZAUAgwIAfQQAfAEAZAYAdAEAfAMAZAcAgwIAgwAAFoMBAAF0BQB8BABkCACDAgBvOAABdAEAdAEA
-dAEAfAQAZAgAgwIAZAkAgwIAZAoAZAsAZAwAZA0AZwMAgwABZA4AgwIAgwAAAW4nAAF0AQB0BgBk
-DwCDAgBkEABkEQB0AQB8AwBkBwCDAgCDAAAWgwIAAWQAAFMoEgAAAE5jAQAAAAMAAAADAAAAQwAA
-AHMWAAAAdAAAdAEAZAEAgwIAZAIAfAAAgwIAUygDAAAATnMDAAAAbG9ncxgAAABQYWNraW5nTGlz
-dF9idWlsZEludm9pY2UoAwAAAHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwMAAABtc2coAwAA
-AHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoAAAAACgAAAAAcw8AAABTY3JpcHQg
-KFB5dGhvbilzCwAAADxsYW1iZGEuMTA+AQAAAHMAAAAAYwEAAAABAAAAAQAAAEMAAABzBAAAAGQB
-AFMoAgAAAE5zCAAAAERJU0FCTEVEKAAAAAAoAQAAAHMDAAAAbXNnKAAAAAAoAAAAAHMPAAAAU2Ny
-aXB0IChQeXRob24pcwsAAAA8bGFtYmRhLjExPgIAAABzAAAAAHMGAAAAb2JqZWN0cwkAAABnZXRQ
-b3J0YWxzEQAAAHBvcnRhbF9kZWxpdmVyaWVzcxEAAABwYWNraW5nX2xpc3QgOiAlc3MHAAAAZ2V0
-UGF0aHMUAAAAc2FsZV9pbnZvaWNlX2J1aWxkZXJzCAAAAGFjdGl2YXRlcw8AAABhZnRlcl9tZXRo
-b2RfaWRzBgAAAGV4cGFuZHMfAAAAcmVjdXJzaXZlSW1tZWRpYXRlUmVpbmRleE9iamVjdHMWAAAA
-aW1tZWRpYXRlUmVpbmRleE9iamVjdHMFAAAAYnVpbGRzAwAAAGxvZ3MPAAAARVJQNSBTaW11bGF0
-aW9uc0kAAABVbmFibGUgdG8gYnVpbGQgSW52b2ljZSBmcm9tIHBhY2tpbmcgbGlzdCBhdCAlcyA6
-IG5vIHNhbGVfaW52b2ljZV9idWlsZGVyKAcAAABzAwAAAExPR3MJAAAAX2dldGF0dHJfcwMAAABz
-Y2lzDAAAAHBhY2tpbmdfbGlzdHMNAAAAZGVsaXZlcnlfdG9vbHMHAAAAaGFzYXR0cnMHAAAAY29u
-dGV4dCgHAAAAcwMAAABzY2lzAwAAAExPR3MJAAAAX2dldGF0dHJfcwwAAABwYWNraW5nX2xpc3Rz
-DQAAAGRlbGl2ZXJ5X3Rvb2xzBwAAAGhhc2F0dHJzBwAAAGNvbnRleHQoAAAAACgAAAAAcw8AAABT
-Y3JpcHQgKFB5dGhvbilzGAAAAFBhY2tpbmdMaXN0X2J1aWxkSW52b2ljZQEAAABzEgAAAAkBCQIP
-ARsBGgIZARIBIAUSAigBAAAAcxgAAABQYWNraW5nTGlzdF9idWlsZEludm9pY2UoAQAAAHMYAAAA
-UGFja2luZ0xpc3RfYnVpbGRJbnZvaWNlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgA
-AAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
index 46d522af3d..796a09e9a2 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
@@ -99,35 +99,9 @@ packing_list.activate(\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAsAAAAMAAAASwAA
-AHNoAQAAZAEAhAAAfQIAZAIAhAAAfQIAdAEAfAAAZAMAgwIAfQQAaAAAfQUAdAEAdAUAZAQAgwIA
-gwAAfQcAZwAAfQgAfAcAdAgAagkAb0oAAXQBAHwIAGQFAIMCAHQBAHwHAGQGAIMCAIMAAGQHABeD
-AQABdAEAfAgAZAUAgwIAdAEAfAcAZAYAgwIAgwAAZAgAF4MBAAFuAQABdAEAfAQAZAYAgwIAgwAA
-ZAgAF30KAGgAAARkCQB8CgADPARkCgBkCwADPH0FAHQBAHQBAHwEAGQMAIMCAGQNAHwIAGQJAHwK
-AGQKAGQLAIMAA2QOAIMCAGQPAGQQAGQRAHwFAIMAAgF0AQB0AQB8BABkDACDAgBkDQB8CABkCQB8
-CgBkCgBkCwCDAANkEgCDAgBkEwBkFACDAAEBdAEAfAQAZBUAgwIAgwAAAXQBAHQBAHwEAGQMAIMC
-AGQWAHwKAIMAAWQXAIMCAIMAAAFkAABTKBgAAABOYwEAAAADAAAAAwAAAEMAAABzFgAAAHQAAHQB
-AGQBAIMCAGQCAHwAAIMCAFMoAwAAAE5zAwAAAGxvZ3MdAAAAUGFja2luZ0xpc3RfdXBkYXRlQXBw
-bGllZFJ1bGUoAwAAAHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwMAAABtc2coAwAAAHMDAAAA
-bXNncwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhv
-bilzCgAAADxsYW1iZGEuND4BAAAAcwAAAABjAQAAAAEAAAABAAAAQwAAAHMEAAAAZAEAUygCAAAA
-TnMIAAAARElTQUJMRUQoAAAAACgBAAAAcwMAAABtc2coAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5
-dGhvbilzCgAAADxsYW1iZGEuNT4CAAAAcwAAAABzBgAAAG9iamVjdHMRAAAAZ2V0Q2F1c2FsaXR5
-VmFsdWVzBgAAAGFwcGVuZHMHAAAAZ2V0UGF0aHMXAAAAX2ZpcnN0VXBkYXRlQXBwbGllZFJ1bGVz
-BwAAAF9leHBhbmRzAwAAAHRhZ3MIAAAAcHJpb3JpdHlpAwAAAHMIAAAAYWN0aXZhdGVzCgAAAGFm
-dGVyX3BhdGhzEQAAAHVwZGF0ZUFwcGxpZWRSdWxlcwcAAABydWxlX2lkcxUAAABkZWZhdWx0X2Rl
-bGl2ZXJ5X3J1bGVzCwAAAGFjdGl2YXRlX2t3cx4AAABhcHBseVRvRGVsaXZlcnlSZWxhdGVkTW92
-ZW1lbnRzCQAAAG1ldGhvZF9pZHMNAAAAcmVpbmRleE9iamVjdHMNAAAAc3RhcnRCdWlsZGluZ3MJ
-AAAAYWZ0ZXJfdGFncxQAAAB1cGRhdGVDYXVzYWxpdHlTdGF0ZSgKAAAAcwMAAABMT0dzCQAAAF9n
-ZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdlcwwAAABwYWNraW5nX2xpc3RzCwAAAGFjdGl2YXRlX2t3
-cwcAAABjb250ZXh0cw0AAAByZWxhdGVkX29yZGVycw8AAABhZnRlcl9wYXRoX2xpc3RzBAAAAE5v
-bmVzAwAAAHRhZygLAAAAcwwAAABzdGF0ZV9jaGFuZ2VzAgAAAGt3cwMAAABMT0dzCQAAAF9nZXRh
-dHRyX3MMAAAAcGFja2luZ19saXN0cwsAAABhY3RpdmF0ZV9rd3MHAAAAY29udGV4dHMNAAAAcmVs
-YXRlZF9vcmRlcnMPAAAAYWZ0ZXJfcGF0aF9saXN0cwQAAABOb25lcwMAAAB0YWcoAAAAACgAAAAA
-cw8AAABTY3JpcHQgKFB5dGhvbilzHQAAAFBhY2tpbmdMaXN0X3VwZGF0ZUFwcGxpZWRSdWxlAQAA
-AHMgAAAACQEJAg8DBgESAQYBEAEjASQBFgEeAi0BDQYxAxMBDAEoAQAAAHMdAAAAUGFja2luZ0xp
-c3RfdXBkYXRlQXBwbGllZFJ1bGUoAQAAAHMdAAAAUGFja2luZ0xpc3RfdXBkYXRlQXBwbGllZFJ1
-bGUoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateBasePriceCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateBasePriceCellRange.xml
index b39eaab102..0772b82fac 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateBasePriceCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateBasePriceCellRange.xml
@@ -75,18 +75,9 @@ supply_line.updateCellRange(base_id=base_id)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAUAAAAEAAAAQwAA
-AHNIAAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAZAMAfQQAdAAAfAIAZAQAgwIAfAMAgwEAAXQAAHwC
-AGQFAIMCAGQGAHwEAIMAAQFkAABTKAcAAABOcwYAAABvYmplY3RzCgAAAGJhc2VfcHJpY2VzBAAA
-AHBhdGhzFwAAAHVwZGF0ZVF1YW50aXR5UHJlZGljYXRlcw8AAAB1cGRhdGVDZWxsUmFuZ2VzBwAA
-AGJhc2VfaWQoBQAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2VzCwAAAHN1cHBseV9s
-aW5lcw8AAABwcmljZV9wYXJhbWV0ZXJzBwAAAGJhc2VfaWQoBQAAAHMMAAAAc3RhdGVfY2hhbmdl
-cwkAAABfZ2V0YXR0cl9zCwAAAHN1cHBseV9saW5lcw8AAABwcmljZV9wYXJhbWV0ZXJzBwAAAGJh
-c2VfaWQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzIwAAAFN1cHBseUxpbmVfdXBkYXRl
-QmFzZVByaWNlQ2VsbFJhbmdlAQAAAHMIAAAADwEGAQkBEwEoAQAAAHMjAAAAU3VwcGx5TGluZV91
-cGRhdGVCYXNlUHJpY2VDZWxsUmFuZ2UoAQAAAHMjAAAAU3VwcGx5TGluZV91cGRhdGVCYXNlUHJp
-Y2VDZWxsUmFuZ2UoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAA
-AHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateDiscountRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateDiscountRatioCellRange.xml
index afcca2ef16..e430004dc0 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateDiscountRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateDiscountRatioCellRange.xml
@@ -75,18 +75,9 @@ supply_line.updateCellRange(base_id=base_id)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAUAAAAEAAAAQwAA
-AHNIAAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAZAMAfQQAdAAAfAIAZAQAgwIAfAMAgwEAAXQAAHwC
-AGQFAIMCAGQGAHwEAIMAAQFkAABTKAcAAABOcwYAAABvYmplY3RzDgAAAGRpc2NvdW50X3JhdGlv
-cxMAAABwYXRoX2Rpc2NvdW50X3JhdGlvcxcAAAB1cGRhdGVRdWFudGl0eVByZWRpY2F0ZXMPAAAA
-dXBkYXRlQ2VsbFJhbmdlcwcAAABiYXNlX2lkKAUAAABzCQAAAF9nZXRhdHRyX3MMAAAAc3RhdGVf
-Y2hhbmdlcwsAAABzdXBwbHlfbGluZXMPAAAAcHJpY2VfcGFyYW1ldGVycwcAAABiYXNlX2lkKAUA
-AABzDAAAAHN0YXRlX2NoYW5nZXMJAAAAX2dldGF0dHJfcwsAAABzdXBwbHlfbGluZXMPAAAAcHJp
-Y2VfcGFyYW1ldGVycwcAAABiYXNlX2lkKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcycA
-AABTdXBwbHlMaW5lX3VwZGF0ZURpc2NvdW50UmF0aW9DZWxsUmFuZ2UBAAAAcwgAAAAPAQYBCQET
-ASgBAAAAcycAAABTdXBwbHlMaW5lX3VwZGF0ZURpc2NvdW50UmF0aW9DZWxsUmFuZ2UoAQAAAHMn
-AAAAU3VwcGx5TGluZV91cGRhdGVEaXNjb3VudFJhdGlvQ2VsbFJhbmdlKAAAAAAoAAAAAHMPAAAA
-U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateExclusiveDiscountRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateExclusiveDiscountRatioCellRange.xml
index 74173c91f0..5405335668 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateExclusiveDiscountRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateExclusiveDiscountRatioCellRange.xml
@@ -75,19 +75,9 @@ supply_line.updateCellRange(base_id=base_id)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAUAAAAEAAAAQwAA
-AHNMAAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAZAMAfAMAFn0EAHQAAHwCAGQEAIMCAHwDAIMBAAF0
-AAB8AgBkBQCDAgBkBgB8BACDAAEBZAAAUygHAAAATnMGAAAAb2JqZWN0cxgAAABleGNsdXNpdmVf
-ZGlzY291bnRfcmF0aW9zBwAAAHBhdGhfJXNzFwAAAHVwZGF0ZVF1YW50aXR5UHJlZGljYXRlcw8A
-AAB1cGRhdGVDZWxsUmFuZ2VzBwAAAGJhc2VfaWQoBQAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0
-ZV9jaGFuZ2VzCwAAAHN1cHBseV9saW5lcw8AAABwcmljZV9wYXJhbWV0ZXJzBwAAAGJhc2VfaWQo
-BQAAAHMMAAAAc3RhdGVfY2hhbmdlcwkAAABfZ2V0YXR0cl9zCwAAAHN1cHBseV9saW5lcw8AAABw
-cmljZV9wYXJhbWV0ZXJzBwAAAGJhc2VfaWQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilz
-MAAAAFN1cHBseUxpbmVfdXBkYXRlRXhjbHVzaXZlRGlzY291bnRSYXRpb0NlbGxSYW5nZQEAAABz
-CAAAAA8BBgENARMBKAEAAABzMAAAAFN1cHBseUxpbmVfdXBkYXRlRXhjbHVzaXZlRGlzY291bnRS
-YXRpb0NlbGxSYW5nZSgBAAAAczAAAABTdXBwbHlMaW5lX3VwZGF0ZUV4Y2x1c2l2ZURpc2NvdW50
-UmF0aW9DZWxsUmFuZ2UoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+
-AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalAdditionalPriceCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalAdditionalPriceCellRange.xml
index f68a3c36df..d66c256388 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalAdditionalPriceCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalAdditionalPriceCellRange.xml
@@ -75,19 +75,9 @@ supply_line.updateCellRange(base_id=base_id, option_variation=1)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAUAAAAGAAAAQwAA
-AHNSAAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAZAMAfAMAFn0EAHQAAHwCAGQEAIMCAHwDAIMBAAF0
-AAB8AgBkBQCDAgBkBgB8BABkBwBkCACDAAIBZAAAUygJAAAATnMGAAAAb2JqZWN0cxAAAABhZGRp
-dGlvbmFsX3ByaWNlcxAAAABwYXRoX29wdGlvbmFsXyVzcxcAAAB1cGRhdGVRdWFudGl0eVByZWRp
-Y2F0ZXMPAAAAdXBkYXRlQ2VsbFJhbmdlcwcAAABiYXNlX2lkcxAAAABvcHRpb25fdmFyaWF0aW9u
-aQEAAAAoBQAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2VzCwAAAHN1cHBseV9saW5l
-cw8AAABwcmljZV9wYXJhbWV0ZXJzBwAAAGJhc2VfaWQoBQAAAHMMAAAAc3RhdGVfY2hhbmdlcwkA
-AABfZ2V0YXR0cl9zCwAAAHN1cHBseV9saW5lcw8AAABwcmljZV9wYXJhbWV0ZXJzBwAAAGJhc2Vf
-aWQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzMQAAAFN1cHBseUxpbmVfdXBkYXRlT3B0
-aW9uYWxBZGRpdGlvbmFsUHJpY2VDZWxsUmFuZ2UBAAAAcwgAAAAPAQYBDQETASgBAAAAczEAAABT
-dXBwbHlMaW5lX3VwZGF0ZU9wdGlvbmFsQWRkaXRpb25hbFByaWNlQ2VsbFJhbmdlKAEAAABzMQAA
-AFN1cHBseUxpbmVfdXBkYXRlT3B0aW9uYWxBZGRpdGlvbmFsUHJpY2VDZWxsUmFuZ2UoAAAAACgA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalDiscountRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalDiscountRatioCellRange.xml
index 3626fbcf10..b22783834e 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalDiscountRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalDiscountRatioCellRange.xml
@@ -74,17 +74,9 @@ supply_line.updateCellRange(base_id=base_id, option_variation=1)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAQAAAAGAAAAQwAA
-AHM1AAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAdAAAfAIAZAMAgwIAZAQAfAMAZAUAZAYAgwACAWQA
-AFMoBwAAAE5zBgAAAG9iamVjdHMcAAAAcGF0aF9vcHRpb25hbF9kaXNjb3VudF9yYXRpb3MPAAAA
-dXBkYXRlQ2VsbFJhbmdlcwcAAABiYXNlX2lkcxAAAABvcHRpb25fdmFyaWF0aW9uaQEAAAAoBAAA
-AHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2VzCwAAAHN1cHBseV9saW5lcwcAAABiYXNl
-X2lkKAQAAABzDAAAAHN0YXRlX2NoYW5nZXMJAAAAX2dldGF0dHJfcwsAAABzdXBwbHlfbGluZXMH
-AAAAYmFzZV9pZCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMvAAAAU3VwcGx5TGluZV91
-cGRhdGVPcHRpb25hbERpc2NvdW50UmF0aW9DZWxsUmFuZ2UBAAAAcwQAAAAPAQkCKAEAAABzLwAA
-AFN1cHBseUxpbmVfdXBkYXRlT3B0aW9uYWxEaXNjb3VudFJhdGlvQ2VsbFJhbmdlKAEAAABzLwAA
-AFN1cHBseUxpbmVfdXBkYXRlT3B0aW9uYWxEaXNjb3VudFJhdGlvQ2VsbFJhbmdlKAAAAAAoAAAA
-AHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalExclusiveDiscountRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalExclusiveDiscountRatioCellRange.xml
index 3ea8ef8a9e..7324b37950 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalExclusiveDiscountRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalExclusiveDiscountRatioCellRange.xml
@@ -73,18 +73,9 @@ supply_line.updateCellRange(base_id=base_id, option_variation=1)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAQAAAAGAAAAQwAA
-AHM1AAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAdAAAfAIAZAMAgwIAZAQAfAMAZAUAZAYAgwACAWQA
-AFMoBwAAAE5zBgAAAG9iamVjdHMmAAAAcGF0aF9vcHRpb25hbF9leGNsdXNpdmVfZGlzY291bnRf
-cmF0aW9zDwAAAHVwZGF0ZUNlbGxSYW5nZXMHAAAAYmFzZV9pZHMQAAAAb3B0aW9uX3ZhcmlhdGlv
-bmkBAAAAKAQAAABzCQAAAF9nZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdlcwsAAABzdXBwbHlfbGlu
-ZXMHAAAAYmFzZV9pZCgEAAAAcwwAAABzdGF0ZV9jaGFuZ2VzCQAAAF9nZXRhdHRyX3MLAAAAc3Vw
-cGx5X2xpbmVzBwAAAGJhc2VfaWQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzOAAAAFN1
-cHBseUxpbmVfdXBkYXRlT3B0aW9uYWxFeGNsdXNpdmVEaXNjb3VudFJhdGlvQ2VsbFJhbmdlAQAA
-AHMEAAAADwEJASgBAAAAczgAAABTdXBwbHlMaW5lX3VwZGF0ZU9wdGlvbmFsRXhjbHVzaXZlRGlz
-Y291bnRSYXRpb0NlbGxSYW5nZSgBAAAAczgAAABTdXBwbHlMaW5lX3VwZGF0ZU9wdGlvbmFsRXhj
-bHVzaXZlRGlzY291bnRSYXRpb0NlbGxSYW5nZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u
-KXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalSurchargeRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalSurchargeRatioCellRange.xml
index 7b15998d4c..e1cbe73aa4 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalSurchargeRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateOptionalSurchargeRatioCellRange.xml
@@ -73,17 +73,9 @@ supply_line.updateCellRange(base_id=base_id, option_variation=1)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAQAAAAGAAAAQwAA
-AHM1AAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAdAAAfAIAZAMAgwIAZAQAfAMAZAUAZAYAgwACAWQA
-AFMoBwAAAE5zBgAAAG9iamVjdHMdAAAAcGF0aF9vcHRpb25hbF9zdXJjaGFyZ2VfcmF0aW9zDwAA
-AHVwZGF0ZUNlbGxSYW5nZXMHAAAAYmFzZV9pZHMQAAAAb3B0aW9uX3ZhcmlhdGlvbmkBAAAAKAQA
-AABzCQAAAF9nZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdlcwsAAABzdXBwbHlfbGluZXMHAAAAYmFz
-ZV9pZCgEAAAAcwwAAABzdGF0ZV9jaGFuZ2VzCQAAAF9nZXRhdHRyX3MLAAAAc3VwcGx5X2xpbmVz
-BwAAAGJhc2VfaWQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzMAAAAFN1cHBseUxpbmVf
-dXBkYXRlT3B0aW9uYWxTdXJjaGFyZ2VSYXRpb0NlbGxSYW5nZQEAAABzBAAAAA8BCQEoAQAAAHMw
-AAAAU3VwcGx5TGluZV91cGRhdGVPcHRpb25hbFN1cmNoYXJnZVJhdGlvQ2VsbFJhbmdlKAEAAABz
-MAAAAFN1cHBseUxpbmVfdXBkYXRlT3B0aW9uYWxTdXJjaGFyZ2VSYXRpb0NlbGxSYW5nZSgAAAAA
-KAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateSurchargeRatioCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateSurchargeRatioCellRange.xml
index 0f3ec83ab0..2a7e4cd5ed 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateSurchargeRatioCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/supply_line_interaction_workflow/scripts/SupplyLine_updateSurchargeRatioCellRange.xml
@@ -75,18 +75,9 @@ supply_line.updateCellRange(base_id=base_id)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAUAAAAEAAAAQwAA
-AHNMAAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAZAMAfAMAFn0EAHQAAHwCAGQEAIMCAHwDAIMBAAF0
-AAB8AgBkBQCDAgBkBgB8BACDAAEBZAAAUygHAAAATnMGAAAAb2JqZWN0cw8AAABzdXJjaGFyZ2Vf
-cmF0aW9zBwAAAHBhdGhfJXNzFwAAAHVwZGF0ZVF1YW50aXR5UHJlZGljYXRlcw8AAAB1cGRhdGVD
-ZWxsUmFuZ2VzBwAAAGJhc2VfaWQoBQAAAHMJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2Vz
-CwAAAHN1cHBseV9saW5lcw8AAABwcmljZV9wYXJhbWV0ZXJzBwAAAGJhc2VfaWQoBQAAAHMMAAAA
-c3RhdGVfY2hhbmdlcwkAAABfZ2V0YXR0cl9zCwAAAHN1cHBseV9saW5lcw8AAABwcmljZV9wYXJh
-bWV0ZXJzBwAAAGJhc2VfaWQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzKAAAAFN1cHBs
-eUxpbmVfdXBkYXRlU3VyY2hhcmdlUmF0aW9DZWxsUmFuZ2UBAAAAcwgAAAAPAQYBDQETASgBAAAA
-cygAAABTdXBwbHlMaW5lX3VwZGF0ZVN1cmNoYXJnZVJhdGlvQ2VsbFJhbmdlKAEAAABzKAAAAFN1
-cHBseUxpbmVfdXBkYXRlU3VyY2hhcmdlUmF0aW9DZWxsUmFuZ2UoAAAAACgAAAAAcw8AAABTY3Jp
-cHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
index f364c34666..858ef79f68 100755
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/trade_matrix_workflow/scripts/DeliveryLine_updateCellRange.xml
@@ -74,15 +74,9 @@ delivery_line.updateCellRange(base_id)\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAAAQAAAAEAAAAQwAA
-AHMsAAAAdAAAfAAAZAEAgwIAfQIAZAIAfQMAdAAAfAIAZAMAgwIAfAMAgwEAAWQAAFMoBAAAAE5z
-BgAAAG9iamVjdHMIAAAAbW92ZW1lbnRzDwAAAHVwZGF0ZUNlbGxSYW5nZSgEAAAAcwkAAABfZ2V0
-YXR0cl9zDAAAAHN0YXRlX2NoYW5nZXMNAAAAZGVsaXZlcnlfbGluZXMHAAAAYmFzZV9pZCgEAAAA
-cwwAAABzdGF0ZV9jaGFuZ2VzCQAAAF9nZXRhdHRyX3MNAAAAZGVsaXZlcnlfbGluZXMHAAAAYmFz
-ZV9pZCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMcAAAARGVsaXZlcnlMaW5lX3VwZGF0
-ZUNlbGxSYW5nZQEAAABzBAAAAA8CCQEoAQAAAHMcAAAARGVsaXZlcnlMaW5lX3VwZGF0ZUNlbGxS
-YW5nZSgBAAAAcxwAAABEZWxpdmVyeUxpbmVfdXBkYXRlQ2VsbFJhbmdlKAAAAAAoAAAAAHMPAAAA
-U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log
index dc611105b6..4d83fb0df8 100755
--- a/bt5/erp5_trade/bt/change_log
+++ b/bt5/erp5_trade/bt/change_log
@@ -1,3 +1,6 @@
+2005-01-06 Romain
+* add Delivery_viewInventory
+
 2005-12-20 Kevin
 * Update state type of packing_list_workflow, internal_packing_list_workflow and order_workflow states.
 
diff --git a/bt5/erp5_trade/bt/template_catalog_full_text_key_list b/bt5/erp5_trade/bt/template_catalog_full_text_key_list
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_trade/bt/template_catalog_keyword_key_list b/bt5/erp5_trade/bt/template_catalog_keyword_key_list
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_trade/bt/template_catalog_multivalue_key_list b/bt5/erp5_trade/bt/template_catalog_multivalue_key_list
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_trade/bt/template_catalog_request_key_list b/bt5/erp5_trade/bt/template_catalog_request_key_list
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_trade/bt/template_catalog_topic_key_list b/bt5/erp5_trade/bt/template_catalog_topic_key_list
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_trade/bt/template_local_roles_list b/bt5/erp5_trade/bt/template_local_roles_list
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
new file mode 100755
index 0000000000..c9c7434242
--- /dev/null
+++ b/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
@@ -0,0 +1,37 @@
+Container Line | Container Cell
+Container | Container
+Container | Container Line
+Internal Packing List Line | Delivery Cell
+Internal Packing List Module | Internal Packing List
+Internal Packing List | Internal Packing List Line
+Inventory Line | Inventory Cell
+Inventory Module | Inventory
+Inventory | Inventory Line
+Purchase Order Line | Delivery Cell
+Purchase Order Module | Purchase Order
+Purchase Order | Discount
+Purchase Order | Payment Condition
+Purchase Order | Purchase Order Line
+Purchase Packing List Line | Purchase Packing List Cell
+Purchase Packing List Module | Purchase Packing List
+Purchase Packing List | Purchase Packing List Line
+Purchase Supply Module | Purchase Supply
+Purchase Supply | Supply Line
+Purchase Trade Condition Module | Purchase Trade Condition
+Purchase Trade Condition | Discount
+Purchase Trade Condition | Payment Condition
+Sale Order Line | Delivery Cell
+Sale Order Module | Sale Order
+Sale Order | Discount
+Sale Order | Payment Condition
+Sale Order | Sale Order Line
+Sale Packing List Line | Sale Packing List Cell
+Sale Packing List Module | Sale Packing List
+Sale Packing List | Container
+Sale Packing List | Sale Packing List Line
+Sale Supply Module | Sale Supply
+Sale Supply | Supply Line
+Sale Trade Condition Module | Sale Trade Condition
+Sale Trade Condition | Discount
+Sale Trade Condition | Payment Condition
+Supply Line | Supply Cell
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/template_portal_type_base_category_list b/bt5/erp5_trade/bt/template_portal_type_base_category_list
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_trade/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_trade/bt/template_portal_type_hidden_content_type_list
new file mode 100755
index 0000000000..769ee7a395
--- /dev/null
+++ b/bt5/erp5_trade/bt/template_portal_type_hidden_content_type_list
@@ -0,0 +1,8 @@
+Container Line | Container Cell
+Internal Packing List Line | Delivery Cell
+Inventory Line | Inventory Cell
+Purchase Order Line | Delivery Cell
+Purchase Packing List Line | Purchase Packing List Cell
+Sale Order Line | Delivery Cell
+Sale Packing List Line | Sale Packing List Cell
+Supply Line | Supply Cell
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/template_portal_type_property_sheet_list b/bt5/erp5_trade/bt/template_portal_type_property_sheet_list
new file mode 100755
index 0000000000..aeb11ef341
--- /dev/null
+++ b/bt5/erp5_trade/bt/template_portal_type_property_sheet_list
@@ -0,0 +1,4 @@
+Sale Order | PaymentCondition
+Sale Trade Condition | Comment
+Sale Trade Condition | PaymentCondition
+Supply Cell | Reference
\ No newline at end of file
-- 
2.30.9