diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml
index f9169580b3fc2d10ad96d2341f8878b39e0e0ba2..fa95004dfb49094906a5e74f5d775590d1650127 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_viewItemList/listbox.xml
@@ -82,7 +82,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -119,7 +119,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -162,7 +162,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -173,7 +173,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -204,11 +204,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>item_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -219,7 +219,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -250,7 +250,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Items</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/my_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/my_quantity.xml
index 887b2a20aba2102a1966669fdcf079e3bdb973b2..b37ef0a6497b0550072a0cf1be5c40d8707115ca 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/my_quantity.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/my_quantity.xml
@@ -12,7 +12,9 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list/>
+              <list>
+                <string>editable</string>
+              </list>
             </value>
         </item>
         <item>
@@ -72,6 +74,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_quantity</string> </value>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/my_quantity_unit.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/my_quantity_unit.xml
index db23b069e44050d027b834b7b075c9bf60e104bd..2982e1272c606c27b5f84bd75d287bbdb9ae64fa 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/my_quantity_unit.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/my_quantity_unit.xml
@@ -13,6 +13,7 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>default</string>
                 <string>editable</string>
               </list>
             </value>
@@ -55,6 +56,16 @@
             <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>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -75,7 +86,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key>                 <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -96,4 +111,20 @@
       </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>here/getQuantityUnit</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_destination.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_destination.xml
index d6dd85c5778c8b6cbcbbd45ee85d3ba87b4902e9..9fe3c6d590c99a7366f410165c618b613f254547 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_destination.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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/Item_createRelatedAffectationFormDialog/your_destination_section.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_destination_section.xml
index ef12ad253b9f7c81f283fe395d0586ee72917560..8fa2b43950ea44caf362ec43a2e55ffa3a5bcffb 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_destination_section.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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/Item_createRelatedAffectationFormDialog/your_start_date.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_start_date.xml
index 863bdbb2b2fc9681141a9b793ac76085b9a9e895..11a56326891e4a2c5c8f42f78162d0748aa33631 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_start_date.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_start_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/your_stop_date.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_stop_date.xml
index 03c24c32265589ed1801ffc5a441330c2d555368..5944425fd101c2e2f549138377ec2820af7cc27f 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_stop_date.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_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/your_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_title.xml
index 0119f8da90bcfb4930e1fa7dd9ca5257c11e4e63..7d2fd2c47226cc624aee8ab210584bd23fa21332 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog/your_title.xml
@@ -12,7 +12,9 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list/>
+              <list>
+                <string>required</string>
+              </list>
             </value>
         </item>
         <item>
@@ -80,6 +82,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_viewFieldLibrary.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml
index 18367630cf31e6059e42ce3895bbd6476d351416..218d2651b374c24aa6aa12a644edab1c727fc3f9 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary.xml
@@ -86,8 +86,6 @@
                         <string>your_destination</string>
                         <string>your_destination_section</string>
                         <string>your_site_suggestion</string>
-                        <string>your_source</string>
-                        <string>your_source_section</string>
                         <string>your_start_date</string>
                         <string>your_stop_date</string>
                         <string>your_title</string>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_owner.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_owner.xml
index a2b60f34f4837c740f46d22ff460fc6a2112ad93..f6aa2dafb93145ac899e4d0612acb65c6e2dfd1f 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_owner.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_owner.xml
@@ -87,11 +87,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -109,7 +109,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Current Ower</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_site.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_site.xml
index c93641c72f1a01b918d33a87d35ff0af57d3bf07..1931b256d6b7ca8d7361f9cea9f7fa6a1474ce5e 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_site.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_current_site.xml
@@ -58,13 +58,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -84,7 +84,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -95,11 +95,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -117,7 +117,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Current Site</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_reference.xml
index 1afe01141bb833d8019542a0ce0f2fb3784344d5..6ffa57080094a793293df4aedc193ce48e047dbb 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_reference.xml
@@ -77,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -89,7 +89,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_variation_category_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_variation_category_list.xml
index 3465e93f5c0613a0bed567d85d7265867f0318b0..4dd024fd4c1b62b852275f73693b8193627688be 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_variation_category_list.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_variation_category_list.xml
@@ -67,7 +67,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -92,11 +92,11 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>hash_script_id</string> </key>
+                    <key> <string>hash_script_id</string> </key>
                     <value> <string>Resource_hashVariationCategoryItemList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>size</string> </key>
+                    <key> <string>size</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
@@ -104,7 +104,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Variation</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_start_date.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_start_date.xml
index dce6570d1192cd4ad477802892e280ceca61d7ed..3eeb2b1b68837ee81780c26a94595dc5ed11dcd3 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_start_date.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_start_date.xml
@@ -85,7 +85,7 @@
                     <value> <string>Base_viewDialogFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>input_order</string> </key>
+                    <key> <string>input_order</string> </key>
                     <value> <string>dmy</string> </value>
                 </item>
                 <item>
@@ -93,11 +93,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>timezone_style</string> </key>
+                    <key> <string>timezone_style</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Start Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_stop_date.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_stop_date.xml
index 1039de439df305a2ec4ff15212ca487635d229e4..17acd235b007b3e6fa3a856bf309eb539fb6434a 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_stop_date.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_stop_date.xml
@@ -85,7 +85,7 @@
                     <value> <string>Base_viewDialogFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>input_order</string> </key>
+                    <key> <string>input_order</string> </key>
                     <value> <string>dmy</string> </value>
                 </item>
                 <item>
@@ -93,11 +93,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>timezone_style</string> </key>
+                    <key> <string>timezone_style</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Stop Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_title.xml
index 9053f8c5766f73653f297dc329d565fdf920e14c..ee03ec14727fb0cfacefe852634f6ffc39a56afc 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_title.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/your_title.xml
@@ -75,7 +75,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
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 85b3c0c615f5de100265dfd95ef72695b4d9a494..daf2d0cfd24d6a35fcef41b4cdcca697ac03af08 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
@@ -82,7 +82,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -113,7 +113,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -132,21 +132,21 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Item_viewTrackingList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>item_tracking_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -161,11 +161,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Item Tracking</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>url_columns</string> </key>
+                    <key> <string>url_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_getAggregatedItemValueList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_getAggregatedItemValueList.xml
index 914f5461f193f123da2f3947dd252ca8f8f29e23..2b61a26906f9f17b02f779023a9624ed80ba35d9 100644
--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_getAggregatedItemValueList.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_getAggregatedItemValueList.xml
@@ -132,7 +132,7 @@ return [context.portal_catalog.getObject(uid) for uid in selection_uid_list]\n
                             <string>kw</string>
                             <string>selection_uid_list</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>pl_type</string>
                             <string>pl_line_type</string>
                             <string>pl_cell_type</string>
diff --git a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions.xml b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions.xml
index fe97b3ef58b073661cdb172e4e970e1c6459396c..61f19d835aad719dc95cedb6501029cfdf94a7ae 100644
--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/transitions.xml
@@ -21,6 +21,12 @@
               <dictionary/>
             </value>
         </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>transitions</string> </value>