diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox.xml
index 57517e5f32a3d3e0e571fb865d35eb9ba838cf2f..000b8ce240ec8696f4a3d252f4e1dd11486cc4ee 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/listbox.xml
@@ -12,10 +12,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>list_method</string>
-                <string>selection_name</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -83,16 +80,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Bug_viewFieldLibrary</string> </value>
                 </item>
-                <item>
-                    <key> <string>list_method</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>bug_view_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
@@ -103,20 +90,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>method_name</string> </key>
-            <value> <string>Bug_searchFolder</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_section_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_section_title.xml
index ca49ed8809c47675e7e41355887e8d7000a6eeeb..1d9d3445de871143da63d53f9edc64b6d427c133 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_section_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_destination_section_title.xml
@@ -12,9 +12,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -86,10 +84,6 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Client</string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_project_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_project_title.xml
index d87989c5bacefb66dfdf2966c552766b8ac0cdd4..7b2ee30caf06003f980a0093c2d601f0cc678e21 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_project_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_project_title.xml
@@ -12,9 +12,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -90,10 +88,6 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Handled Project</string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_section_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_section_title.xml
index b83e3c851aab81da38359200f83cbb8170be0c2c..4aac7e39bb2e58b0bd87570cca3e3bc00a877490 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_section_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_section_title.xml
@@ -13,7 +13,6 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>base_category</string>
                 <string>portal_type</string>
                 <string>catalog_index</string>
@@ -87,11 +86,11 @@
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_relation_field</string> </value>
+                    <value> <string>my_source_section_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
+                    <value> <string>Bug_viewFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>portal_type</string> </key>
@@ -108,10 +107,6 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Supplier</string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_trade_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_trade_title.xml
index d1507c189bc1b168a21a459378c686f4503dfa0e..858ecf758e1f38640020025febe5b276d34c05c4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_trade_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_source_trade_title.xml
@@ -12,12 +12,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>base_category</string>
-                <string>portal_type</string>
-                <string>catalog_index</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -77,45 +72,18 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>base_category</string> </key>
-                    <value> <string>source_trade</string> </value>
-                </item>
-                <item>
-                    <key> <string>catalog_index</string> </key>
-                    <value> <string>title</string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_relation_field</string> </value>
+                    <value> <string>my_source_trade_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>portal_type</string> </key>
-                    <value>
-                      <list>
-                        <tuple>
-                          <string>Organisation</string>
-                          <string>Organisation</string>
-                        </tuple>
-                        <tuple>
-                          <string>Person</string>
-                          <string>Person</string>
-                        </tuple>
-                      </list>
-                    </value>
+                    <value> <string>Bug_viewFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Reporter</string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary.xml
index 8e049303d067990ec9c6af37308ffc492ee13091..14e3b35f76f7feec06e5de76d3bbecebca0b981e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary.xml
@@ -98,7 +98,6 @@
                         <string>my_title</string>
                         <string>my_destination_title</string>
                         <string>my_source_title</string>
-                        <string>my_destination_decision_title</string>
                         <string>my_destination_section_title</string>
                         <string>my_source_decision_title</string>
                         <string>my_source_section_title</string>
@@ -106,6 +105,7 @@
                         <string>listbox</string>
                         <string>my_destination_project_title</string>
                         <string>my_source_project_title</string>
+                        <string>my_source_trade_title</string>
                       </list>
                     </value>
                 </item>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_project_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_project_title.xml
index 8a14a6abae3b2f1cc707ef98f70c9138c84f7e61..1471d0cf03a9f236d6f3969bcf174c115f4a7599 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_project_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_project_title.xml
@@ -118,7 +118,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Destination Project</string> </value>
+                    <value> <string>Requested Project</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_section_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_section_title.xml
index 9dcf4732ccee3399e17a11d770b619409aa7c656..4a1d9a803c87b1b1ea4bc73a1a39d1be56c7f3ad 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_section_title.xml
@@ -13,10 +13,10 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
               </list>
             </value>
         </item>
@@ -114,7 +114,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Destination Section</string> </value>
+                    <value> <string>Client</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_project_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_project_title.xml
index c0fb97d551476521ae4635eb00a52c2e6b30890d..1a6b92d667fa01b27635d245c10f8215aa29fc4a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_project_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_project_title.xml
@@ -122,7 +122,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Source Project</string> </value>
+                    <value> <string>Handled Project</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_section_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_section_title.xml
index e0d3c13293a9113dd0e54da311edaec0b401afcd..b83e3c851aab81da38359200f83cbb8170be0c2c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_section_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_section_title.xml
@@ -110,7 +110,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Billing Supplier</string> </value>
+                    <value> <string>Supplier</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_decision_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_trade_title.xml
similarity index 91%
rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_decision_title.xml
rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_trade_title.xml
index 63308b912d53af41b5fa265863d2046a57534974..d1507c189bc1b168a21a459378c686f4503dfa0e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_source_trade_title.xml
@@ -22,7 +22,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_destination_decision_title</string> </value>
+            <value> <string>my_source_trade_title</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -79,7 +79,7 @@
               <dictionary>
                 <item>
                     <key> <string>base_category</string> </key>
-                    <value> <string>destination_decision</string> </value>
+                    <value> <string>source_trade</string> </value>
                 </item>
                 <item>
                     <key> <string>catalog_index</string> </key>
@@ -97,6 +97,10 @@
                     <key> <string>portal_type</string> </key>
                     <value>
                       <list>
+                        <tuple>
+                          <string>Organisation</string>
+                          <string>Organisation</string>
+                        </tuple>
                         <tuple>
                           <string>Person</string>
                           <string>Person</string>
@@ -110,7 +114,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Destination Decision</string> </value>
+                    <value> <string>Reporter</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_title.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_title.xml
index e7d3e7203dbeee681fc4cfc33cd268d56ecf48d9..f29ca76d0358ec95ea0b732e859934076ed2e4b0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_viewFieldLibrary/my_title.xml
@@ -13,7 +13,6 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>required</string>
                 <string>display_width</string>
               </list>
             </value>
@@ -87,10 +86,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_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_forge/bt/revision b/bt5/erp5_forge/bt/revision
index 43f9cb64132d45b9914202fd5b6153004aa5d34a..93168a9d7cec7eefa2ecc7330eb300600952b051 100644
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
@@ -1 +1 @@
-396
\ No newline at end of file
+398
\ No newline at end of file