From 4345ae60a644e19ccb850c68d7c826fec8081efe Mon Sep 17 00:00:00 2001
From: Mame Coumba Sall <mame@nexedi.com>
Date: Wed, 5 Feb 2014 15:32:23 +0000
Subject: [PATCH] More proxification

---
 .../OrderMilestone_view/my_description.xml    |  4 +-
 .../my_destination_title.xml                  | 34 +-------
 .../OrderMilestone_view/my_int_index.xml      | 12 +--
 .../OrderMilestone_view/my_price.xml          |  4 +-
 .../OrderMilestone_view/my_reference.xml      | 12 +--
 .../OrderMilestone_view/my_start_date.xml     |  4 +-
 .../OrderMilestone_view/my_stop_date.xml      |  4 +-
 .../OrderMilestone_view/my_title.xml          |  4 +-
 .../your_description.xml                      | 38 +--------
 .../your_destination.xml                      | 40 +--------
 .../your_destination_decision.xml             | 33 +-------
 .../your_destination_section.xml              | 72 +----------------
 .../your_price_currency.xml                   | 81 +------------------
 .../your_reference.xml                        |  2 +-
 .../your_source.xml                           | 35 +-------
 .../your_source_project.xml                   | 52 +-----------
 .../your_source_section.xml                   | 33 +-------
 .../your_start_date.xml                       | 45 +----------
 .../your_stop_date.xml                        | 45 +----------
 .../your_task_line_price.xml                  | 45 +----------
 .../your_task_line_quantity.xml               | 40 +--------
 .../your_task_line_quantity_unit.xml          | 81 +------------------
 .../your_task_line_resource.xml               | 33 +-------
 .../your_title.xml                            |  2 +-
 .../listbox_int_index.xml                     | 12 ++-
 .../my_description.xml                        | 12 ++-
 .../SaleOrder_viewMilestone/my_reference.xml  |  4 +-
 .../my_requirement_title.xml                  |  2 +-
 .../SaleOrder_viewMilestone/my_start_date.xml |  2 +-
 .../SaleOrder_viewMilestone/my_stop_date.xml  |  2 +-
 .../SaleOrder_viewMilestone/my_title.xml      |  2 +-
 .../my_translated_simulation_state_title.xml  | 12 ++-
 .../TradeLine_viewProject/my_description.xml  |  4 +-
 .../my_destination_project_title.xml          | 16 +---
 .../my_outcome_description.xml                | 17 +---
 .../my_predecessor_title_list.xml             | 76 +----------------
 .../my_requirement_logical_path_list.xml      | 16 +---
 .../my_requirement_reference_list.xml         | 18 +----
 .../my_source_project_title.xml               | 16 +---
 .../TradeLine_viewProject/my_title.xml        |  4 +-
 bt5/erp5_project/bt/revision                  |  2 +-
 41 files changed, 107 insertions(+), 865 deletions(-)

diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_description.xml
index 407313748d..0d8a385b1a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_description.xml
@@ -71,11 +71,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_description</string> </value>
+                    <value> <string>my_description</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_destination_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_destination_title.xml
index dc2d6b7ae2..7a89a23c38 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_destination_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_destination_title.xml
@@ -9,12 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>catalog_index</string>
-                <string>portal_type</string>
-                <string>base_category</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -74,41 +69,18 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>base_category</string> </key>
-                    <value> <string>destination</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_view_mode_destination_title</string> </value>
+                    <value> <string>my_destination_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>portal_type</string> </key>
-                    <value>
-                      <list>
-                        <tuple>
-                          <string>Organisation</string>
-                          <string>Organisation</string>
-                        </tuple>
-                      </list>
-                    </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>Destination</string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_int_index.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_int_index.xml
index faa3c3d47e..97a8bec0b7 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_int_index.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_int_index.xml
@@ -9,9 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>display_width</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -71,17 +69,13 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <int>20</int> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_int_index</string> </value>
+                    <value> <string>my_int_index</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_price.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_price.xml
index ea99a27d2b..89075e98e2 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_price.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_price.xml
@@ -71,11 +71,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_price</string> </value>
+                    <value> <string>my_price</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_reference.xml
index 0664a77eb2..971da4ecb0 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_reference.xml
@@ -9,9 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>display_width</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -71,17 +69,13 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <int>20</int> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_reference</string> </value>
+                    <value> <string>my_reference</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_start_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_start_date.xml
index 73891fd7c8..f427f34677 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_start_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_start_date.xml
@@ -71,11 +71,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_start_date</string> </value>
+                    <value> <string>my_start_date</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_stop_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_stop_date.xml
index f749367c59..71e3ff85bf 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_stop_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_stop_date.xml
@@ -71,11 +71,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_listbox_stop_date</string> </value>
+                    <value> <string>my_stop_date</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_title.xml
index 52bff3e19d..027495eb70 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/OrderMilestone_view/my_title.xml
@@ -71,11 +71,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_title</string> </value>
+                    <value> <string>my_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_description.xml
index ad394609b4..8120cd12fc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_description.xml
@@ -9,11 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>whitespace_preserve</string>
-                <string>width</string>
-                <string>default</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -54,12 +50,6 @@
             <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>
