diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml
index 9d6a59576d411de411bf6c51f95711f62fbe4808..e2856b9771be8a11756ca9486fab923c74b842fe 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/history.xml
@@ -36,10 +36,18 @@
             <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>history</string> </value>
         </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml
index 0a41e665cba6e4631c8aaaea56bff798cbcccd11..94e56f7335aa2a6aa038952ce39865039f100000 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/metadata.xml
@@ -36,10 +36,18 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml
index 6ceeba48231d2eb2c25891915d9cf6e62b3d208d..1c37e227140fbe414426e5985b90fe3543ecaa28 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/print.xml
@@ -36,10 +36,18 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>print</string> </value>
         </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
index d70f12343efb34222a80da4080f6211e5e546103..4fd998306544bd89739ec0d28c0ad1f1fbfe4081 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Inventory%20Line/view.xml
@@ -36,10 +36,18 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml
index 28dee10aaedd10b8378c7df1b37ab765f3943eff..56e57d676d0e4bf42aed971b4f456bc7ee0a4a97 100644
--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/metadata.xml
@@ -4,20 +4,14 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml
index 98bcc4b7818740feb196245bb89e3e4c44498317..afa8fdbefc5be2a74a13048cb720e74dcc3e2d14 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_view/my_variation_category_list.xml
@@ -116,12 +116,6 @@
               </dictionary>
             </value>
         </item>
-        <item>
-            <key> <string>sub_form</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>tales</string> </key>
             <value>
@@ -173,7 +167,7 @@
                 <item>
                     <key> <string>items</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -282,87 +276,6 @@
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.Form</string>
-          <string>BasicForm</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <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>fields</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-        <item>
-            <key> <string>group_list</string> </key>
-            <value>
-              <list>
-                <string>Default</string>
-                <string>sub_list</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>groups</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key>                 <string>Default</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key>                 <string>sub_list</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>method</string> </key>
-            <value> <string>POST</string> </value>
-        </item>
-        <item>
-            <key> <string>name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>stored_encoding</string> </key>
-            <value> <string>ISO-8859-1</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Basic Form</string> </value>
-        </item>
-        <item>
-            <key> <string>unicode_mode</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
         <tuple>