diff --git a/bt5/erp5_commerce/CategoryTemplateItem/portal_categories/function/customer.xml b/bt5/erp5_commerce/CategoryTemplateItem/portal_categories/function/customer.xml
index 25d44dcab5fc1a3c84b2e5f5778cc8ae87224448..22e6cb0e59509220f1664ef7d73f2fca49557393 100644
--- a/bt5/erp5_commerce/CategoryTemplateItem/portal_categories/function/customer.xml
+++ b/bt5/erp5_commerce/CategoryTemplateItem/portal_categories/function/customer.xml
@@ -19,27 +19,61 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
+            <key> <string>activity_code</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>aggregated_portal_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_height</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_length</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_surface</string> </key>
+            <value>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>base_unit_quantity</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>base_volume</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>base_weight</string> </key>
             <value>
               <none/>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>base_width</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
@@ -50,8 +84,152 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>codification</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>consumer_unit_quantity</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>contributors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>corporate_name</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>corporate_registration_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_destination_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_destination_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_source_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>destination_base_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>destination_base_price_validity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>destination_total_asset_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>document_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>ean13_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>efficiency</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>expiration_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>financial_year_stop_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>float_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>format</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>geographic_incorporate_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>grouping_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>height_quantity</string> </key>
             <value>
               <none/>
             </value>
@@ -60,61 +238,291 @@
             <key> <string>id</string> </key>
             <value> <string>customer</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>instructions</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>language</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>0</string> </value>
+        </item>
+        <item>
+            <key> <string>length_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>max_delay</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>max_flow</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>min_delay</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>min_flow</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>p_variation_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Category</string> </value>
         </item>
+        <item>
+            <key> <string>price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>priced_quantity</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>required_aggregated_portal_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rights</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>social_capital</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>social_capital_currency_id</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>social_capital_currency_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>social_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>source_base_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>source_base_price_validity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>source_total_asset_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>start_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>stop_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>string_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>subject</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>surface_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>time_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Customer</string> </value>
         </item>
+        <item>
+            <key> <string>trade_description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>uid</string> </key>
             <value>
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>unit_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_column</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_line</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_tab</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_property_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>vat_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>volume_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>weight_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>width_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_commerce/CategoryTemplateItem/portal_categories/product_line/shipping.xml b/bt5/erp5_commerce/CategoryTemplateItem/portal_categories/product_line/shipping.xml
index 0d45a6b3a96b3733e667d55ec2bb98049b864c8a..833b37381559ab9c58d04ab613cb6c073925207c 100644
--- a/bt5/erp5_commerce/CategoryTemplateItem/portal_categories/product_line/shipping.xml
+++ b/bt5/erp5_commerce/CategoryTemplateItem/portal_categories/product_line/shipping.xml
@@ -19,21 +19,61 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
+            <key> <string>activity_code</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>aggregated_portal_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_height</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_length</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_surface</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_unit_quantity</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>base_volume</string> </key>
+            <value>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>base_weight</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>base_width</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
@@ -44,8 +84,152 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>codification</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>consumer_unit_quantity</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>contributors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>corporate_name</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>corporate_registration_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_destination_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_destination_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_source_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>destination_base_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>destination_base_price_validity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>destination_total_asset_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>document_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>ean13_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>effective_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>efficiency</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>expiration_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>financial_year_stop_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>float_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>format</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>geographic_incorporate_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>grouping_reference</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>height_quantity</string> </key>
             <value>
               <none/>
             </value>
@@ -54,61 +238,291 @@
             <key> <string>id</string> </key>
             <value> <string>shipping</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>instructions</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>language</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>0</string> </value>
+        </item>
+        <item>
+            <key> <string>length_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>max_delay</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>max_flow</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>min_delay</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>min_flow</string> </key>
+            <value> <float>0.0</float> </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>p_variation_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Category</string> </value>
         </item>
+        <item>
+            <key> <string>price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>priced_quantity</string> </key>
+            <value> <float>1.0</float> </value>
+        </item>
+        <item>
+            <key> <string>required_aggregated_portal_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rights</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>social_capital</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>social_capital_currency_id</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>social_capital_currency_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>social_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>source_base_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>source_base_price_validity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>source_total_asset_price</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>start_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>stop_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>string_index</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>subject</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>surface_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>time_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Shipping</string> </value>
         </item>