@@ -85,40 +75,16 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>width</string> </key>
-                    <value> <int>40</int> </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>here/getDescription</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination.xml
index 8e9a6a9e33..dd21b5403a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination.xml
@@ -9,11 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>first_item</string>
-                <string>title</string>
-                <string>items</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -62,12 +58,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -81,44 +71,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>your_category</string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <string>my_dialog_mode_category</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewDialogFieldLibrary</string> </value>
+                    <value> <string>Base_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>Location</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.getDestinationTitle(), here.getDestinationRelativeUrl()), (\'\', \'\')]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_decision.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_decision.xml
index ca21820a64..5b2e8d4fe0 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_decision.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_decision.xml
@@ -9,10 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>items</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -61,12 +58,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -80,7 +71,7 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_category</string> </value>
+                    <value> <string>my_dialog_mode_category</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
@@ -90,30 +81,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Requester</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:[(x.getTitle(), x.getRelativeUrl()) for x in here.getSourceTradeValueList()] + [(context.portal_catalog.getResultValue(portal_type=\'Person\', reference=context.portal_membership.getAuthenticatedMember()).getTitle(), context.portal_catalog.getResultValue(portal_type=\'Person\', reference=context.portal_membership.getAuthenticatedMember()).getRelativeUrl())] + [(\'\', \'\')]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_section.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_section.xml
index 82293dbe4a..58e0e1318f 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_section.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_section.xml
@@ -9,13 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>default</string>
-                <string>first_item</string>
-                <string>items</string>
-                <string>required</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -56,40 +50,18 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
@@ -97,60 +69,22 @@
             <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_section_category</string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <string>my_dialog_mode_category</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewDialogFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
+                    <value> <string>Base_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>Client</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.getDestinationTitle(), here.getDestinationRelativeUrl()), (\'\', \'\')]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_price_currency.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_price_currency.xml
index aeab7b2225..82af69c3bd 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_price_currency.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_price_currency.xml
@@ -9,12 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>default</string>
-                <string>first_item</string>
-                <string>items</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -55,38 +50,18 @@
             <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>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>form_id</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>target</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
@@ -94,72 +69,22 @@
             <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>my_category</string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <string>my_price_currency</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <list/>
-                    </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>Currency</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>here/getPriceCurrency</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_reference.xml
index cf44d4d9d1..fe1eee61bd 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_reference.xml
@@ -87,7 +87,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Task_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source.xml
index 8422a116be..1646a9636d 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source.xml
@@ -9,10 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>items</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -61,12 +58,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -80,40 +71,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>your_category</string> </value>
+                    <value> <string>my_dialog_mode_category</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewDialogFieldLibrary</string> </value>
+                    <value> <string>Base_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>Assignee</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: [(x.getTitle(), x.getRelativeUrl()) for x in here.getSourceTradeValueList()] + [(\'\', \'\')]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source_project.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source_project.xml
index 0d9400d71f..e16f696ac0 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source_project.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source_project.xml
@@ -9,11 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>first_item</string>
-                <string>items</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -58,28 +54,14 @@
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
@@ -89,50 +71,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_category</string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <string>my_dialog_mode_category</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <list/>
-                    </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>Project</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.portal_catalog.getResultValue(relative_url=x).getTitle(), x) for x in here.getSourceProjectList()] + [(\'\', \'\')]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source_section.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source_section.xml
index 5328791c47..924b74947a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source_section.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_source_section.xml
@@ -9,10 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>items</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -61,12 +58,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -80,7 +71,7 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_category</string> </value>
+                    <value> <string>my_dialog_mode_category</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
@@ -90,30 +81,10 @@
                     <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>
       </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: [(x.getTitle(), x.getRelativeUrl()) for x in here.getSourceTradeValueList()] + [(\'\', \'\')]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_start_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_start_date.xml
index f962599610..6f08eeb9ec 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_start_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_start_date.xml
@@ -9,12 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>timezone_style</string>
-                <string>input_order</string>
-                <string>default</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -55,12 +50,6 @@
             <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>
@@ -82,48 +71,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>your_date</string> </value>
+                    <value> <string>my_start_date</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewDialogFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>input_order</string> </key>
-                    <value> <string>dmy</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>timezone_style</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Start Date</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.getStartDate()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_stop_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_stop_date.xml
index 9cc081f6fc..59758e3246 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_stop_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_stop_date.xml
@@ -9,12 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>timezone_style</string>
-                <string>input_order</string>
-                <string>default</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -55,12 +50,6 @@
             <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>
@@ -82,48 +71,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>your_date</string> </value>
+                    <value> <string>my_stop_date</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewDialogFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>input_order</string> </key>
-                    <value> <string>dmy</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>timezone_style</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Stop Date</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.getStopDate()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_price.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_price.xml
index dd9c7374bb..84ad48576e 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_price.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_price.xml
@@ -9,12 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>precision</string>
-                <string>input_style</string>
-                <string>default</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -55,12 +50,6 @@
             <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>
@@ -82,48 +71,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_money_quantity</string> </value>
+                    <value> <string>my_task_line_price</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>input_style</string> </key>
-                    <value> <string>-1234.5</string> </value>
-                </item>
-                <item>
-                    <key> <string>precision</string> </key>
-                    <value> <int>2</int> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>Default Price</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>here/getDefaultPrice</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity.xml
index 6078dddb82..9447d44281 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity.xml
@@ -9,11 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>input_style</string>
-                <string>default</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -54,12 +50,6 @@
             <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>
@@ -81,44 +71,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_money_quantity</string> </value>
+                    <value> <string>my_task_line_quantity</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>input_style</string> </key>
-                    <value> <string>-1234.5</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>Quantity</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>here/getQuantity</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity_unit.xml
index b25eb19f00..9daa9a4f68 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity_unit.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity_unit.xml
@@ -9,12 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>default</string>
-                <string>first_item</string>
-                <string>items</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -55,38 +50,18 @@
             <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>first_item</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>form_id</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>target</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
@@ -94,72 +69,22 @@
             <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>my_category</string> </value>
-                </item>
-                <item>
-                    <key> <string>first_item</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <string>my_task_line_quantity_unit</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <list/>
-                    </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>Quantity Unit</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>here/getQuantityUnit</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: getattr(here.portal_categories[\'quantity_unit\'], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_resource.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_resource.xml
index 3e4b692f8d..0c60869035 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_resource.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_resource.xml
@@ -9,10 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>items</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -61,12 +58,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>items</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -80,7 +71,7 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_category</string> </value>
+                    <value> <string>my_dialog_mode_category</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
@@ -90,30 +81,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Service</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: [(x.getTitle(), x.getRelativeUrl()) for x in here.portal_catalog(portal_type=\'Service\')] + [(\'\', \'\')]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_title.xml
index 0bfe2056ac..fc5f1ef838 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_title.xml
@@ -133,7 +133,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Task_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/listbox_int_index.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/listbox_int_index.xml
index d958d410d5..1901d4c431 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/listbox_int_index.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/listbox_int_index.xml
@@ -9,7 +9,9 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list/>
+              <list>
+                <string>title</string>
+              </list>
             </value>
         </item>
         <item>
@@ -71,16 +73,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_integer_value</string> </value>
+                    <value> <string>my_int_index</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>Integer Field</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_description.xml
index 407313748d..e2922b3ead 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_description.xml
@@ -9,7 +9,9 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list/>
+              <list>
+                <string>whitespace_preserve</string>
+              </list>
             </value>
         </item>
         <item>
@@ -71,16 +73,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_description</string> </value>
+                    <value> <string>my_description</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_reference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_reference.xml
index 0bb8ef4f85..971da4ecb0 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_reference.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_reference.xml
@@ -71,11 +71,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_reference</string> </value>
+                    <value> <string>my_reference</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_requirement_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_requirement_title.xml
index 2edf68ae71..7bf0950228 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_requirement_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_requirement_title.xml
@@ -75,7 +75,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Project_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_start_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_start_date.xml
index 8ff7af92a5..963a5d3431 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_start_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_start_date.xml
@@ -153,7 +153,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Project_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_stop_date.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_stop_date.xml
index 3038fb23af..055dcc0c26 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_stop_date.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_stop_date.xml
@@ -153,7 +153,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Project_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_title.xml
index a5ea0be716..4c1a0dcc59 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_title.xml
@@ -153,7 +153,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Project_viewFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_translated_simulation_state_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_translated_simulation_state_title.xml
index c21dc0437d..65cae47d31 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_translated_simulation_state_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/my_translated_simulation_state_title.xml
@@ -9,7 +9,9 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list/>
+              <list>
+                <string>title</string>
+              </list>
             </value>
         </item>
         <item>
@@ -71,16 +73,20 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_translated_simulation_state_title</string> </value>
+                    <value> <string>my_translated_simulation_state_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>State</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_description.xml
index 407313748d..0d8a385b1a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_description.xml
@@ -71,11 +71,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_description</string> </value>
+                    <value> <string>my_description</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_destination_project_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_destination_project_title.xml
index 1c13aa13a3..7fe9e2e0e3 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_destination_project_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_destination_project_title.xml
@@ -31,10 +31,6 @@
             <key> <string>overrides</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -54,10 +50,6 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -77,19 +69,13 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_destination_project_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>BaseTradeProject_FieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_outcome_description.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_outcome_description.xml
index daf81b7689..e027fe52bd 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_outcome_description.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_outcome_description.xml
@@ -9,10 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>height</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -74,24 +71,16 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_description</string> </value>
+                    <value> <string>my_outcome_description</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>height</string> </key>
-                    <value> <int>2</int> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>Outcome</string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_predecessor_title_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_predecessor_title_list.xml
index 808dfea083..ea403e96e1 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_predecessor_title_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_predecessor_title_list.xml
@@ -9,15 +9,7 @@
         <item>
             <key> <string>delegated_list</string> </key>
             <value>
-              <list>
-                <string>title</string>
-                <string>catalog_index</string>
-                <string>portal_type</string>
-                <string>height</string>
-                <string>width</string>
-                <string>base_category</string>
-                <string>parameter_list</string>
-              </list>
+              <list/>
             </value>
         </item>
         <item>
@@ -66,12 +58,6 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>parameter_list</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -83,78 +69,22 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>base_category</string> </key>
-                    <value> <string>predecessor</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_multi_relation_field</string> </value>
+                    <value> <string>my_predecessor_title_list</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewFieldLibrary</string> </value>
-                </item>
-                <item>
-                    <key> <string>height</string> </key>
-                    <value> <int>4</int> </value>
-                </item>
-                <item>
-                    <key> <string>portal_type</string> </key>
-                    <value>
-                      <list>
-                        <tuple>
-                          <string>Sale Order Line</string>
-                          <string>Sale Order Line</string>
-                        </tuple>
-                        <tuple>
-                          <string>Sale Order Milestone</string>
-                          <string>Sale Order Milestone</string>
-                        </tuple>
-                        <tuple>
-                          <string>Sale Packing List Line</string>
-                          <string>Sale Packing List Line</string>
-                        </tuple>
-                        <tuple>
-                          <string>Sale Packing List Milestone</string>
-                          <string>Sale Packing List Milestone</string>
-                        </tuple>
-                      </list>
-                    </value>
+                    <value> <string>Base_viewProjectFieldLibrary</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>Predecessor</string> </value>
-                </item>
-                <item>
-                    <key> <string>width</string> </key>
-                    <value> <int>30</int> </value>
-                </item>
               </dictionary>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: [(\'parent_uid\', here.getParentUid())]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_requirement_logical_path_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_requirement_logical_path_list.xml
index 224d658899..b1258327b0 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_requirement_logical_path_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_requirement_logical_path_list.xml
@@ -31,10 +31,6 @@
             <key> <string>overrides</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -54,10 +50,6 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -77,19 +69,13 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_requirement_logical_path_list</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>BaseTradeProject_FieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_requirement_reference_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_requirement_reference_list.xml
index 666c042660..d5d8bd5bff 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_requirement_reference_list.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_requirement_reference_list.xml
@@ -31,10 +31,6 @@
             <key> <string>overrides</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -54,10 +50,6 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -77,19 +69,13 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_requirement_reference_list</string> </value>
+                    <value> <string>my_multi_relation_field</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>BaseTradeProject_FieldLibrary</string> </value>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_source_project_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_source_project_title.xml
index dc0bf13e43..0a36c5e7f9 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_source_project_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_source_project_title.xml
@@ -31,10 +31,6 @@
             <key> <string>overrides</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -54,10 +50,6 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -77,19 +69,13 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>extra_context</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_source_project_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>BaseTradeProject_FieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_title.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_title.xml
index 52bff3e19d..027495eb70 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_title.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/TradeLine_viewProject/my_title.xml
@@ -71,11 +71,11 @@
               <dictionary>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_view_mode_title</string> </value>
+                    <value> <string>my_title</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewTradeFieldLibrary</string> </value>
+                    <value> <string>Base_viewProjectFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 6a34de5d27..2e947168c9 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-843
\ No newline at end of file
+844
\ No newline at end of file
-- 
2.30.9