diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml
index d6dd85c5778c8b6cbcbbd45ee85d3ba87b4902e9..9fe3c6d590c99a7366f410165c618b613f254547 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml
@@ -64,7 +64,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -87,7 +87,7 @@
                     <value> <string>Item_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml
index ef12ad253b9f7c81f283fe395d0586ee72917560..8fa2b43950ea44caf362ec43a2e55ffa3a5bcffb 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml
@@ -64,7 +64,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -87,7 +87,7 @@
                     <value> <string>Item_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml
index ce94389341ee1a03d5513147962c0d08c746e03e..ff775adce598581c4039d37ac969e0236d1e6366 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml
@@ -83,7 +83,7 @@
                     <value> <string>Item_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml
index 03c24c32265589ed1801ffc5a441330c2d555368..5944425fd101c2e2f549138377ec2820af7cc27f 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml
@@ -12,7 +12,9 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list/>
+              <list>
+                <string>required</string>
+              </list>
             </value>
         </item>
         <item>
@@ -86,6 +88,10 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Item_viewFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key>                 <string>required</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml
index d4ff709489a4624cb30430c000e863f3ffa97c95..6518a9092e93bfa2352940f7214c37f85ac550ae 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml
@@ -52,6 +52,16 @@
             <key> <string>action</string> </key>
             <value> <string>Item_createRelatedAffectationValidate</string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>edit_order</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>encoding</string> </key>
             <value> <string>UTF-8</string> </value>
@@ -96,10 +106,7 @@
                     <value>
                       <list>
                         <string>my_reference</string>
-                        <string>my_quantity_unit</string>
                         <string>my_resource</string>
-                        <string>your_source</string>
-                        <string>your_source_section</string>
                       </list>
                     </value>
                 </item>
@@ -118,6 +125,7 @@
                     <value>
                       <list>
                         <string>my_quantity</string>
+                        <string>my_quantity_unit</string>
                         <string>your_portal_type</string>
                       </list>
                     </value>
@@ -159,7 +167,7 @@
         </item>
         <item>
             <key> <string>update_action</string> </key>
