diff --git a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml
index 523fe6aca2449bd8d5780081990f6cb3b773ac2c..b1f5c2243951c41106c445d103f20d3f128c7ea5 100644
--- a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml
+++ b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml
@@ -82,94 +82,18 @@
                     <key> <string>all_columns</string> </key>
                     <value>
                       <list>
-                        <tuple>
-                          <string>relative_url</string>
-                          <string>Path</string>
-                        </tuple>
-                        <tuple>
-                          <string>portal_type</string>
-                          <string>Type</string>
-                        </tuple>
-                        <tuple>
-                          <string>source_title</string>
-                          <string>Source</string>
-                        </tuple>
-                        <tuple>
-                          <string>destination_title</string>
-                          <string>Destination</string>
-                        </tuple>
-                        <tuple>
-                          <string>resource_title</string>
-                          <string>Resource</string>
-                        </tuple>
-                        <tuple>
-                          <string>variation_title</string>
-                          <string>Variation</string>
-                        </tuple>
-                        <tuple>
-                          <string>quantity</string>
-                          <string>Quantity</string>
-                        </tuple>
                         <tuple>
                           <string>quantity_unit</string>
                           <string>UOM</string>
                         </tuple>
-                        <tuple>
-                          <string>price</string>
-                          <string>Price</string>
-                        </tuple>
                         <tuple>
                           <string>price_currency_reference</string>
                           <string>Currency</string>
                         </tuple>
-                        <tuple>
-                          <string>movement.start_date</string>
-                          <string>Start Date</string>
-                        </tuple>
-                        <tuple>
-                          <string>movement.stop_date</string>
-                          <string>Stop Date</string>
-                        </tuple>
-                        <tuple>
-                          <string>specialise_reference</string>
-                          <string>Specialise Reference</string>
-                        </tuple>
-                        <tuple>
-                          <string>order</string>
-                          <string>Order</string>
-                        </tuple>
-                        <tuple>
-                          <string>order_ratio</string>
-                          <string>O/Rat</string>
-                        </tuple>
-                        <tuple>
-                          <string>delivery</string>
-                          <string>Delivery</string>
-                        </tuple>
-                        <tuple>
-                          <string>delivery_ratio</string>
-                          <string>D/Rat</string>
-                        </tuple>
-                        <tuple>
-                          <string>delivery_error</string>
-                          <string>D/Err</string>
-                        </tuple>
-                        <tuple>
-                          <string>simulation_state</string>
-                          <string>State</string>
-                        </tuple>
-                        <tuple>
-                          <string>causality_state</string>
-                          <string>C/State</string>
-                        </tuple>
                         <tuple>
                           <string>categories_list</string>
                           <string>Categories</string>
                         </tuple>
-                        <tuple>
-                          <string>causality</string>
-                          <string>Causality</string>
-                        </tuple>
                         <tuple>
                           <string>source_section_title</string>
                           <string>Source Section</string>
diff --git a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml
index 7278cac42c7100d6c3b1f3135f90d8d71615b412..5dbb416cac54dd636894351d2beaeecd6cf5d599 100644
--- a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml
+++ b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml
@@ -10,8 +10,8 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>portal_type</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -71,6 +71,10 @@
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -119,7 +123,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: [(x, \'\') for x in here.getPortalDeliveryMovementTypeList()]</string> </value>
+            <value> <string>python: [(x, \'\') for x in here.getPortalDeliveryMovementTypeList() + here.getPortalOrderMovementTypeList()]</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml
index 68a4b473243e98a9d98b79d9e186402a7b900e92..5f9bcd62e61147c8e4b0bdd2e1a5a67afb9c99ff 100644
--- a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml
+++ b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml
@@ -10,8 +10,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
+                <string>enabled</string>
                 <string>portal_type</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -53,6 +54,12 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -64,13 +71,17 @@
                 <item>
                     <key> <string>portal_type</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                      <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>
@@ -78,6 +89,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_relation_field</string> </value>
@@ -112,6 +127,19 @@
     </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>here/getOrder</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
diff --git a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml
index 5e0fe72a42f7159c1ec2504f05f269c636a7fc15..ec2e33813a2e3847af6556ad8875e25bb3aaafa1 100644
--- a/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml
+++ b/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml
@@ -11,6 +11,7 @@
             <value>
               <list>
                 <string>description</string>
+                <string>enabled</string>
                 <string>title</string>
               </list>
             </value>
@@ -53,6 +54,16 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -65,6 +76,10 @@
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -76,6 +91,10 @@
                     <key> <string>description</string> </key>
                     <value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value>
                 </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_percent</string> </value>
@@ -98,4 +117,17 @@
       </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>here/getOrder</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_administration/bt/revision b/bt5/erp5_administration/bt/revision
index 95c8a676e9d535b85485c6a8d1ee1991c9391ad0..c9c41087e2102d5af5f3ea8aa420e47ad3085707 100644
--- a/bt5/erp5_administration/bt/revision
+++ b/bt5/erp5_administration/bt/revision
@@ -1 +1 @@
-113
\ No newline at end of file
+114
\ No newline at end of file