+        <item>
+            <key> <string>trade_description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>uid</string> </key>
             <value>
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>unit_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_column</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_line</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_base_category_tab</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>variation_property_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>vat_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>volume_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>weight_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>width_quantity</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_commerce/PortalTypeRolesTemplateItem/Person%20Module.xml b/bt5/erp5_commerce/PortalTypeRolesTemplateItem/Person%20Module.xml
index 1f8d665faca2e7fa66d29b6d9c573fc505f07f65..876a39d0684e73bb919514ebbeb5f626c5f3cffd 100644
--- a/bt5/erp5_commerce/PortalTypeRolesTemplateItem/Person%20Module.xml
+++ b/bt5/erp5_commerce/PortalTypeRolesTemplateItem/Person%20Module.xml
@@ -1,7 +1,7 @@
 <type_roles>
   <role id='Author'>
    <property id='title'>Customer</property>
-   <property id='priority'>10</property>
+   <property id='priority'>10.0</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromAssignment</property>
    <multi_property id='category'>function/customer</multi_property>
   </role>
diff --git a/bt5/erp5_commerce/PortalTypeRolesTemplateItem/Sale%20Order%20Module.xml b/bt5/erp5_commerce/PortalTypeRolesTemplateItem/Sale%20Order%20Module.xml
index 1f8d665faca2e7fa66d29b6d9c573fc505f07f65..876a39d0684e73bb919514ebbeb5f626c5f3cffd 100644
--- a/bt5/erp5_commerce/PortalTypeRolesTemplateItem/Sale%20Order%20Module.xml
+++ b/bt5/erp5_commerce/PortalTypeRolesTemplateItem/Sale%20Order%20Module.xml
@@ -1,7 +1,7 @@
 <type_roles>
   <role id='Author'>
    <property id='title'>Customer</property>
-   <property id='priority'>10</property>
+   <property id='priority'>10.0</property>
    <property id='base_category_script'>ERP5Type_getSecurityCategoryFromAssignment</property>
    <multi_property id='category'>function/customer</multi_property>
   </role>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
index ecaa6497cdd58162c06f37ba2694bbd0e71c763a..5ed42521c2b7d6eed356dd6e23ed057eabd2ee32 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
@@ -73,35 +73,35 @@
 """\n
   Add resource to shopping cart.\n
 """\n
-from Products.Formulator.Errors import FormValidationError\n
 request = container.REQUEST\n
-form = getattr(context, form_id)\n
+if resource is None:\n
+  resource = context\n
 \n