-            <value> <string>Item_createRelatedAffectationUpdate</string> </value>
+            <value> <string>Item_createAffectationFormDialog</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_source.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_source.xml
deleted file mode 100644
index dc553ad492d1b3cc43a3a96122498bc18165aeca..0000000000000000000000000000000000000000
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_source.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>delegated_list</string> </key>
-            <value>
-              <list>
-                <string>default</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>your_source</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>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>tales</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key>                 <string>default</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key>                 <string>default</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string>your_source</string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string>Item_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string>Click to edit the target</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: here.Item_getCurrentSiteValue() is not None and here.Item_getCurrentSiteValue().getRelativeUrl()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_source_section.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_source_section.xml
deleted file mode 100644
index 90842848576ed8309ef2ec3cd20599e77df2b18a..0000000000000000000000000000000000000000
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_source_section.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>delegated_list</string> </key>
-            <value>
-              <list/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>your_source_section</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>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>tales</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>field_id</string> </key>
-                    <value> <string>your_source_section</string> </value>
-                </item>
-                <item>
-                    <key> <string>form_id</string> </key>
-                    <value> <string>Item_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>target</string> </key>
-                    <value> <string>Click to edit the target</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationUpdate.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationUpdate.xml
deleted file mode 100644
index c74136759a30159008815c9ca8e7db7f002602b9..0000000000000000000000000000000000000000
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationUpdate.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <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_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <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>_body</string> </key>
-            <value> <string>from Products.ERP5Type.Document import newTempBase\n
-#keyword to create new packing_list_line\n
-\n
-request = context.REQUEST\n
-\n
-global error_count\n
-error_count = 0\n
-\n
-site_query = site_suggestion\n
-#context.log(\'destination\',destination)\n
-if destination not in (None,\'\'):\n
-  error_count+=1\n
-  if batch_mode:\n
-    return error_count\n
-  context.Base_updateDialogForm(**kw)\n
-  if portal_type == \'Sale Packing List\':\n
-    return context.Item_createRelatedSalePackingListFormDialog(destination,destination_section,portal_type,site_suggestion,source,source_section,stop_date,title,**kw)\n
-  return context.Item_createRelatedAffectationFormDialog(destination,destination_section,portal_type,site_suggestion,source,source_section,stop_date,title,**kw)\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>destination=None,destination_section=None,portal_type=None,site_suggestion=None,source=None,source_section=None,stop_date=None,title=\'\',batch_mode=0, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>errors</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_code</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>co_argcount</string> </key>
-                        <value> <int>9</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>co_varnames</string> </key>
-                        <value>
-                          <tuple>
-                            <string>destination</string>
-                            <string>destination_section</string>
-                            <string>portal_type</string>
-                            <string>site_suggestion</string>
-                            <string>source</string>
-                            <string>source_section</string>
-                            <string>stop_date</string>
-                            <string>title</string>
-                            <string>batch_mode</string>
-                            <string>kw</string>
-                            <string>Products.ERP5Type.Document</string>
-                            <string>newTempBase</string>
-                            <string>_getattr_</string>
-                            <string>context</string>
-                            <string>request</string>
-                            <string>error_count</string>
-                            <string>site_query</string>
-                            <string>None</string>
-                            <string>_inplacevar_</string>
-                            <string>_apply_</string>
-                          </tuple>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_defaults</string> </key>
-            <value>
-              <tuple>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-                <string></string>
-                <int>0</int>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Item_createRelatedAffectationUpdate</string> </value>
-        </item>
-        <item>
-            <key> <string>warnings</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml
index 0077ab9d473d29f01b8296775cbffb9f2a298234..f2c154b8b84eb9b955415cec233ab4a12bfff802 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml
@@ -65,29 +65,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-# Check data validity\n
-error_count = 0\n
-#error_count = context.Item_createRelatedAffectationUpdate(destination, destination_section,portal_type,site_suggestion,source,source_section,stop_date,title,batch_mode=1, **kw)\n
-#context.log(\'error_count\',error_count)\n
-context.log(\'portal_type\',portal_type)\n
-if portal_type not in (\'Sale Packing List\'):\n
-  if error_count > 0:\n
-    return context.Item_createRelatedAffectationUpdate(destination,\\\n
-                                                       destination_section, \\\n
-                                                       portal_type,\\\n
-                                                       site_suggestion,\\\n
-                                                       source, \\\n
-                                                       source_section, \\\n
-                                                       stop_date,title, \\\n
-                                                       batch_mode=0, **kw)\n
+            <value> <string># Check data validity\n
+source = context.Item_getCurrentSiteValue()\n
+source_section = context.Item_getCurrentOwnerTitle(with_title=0)\n
 \n
 property_dict = {\'title\':title,\n
                  \'destination_section\' : destination_section,\n
                  \'destination\' : destination,                 \n
-                 \'source_section\' : source_section,\n
-                 \'source\' : source,\n
                  \'stop_date\' : stop_date,\n
                  \'start_date\' : start_date,\n
                  \'portal_type\' : portal_type, }\n
@@ -96,7 +80,6 @@ module = context.getDefaultModule(portal_type=portal_type)\n
 line_portal_type = \'%s Line\' % portal_type\n
 \n
 pl_dict = {}\n
-#context.log(\'property_dict:\',property_dict)\n
 for k,v in property_dict.items():\n
   pl_dict[k]=v\n
 \n
@@ -109,12 +92,12 @@ pl_line_dict[\'quantity\'] = quantity\n
 pl_line_dict[\'quantity_unit\'] = quantity_unit\n
 \n
 pl_value = module.newContent(**pl_dict)\n
+pl_value.setSourceValue(source)\n
+pl_value.setSourceSectionValue(source)\n
 pl_line_value = pl_value.newContent(**pl_line_dict)\n
 \n
 context.REQUEST[\'RESPONSE\'].redirect(\'/\'.join(pl_value.getPhysicalPath()))\n
-
-
-]]></string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -136,7 +119,7 @@ context.REQUEST[\'RESPONSE\'].redirect(\'/\'.join(pl_value.getPhysicalPath()))\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>destination=None,destination_section=None,portal_type=None,site_suggestion=None,source=None,source_section=None,start_date=None,quantity=None,stop_date=None,title=\'\',**kw</string> </value>
+            <value> <string>destination=None,destination_section=None,portal_type=None,site_suggestion=None,start_date=None,quantity=None,start_date=None,stop_date=None,title=\'\',quantity_unit=None,**kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -166,17 +149,17 @@ context.REQUEST[\'RESPONSE\'].redirect(\'/\'.join(pl_value.getPhysicalPath()))\n
                             <string>destination_section</string>
                             <string>portal_type</string>
                             <string>site_suggestion</string>
-                            <string>source</string>
-                            <string>source_section</string>
                             <string>start_date</string>
                             <string>quantity</string>
+                            <string>start_date</string>
                             <string>stop_date</string>
                             <string>title</string>
+                            <string>quantity_unit</string>
                             <string>kw</string>
-                            <string>error_count</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>_apply_</string>
+                            <string>source</string>
+                            <string>source_section</string>
                             <string>property_dict</string>
                             <string>module</string>
                             <string>line_portal_type</string>
@@ -186,7 +169,7 @@ context.REQUEST[\'RESPONSE\'].redirect(\'/\'.join(pl_value.getPhysicalPath()))\n
                             <string>v</string>
                             <string>_write_</string>
                             <string>pl_line_dict</string>
-                            <string>quantity_unit</string>
+                            <string>_apply_</string>
                             <string>pl_value</string>
                             <string>pl_line_value</string>
                             <string>_getitem_</string>
@@ -210,8 +193,8 @@ context.REQUEST[\'RESPONSE\'].redirect(\'/\'.join(pl_value.getPhysicalPath()))\n
                 <none/>
                 <none/>
                 <none/>
-                <none/>
                 <string></string>
+                <none/>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
index 6059fc5a31730fce58c3ba956a086089b6347b93..5f020684a84e26413cebcbf7d1f5915fffc7d211 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
@@ -68,7 +68,7 @@
             <value> <string>from DateTime import DateTime\n
 \n
 date = DateTime()\n
-last_affectation_list = context.portal_simulation.getTrackingList(item=context.getRelativeUrl(), at_date=date)\n
+last_affectation_list = context.portal_simulation.getCurrentTrackingList(item=context.getRelativeUrl(), at_date=date)\n
 #context.log(\'last_affectation_list\',len(last_affectation_list))\n
 if len(last_affectation_list) == 0:\n
   return None\n
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_source.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_source.xml
deleted file mode 100644
index 39424e73c262ad8e62f876e9a86ca0d10d896fb6..0000000000000000000000000000000000000000
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_source.xml
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>your_source</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>unknown_selection</string> </key>
-                    <value> <string>You selected an item that was not in the list.</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>editable</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</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>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>size</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</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>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>editable</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </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>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>size</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</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>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>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>size</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>-</string> </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>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: here.Item_getCurrentSiteValue() is not None and here.Item_getCurrentSiteValue().getRelativeUrl()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: here.Item_getCurrentSiteValue() is not None</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: [(here.Item_getCurrentSiteTitle(),here.Item_getCurrentSiteValue().getRelativeUrl())]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_source_section.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_source_section.xml
deleted file mode 100644
index ef16ce9e5acac74d3e55fbaf78d2fca8f54920f3..0000000000000000000000000000000000000000
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_source_section.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>your_source_section</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>unknown_selection</string> </key>
-                    <value> <string>You selected an item that was not in the list.</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>editable</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</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>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>size</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</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>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>editable</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</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>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>size</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</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>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>extra_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>size</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>-</string> </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>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: here.Item_getCurrentOwnerValue() is not None and here.Item_getCurrentOwnerValue().getRelativeUrl()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: [(here.Item_getCurrentOwnerTitle(),here.Item_getCurrentOwnerValue().getRelativeUrl())]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision
index c24b6ae77df02a87472b208f251fad88382a2e55..86ee83a4a26867a79e0a5a8948153cff8f4cf9a4 100644
--- a/bt5/erp5_item/bt/revision
+++ b/bt5/erp5_item/bt/revision
@@ -1 +1 @@
-38
\ No newline at end of file
+40
\ No newline at end of file