diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml
index 9eee5d933740e537b39f78941e4537ae729c1aed..9afdff7109c7d868ba0774b8f9f528def62d79e4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml
@@ -65,15 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>line = context\n
-parent = context.getParentValue()\n
-\n
-line_pt = line.getPortalType()\n
-\n
-index = len(parent.contentValues(filter={"portal_type": line_pt}))\n
-reference = "%s.%s" % (parent.getReference(), index)\n
-\n
-line.edit(reference=reference, int_index=index)\n
+            <value> <string>context.Base_initIntIndexAndReference(*args, **kw)\n
 </string> </value>
         </item>
         <item>
@@ -88,6 +80,12 @@ line.edit(reference=reference, int_index=index)\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>*args, **kw</string> </value>
@@ -118,14 +116,9 @@ line.edit(reference=reference, int_index=index)\n
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
-                            <string>context</string>
-                            <string>line</string>
+                            <string>_apply_</string>
                             <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>reference</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml
index 5e59fa493e7e3d213fd35ee70bea9ada89b3eb8d..35134aa1b4bd86c658894ffe7bd4e9550231d4dc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml
@@ -65,15 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>line = context\n
-parent = context.getParentValue()\n
-\n
-line_pt = line.getPortalType()\n
-\n
-index = len(parent.contentValues(filter={"portal_type": line_pt}))\n
-reference = str(index)\n
-\n
-line.edit(reference=reference, int_index=index)\n
+            <value> <string>context.Base_initIntIndexAndReference(*args, **kw)\n
 </string> </value>
         </item>
         <item>
@@ -88,6 +80,12 @@ line.edit(reference=reference, int_index=index)\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>*args, **kw</string> </value>
@@ -118,15 +116,9 @@ line.edit(reference=reference, int_index=index)\n
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
-                            <string>context</string>
-                            <string>line</string>
+                            <string>_apply_</string>
                             <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>str</string>
-                            <string>reference</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
index eba292c6a770f907c8f7340fe84373abd126c62f..b691068052f9f7c0bddf55cd711e8bbfede0c885 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
@@ -65,19 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>line = context\n
-parent = context.getParentValue()\n
-\n
-line_pt = line.getPortalType()\n
-\n
-index = len(parent.contentValues(filter={"portal_type": line_pt}))\n
-\n
-if parent.getPortalType() == line_pt:\n
-  reference = "%s.%s" % (parent.getReference(), index)\n
-else:\n
-  reference = str(index)\n
-\n
-line.edit(reference=reference, int_index=index)\n
+            <value> <string>context.Base_initIntIndexAndReference(*args, **kw)\n
 </string> </value>
         </item>
         <item>
@@ -92,6 +80,12 @@ line.edit(reference=reference, int_index=index)\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>*args, **kw</string> </value>
@@ -122,15 +116,9 @@ line.edit(reference=reference, int_index=index)\n
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
-                            <string>context</string>
-                            <string>line</string>
+                            <string>_apply_</string>
                             <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>reference</string>
-                            <string>str</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 1f704ce60d70b1e318447b4e22ecbe575e4f5cb3..499121066036ae5c63b283206688fa216a6619b4 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-449
\ No newline at end of file
+451
\ No newline at end of file