diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
index 8bc5027a9a85770f4e57d9f4bf02cac79e3be32b..61bea2f57f517339fe57b88f6ec71019b0d1e920 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
@@ -90,14 +90,14 @@
                           <string>date</string>
                           <string>Date</string>
                         </tuple>
-                        <tuple>
-                          <string>node_title</string>
-                          <string>Site or Warehouse</string>
-                        </tuple>
                         <tuple>
                           <string>source_title</string>
                           <string>Origin</string>
                         </tuple>
+                        <tuple>
+                          <string>node_title</string>
+                          <string>Site or Warehouse</string>
+                        </tuple>
                         <tuple>
                           <string>section_title</string>
                           <string>Organisation</string>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_calculateReferencePrefix.py b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_calculateReferencePrefix.py
index 28738f1561dfd14515ca06fcc6a307488f1a9cca..8faddfdde11c9066965b3c47dca0295c166c94f8 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_calculateReferencePrefix.py
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_calculateReferencePrefix.py
@@ -1,4 +1,3 @@
-from Products.ERP5Type.Message import translateString
 from DateTime import DateTime
 
 prefix_reference = DateTime().strftime('1%d%m%y')
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_createItemList.py b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_createItemList.py
index 26bb5b7dc136ec2132616e2e169453a4203fbdeb..22b242e3a9386e0045513c322e3ec1934ee01f07 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_createItemList.py
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_createItemList.py
@@ -2,7 +2,6 @@ from Products.ERP5Type.Message import translateString
 
 item_list = []
 request = context.REQUEST
-total_quantity = 0.0
 
 item_portal_type = kw.get('type')
 
@@ -19,8 +18,6 @@ if dialog.has_field('your_item_extra_property_list'):
       item_property_dict[field_id.replace('your_', '', 1)] =\
                                     request.get(field_id)
 
-movement_cell_list = context.getCellValueList()
-base_id = 'movement'
 
 for line in kw.get('listbox'):
 
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getSelectableItemList.py b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getSelectableItemList.py
index 5bfcc004006ff5e424685b4e846fa9577dd761b5..a2aca15ada85581f229a592a5596f78674d76479 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getSelectableItemList.py
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getSelectableItemList.py
@@ -1,4 +1,3 @@
-from Products.ERP5Type.Document import newTempBase
 from Products.ERP5Type.Utils import cartesianProduct
 portal = context.getPortalObject()
 
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py
index f6b7f8feeaf79c15bce7c104586decc6aa9bf102..b717de45e14c82b8bdc08e575d62d45e6e2e6dab 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py
@@ -1,4 +1,3 @@
-from Products.ERP5Type.Document import newTempDeliveryLine
 portal = context.getPortalObject()
 
 try:
@@ -9,7 +8,11 @@ except ValueError:
 result = []
 
 for i in range(count):
-  obj = newTempDeliveryLine(portal, id="tmp_item_%s" % i, uid="new_item_%s" % i)
+  obj = portal.newContent(
+      portal_type='Movement',
+      temp_object=True,
+      id="tmp_item_%s" % i,
+      uid="new_item_%s" % i)
   result.append(obj)
 
 return result
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.xml
index 6326af079305c0888da15588348834322538a3da..a381dfe8c17b636751d7e8040873a55913efb7ce 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>form_id=\'view\', list_selection_name=\'\', uids=[], listbox=None, listbox_uid=[], *args, **kw</string> </value>
+            <value> <string>form_id=\'view\', list_selection_name=\'\', uids=(), listbox=None, listbox_uid=(), *args, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py
index 0dced0fe90a93976d20d38aa88eaed9de2933347..bc08329f1b06b3a8cd9e45aa0da05951ae9f63eb 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py
@@ -1,5 +1,4 @@
 request = context.REQUEST
-portal = context.getPortalObject()
 
 # FIXME: this is a workaround, because if listbox is present in request.form, 
 #   editable fields will be empty when re-displaying the dialog.
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.xml
index 651f0413d40c654beca3faeb82132bb605607c7a..865eca2238094ac8b9dc4f70c0efc79a9b8b2466 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>dialog_id, listbox=[], **kw</string> </value>
+            <value> <string>dialog_id, listbox=(), **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts/checkConsistency.py b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts/checkConsistency.py
index b9c9cc9a8efdc224967e06043348a35baf62949d..8823d28571dc894d1fc55a2be194bdd70ef91dcb 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts/checkConsistency.py
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/scripts/checkConsistency.py
@@ -1,2 +1 @@
-object = state_change['object']
-object.Base_checkConsistency()
+state_change['object'].Base_checkConsistency()
diff --git a/bt5/erp5_item/bt/skip_coding_style_test b/bt5/erp5_item/bt/skip_coding_style_test
deleted file mode 100644
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..0000000000000000000000000000000000000000
--- a/bt5/erp5_item/bt/skip_coding_style_test
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file