diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
index f8c3fda3d89df5f78c3106561117f00b58afcfc8..9982d4ffb48a4c306db94cb1a104b1dec80333af 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
@@ -50,32 +50,20 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>from DateTime import DateTime\n
-portal = context.getPortalObject()\n
+            <value> <string>portal = context.getPortalObject()\n
 \n
-if at_date is None:\n
-  at_date = DateTime()\n
-\n
-last_affectation_list = portal.portal_simulation.getCurrentTrackingList(\n
-                            item=context.getRelativeUrl())\n
+last_affectation_list = context.Item_getAffectationList(**kw)\n
 if not last_affectation_list:\n
   return None\n
-last_affectation_date_list = [x.getDate() for x in last_affectation_list]\n
-last_affectation_date_list.sort()\n
-first_affectation_list = portal.portal_simulation.getCurrentTrackingList(\n
-                            item=context.getRelativeUrl(),at_date=last_affectation_date_list[0])\n
-\n
-if len(last_affectation_list) == 0:\n
-  return None\n
 \n
-if first_affectation_list[0].node_uid is not None:\n
-  site = context.portal_catalog.getObject(first_affectation_list[0].delivery_uid)\n
+if last_affectation_list[-1].node_uid is not None:\n
+  site = portal.portal_catalog.getObject(last_affectation_list[-1].delivery_uid)\n
   return site\n
 </string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>at_date=None</string> </value>
+            <value> <string>**kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision
index 9e6181a6edf278d8fe3d626196e7a67223fae140..53c731105c7803f053a072618b750de8b3a1189c 100644
--- a/bt5/erp5_item/bt/revision
+++ b/bt5/erp5_item/bt/revision
@@ -1 +1 @@
-285
\ No newline at end of file
+286
\ No newline at end of file