-# FIXME:\n
-# this handling of validation errors should be automatically handled by the \n
-# button itself\n
-try:\n
-  params = form.validate_all_to_request(request)\n
-except FormValidationError, validation_errors:\n
-  # Pack errors into the request\n
-  field_errors = form.ErrorFields(validation_errors)\n
-  request.set(\'field_errors\', field_errors)\n
-  # Make sure editors are pushed back as values into the REQUEST object\n
-  for f in form.get_fields():\n
-    field_id = f.id\n
-    if request.has_key(field_id):\n
-      value = request.get(field_id)\n
-      if callable(value):\n
-        value(request)\n
-  return form(request)\n
+if form_id is not None:\n
+  from Products.Formulator.Errors import FormValidationError\n
+  form = getattr(context, form_id, None)\n
+  quantity = int(request.get(\'field_your_buy_quantity\'))\n
+  # FIXME:\n
+  # this handling of validation errors should be automatically handled by the \n
+  # button itself\n
+  try:\n
+    params = form.validate_all_to_request(request)\n
+  except FormValidationError, validation_errors:\n
+    # Pack errors into the request\n
+    field_errors = form.ErrorFields(validation_errors)\n
+    request.set(\'field_errors\', field_errors)\n
+    # Make sure editors are pushed back as values into the REQUEST object\n
+    for f in form.get_fields():\n
+      field_id = f.id\n
+      if request.has_key(field_id):\n
+        value = request.get(field_id)\n
+        if callable(value):\n
+          value(request)\n
+    return form(request)\n
 \n
-quantity = int(request.get(\'your_buy_quantity\'))\n
 shopping_cart = context.SaleOrder_getShoppingCart()\n
 shopping_cart_items = context.SaleOrder_getShoppingCartItemList()\n
 \n
-if resource is None:\n
-  resource = context\n
-\n
 ## check if we don\'t have already such a resource in cart\n
 line_found=False\n
 for order_line in shopping_cart_items:\n
@@ -142,7 +142,7 @@ context.Base_redirect(\'view\', \\\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>form_id, resource=None</string> </value>
+            <value> <string>resource=None, quantity=1, form_id=None</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -162,22 +162,25 @@ context.Base_redirect(\'view\', \\\n
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>2</int> </value>
+                        <value> <int>3</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
-                            <string>form_id</string>
                             <string>resource</string>
-                            <string>Products.Formulator.Errors</string>
-                            <string>FormValidationError</string>
+                            <string>quantity</string>
+                            <string>form_id</string>
                             <string>_getattr_</string>
                             <string>container</string>
                             <string>request</string>
-                            <string>getattr</string>
+                            <string>None</string>
                             <string>context</string>
+                            <string>Products.Formulator.Errors</string>
+                            <string>FormValidationError</string>
+                            <string>getattr</string>
                             <string>form</string>
+                            <string>int</string>
                             <string>params</string>
                             <string>validation_errors</string>
                             <string>field_errors</string>
@@ -186,11 +189,8 @@ context.Base_redirect(\'view\', \\\n
                             <string>field_id</string>
                             <string>value</string>
                             <string>callable</string>
-                            <string>int</string>
-                            <string>quantity</string>
                             <string>shopping_cart</string>
                             <string>shopping_cart_items</string>
-                            <string>None</string>
                             <string>False</string>
                             <string>line_found</string>
                             <string>order_line</string>
@@ -210,6 +210,8 @@ context.Base_redirect(\'view\', \\\n
             <value>
               <tuple>
                 <none/>
+                <int>1</int>
+                <none/>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop.xml
index 9d0d95ed783ab5d8de873c4087efba038b4458eb..018e5017a4008eff60dea9de08b4ec4767eb51d7 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop.xml
@@ -49,6 +49,10 @@
             <key> <string>action</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>encoding</string> </key>
             <value> <string>UTF-8</string> </value>
@@ -119,7 +123,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>web_form_view</string> </value>
+            <value> <string>form_view_editable</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop/submit.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop/submit.xml
index 34beaabf016ce2ee9ad3dea580e7fe943faa59d3..c2605eece2c322a19bc0867783dd9757cbf64477 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop/submit.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop/submit.xml
@@ -126,7 +126,7 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string>hiddenLabel</string> </value>
+                    <value> <string>hidden</string> </value>
                 </item>
                 <item>
                     <key> <string>default</string> </key>
@@ -152,6 +152,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>image</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>name</string> </key>
                     <value> <string>Resource_addToShoppingCart:method</string> </value>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml
index 5ac83781a4456d627bf56a2f30db654eb4ac2ab4..df6a51178e7f944675d29a0df966c84bb8e5bab3 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWeb.xml
@@ -49,6 +49,10 @@
             <key> <string>action</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>encoding</string> </key>
             <value> <string>UTF-8</string> </value>
@@ -117,7 +121,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>web_form_view</string> </value>
+            <value> <string>form_view_editable</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWebConfirm.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWebConfirm.xml
index 95bf2f43df9f5fb8910370b048c25fd24879d47e..478c17f0bd49cb6cafe78ec4a6b725ce9876fc69 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWebConfirm.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewAsWebConfirm.xml
@@ -49,6 +49,10 @@
             <key> <string>action</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>encoding</string> </key>
             <value> <string>UTF-8</string> </value>
@@ -122,7 +126,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>web_form_view</string> </value>
+            <value> <string>form_view_editable</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_field_render.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_field_render.xml
deleted file mode 100644
index 98a370fdc6dbb400a180fc3d73def2b98f78b39e..0000000000000000000000000000000000000000
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_field_render.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</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>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<tal:block tal:replace="nothing"\n
-           xmlns:tal="http://xml.zope.org/namespaces/tal"\n
-           xmlns:metal="http://xml.zope.org/namespaces/metal"\n
-           xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
-<!--\n
-Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.\n
-                   Vincent Pelletier <vincent@nexedi.com>\n
-                   Christophe Dumez <christophe@nexedi.com>\n
-\n
-This program is Free Software; you can redistribute it and/or\n
-modify it under the terms of the GNU General Public License\n
-as published by the Free Software Foundation; either version 2\n
-of the License, or (at your option) any later version.\n
-\n
-This program is distributed in the hope that it will be useful,\n
-but WITHOUT ANY WARRANTY; without even the implied warranty of\n
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n
-GNU General Public License for more details.\n
-\n
-You should have received a copy of the GNU General Public License\n
-along with this program; if not, write to the Free Software\n
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
---></tal:block>\n
-\n
-<tal:block metal:define-macro="field_render">\n
-  <tal:block tal:condition="python: field.meta_type != \'HiddenStringField\'"\n
-             tal:define="field_id     field/id;\n
-                         dummy        python: request.set(\'editable_mode\',1);\n
-                         value        python: request.get(field_id, None);\n
-                         field_errors python: request.get(\'field_errors\', {});\n
-                         field_has_error  python: field_errors.has_key(field_id);\n
-                         global form_id form_id | python: form.id;\n
-                         field_description python: here.Base_getFieldDescription(form_id=form_id, field=field)">\n
-    <div tal:define="html_render  python: field.render_htmlgrid(value, request)"\n
-         tal:attributes="title field_description;\n
-                         class python: \' \'.join([x for x in [\'field\', field.is_required() and \'required\' or None, field_has_error and \'error\' or None, field.get_value(\'css_class\') or None] if x is not None])"\n
-         i18n:attributes="title" i18n:domain="ui">\n
-      <tal:block tal:repeat="html_tuple html_render">\n
-        <label>\n
-          <tal:block tal:content="structure python: html_tuple[0]"\n
-                    i18n:translate="" i18n:domain="ui"/>\n
-          <tal:block tal:condition="preferred_html_style_developper_mode">\n
-            <tal:block metal:use-macro="developper_shortcut_render/macros/field_developper"/>\n
-          </tal:block>\n
-          <tal:block tal:condition="preferred_html_style_translator_mode">\n
-            <tal:block metal:use-macro="developper_shortcut_render/macros/field_translator"/>\n
-          </tal:block>\n
-        </label>\n
-        <div class="input" tal:content="structure python: html_tuple[1]"/>\n
-        <span tal:condition="python: field_has_error"\n
-              class="error"\n
-              tal:content="python: field_errors[field_id].error_text"\n
-              i18n:translate="" i18n:domain="ui"/>\n
-        <p class="clear" tal:condition="not:is_web_mode"></p>\n
-      </tal:block>\n
-    </div>\n
-  </tal:block>\n
-</tal:block>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
-        </item>
-        <item>
-            <key> <string>expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>web_field_render</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_form_render.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_form_render.xml
deleted file mode 100644
index ba7aca367b5c4be605426e4d4667b8e59d83d5e2..0000000000000000000000000000000000000000
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_form_render.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</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>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<tal:block tal:replace="nothing"\n
-           xmlns:tal="http://xml.zope.org/namespaces/tal"\n
-           xmlns:metal="http://xml.zope.org/namespaces/metal"\n
-           xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
-<!--\n
-Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.\n
-                   Vincent Pelletier <vincent@nexedi.com>\n
-                   Christophe Dumez  <christophe@nexedi.com>\n
-\n
-This program is Free Software; you can redistribute it and/or\n
-modify it under the terms of the GNU General Public License\n
-as published by the Free Software Foundation; either version 2\n
-of the License, or (at your option) any later version.\n
-\n
-This program is distributed in the hope that it will be useful,\n
-but WITHOUT ANY WARRANTY; without even the implied warranty of\n
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n
-GNU General Public License for more details.\n
-\n
-You should have received a copy of the GNU General Public License\n
-along with this program; if not, write to the Free Software\n
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
-\n
-XXX: each case must be handled separatelly in this precise representation :\n
- - both top fields must be in the same div, so they must be identified\n
-   strictly by their name.\n
- - the middle field is rendered like the two top ones, but outside of the\n
-   top block.\n
- - the bottom block is rendered in another way (without its group name) so it\n
-   must be rendered separatelly.\n
-This leads to minor code duplication, but it\'s still code duplication.\n
-\n
-Breaks strict compatibility:\n
-  * Groups must be named one of "left", "right", "center", "bottom" otherwise they will not\n
-      be rendered.\n
-  * Group order doesn\'t matter. Case is sensitive.\n
-  * Groups names becomes "left_group", "right_group", "left1_group", "right1_group",\n
-      "bottom_group" for quad_form_view macro.\n
-\n
-It is possible to specify a group id and a group title by naming a group following the\n
-  "group id (Group Title)" pattern. In this case the group id will be used as fieldset css\n
-  class and as tag id. The group title will be used as a legend for the fieldset. If no group\n
-  title is found, we use group id as title.\n
--->\n
-</tal:block>\n
-\n
-\n
-<tal:block metal:define-macro="master">\n
-  <tal:block\n
-    tal:define="field_errors python: request.get(\'field_errors\', {});\n
-                dummy        python: request.set(\'here\', here);\n
-                group_list   python: form.Form_getGroupTitleAndId();\n
-                gid_list     python: \' \'.join([x[\'gid\'] for x in group_list if x!=\'hidden\']);\n
-                field_render nocall: here/web_field_render/macros/field_render">\n
-\n
-    <tal:block tal:condition="preferred_html_style_developper_mode">\n
-      <tal:block metal:use-macro="developper_shortcut_render/macros/form"/>\n
-    </tal:block>\n
-\n
-    <tal:block tal:repeat="group group_list">\n
-      <tal:block tal:define="gid     group/gid;">\n
-        <fieldset tal:condition="python: gid.find(\'hidden\') < 0"\n
-                  tal:attributes="class gid;\n
-                                  id    python: \'fieldset_%s\' % (gid.replace(\' \', \'_\'), );">\n
-          <legend tal:condition="group/gtitle" tal:content="group/gtitle" class="group_title"/>\n
-          <tal:block tal:repeat="field python: form.get_fields_in_group(group[\'goid\'])">\n
-            <tal:block metal:use-macro="field_render"/>\n
-          </tal:block>\n
-        </fieldset>\n
-      </tal:block>\n
-    </tal:block>\n
-    <p class="clear"></p>\n
-  </tal:block>\n
-</tal:block>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
-        </item>
-        <item>
-            <key> <string>expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>web_form_render</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_form_view.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_form_view.xml
deleted file mode 100644
index 5b1a7490b040306970350adaced02ec70b97a6c5..0000000000000000000000000000000000000000
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/web_form_view.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</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>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<tal:block tal:replace="nothing"\n
-           xmlns:tal="http://xml.zope.org/namespaces/tal"\n
-           xmlns:metal="http://xml.zope.org/namespaces/metal"\n
-           xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
-<!--\n
-Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.\n
-                   Vincent Pelletier <vincent@nexedi.com>\n
-                   Christophe Dumez <christophe@nexedi.com>\n
-\n
-This program is Free Software; you can redistribute it and/or\n
-modify it under the terms of the GNU General Public License\n
-as published by the Free Software Foundation; either version 2\n
-of the License, or (at your option) any later version.\n
-\n
-This program is distributed in the hope that it will be useful,\n
-but WITHOUT ANY WARRANTY; without even the implied warranty of\n
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n
-GNU General Public License for more details.\n
-\n
-You should have received a copy of the GNU General Public License\n
-along with this program; if not, write to the Free Software\n
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
--->\n
-</tal:block>\n
-<tal:block metal:define-macro="master">\n
-  <tal:block metal:use-macro="here/view_main/macros/master">\n
-    <tal:block metal:fill-slot="main">\n
-      <tal:block metal:use-macro="here/web_form_render/macros/master" />\n
-    </tal:block>\n
-  </tal:block>\n
-</tal:block>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
-        </item>
-        <item>
-            <key> <string>expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>web_form_view</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision
index 69226f7293aa543649b73a6ed3264cddabfcd8c1..0fd0714a51f10639eab0e6a0121977179a7b458a 100644
--- a/bt5/erp5_commerce/bt/revision
+++ b/bt5/erp5_commerce/bt/revision
@@ -1 +1 @@
-92
\ No newline at end of file
+103
\ No newline at end of file
diff --git a/bt5/erp5_commerce/bt/template_catalog_datetime_key_list b/bt5/erp5_commerce/bt/template_catalog_datetime_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_commerce/bt/template_catalog_local_role_key_list b/bt5/erp5_commerce/bt/template_catalog_local_role_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_commerce/bt/template_catalog_role_key_list b/bt5/erp5_commerce/bt/template_catalog_role_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_commerce/bt/template_catalog_scriptable_key_list b/bt5/erp5_commerce/bt/template_catalog_scriptable_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_commerce/bt/template_tool_id_list b/bt5/erp5_commerce/bt/template_tool_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391