[Erp5-report] r38080 jm - in /erp5/trunk/bt5/erp5_administration: SkinTemplateItem/portal_s...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Aug 31 19:50:43 CEST 2010


Author: jm
Date: Tue Aug 31 19:50:42 2010
New Revision: 38080

URL: http://svn.erp5.org?rev=38080&view=rev
Log:
Hide deprecated 'order' if unset and fix jump to delivery (in case of order line)

Modified:
    erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml
    erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml
    erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml
    erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml
    erp5/trunk/bt5/erp5_administration/bt/revision

Modified: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml?rev=38080&r1=38079&r2=38080&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/applied_rule_listbox.xml [utf8] Tue Aug 31 19:50:42 2010
@@ -83,94 +83,18 @@
                     <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>
                         </tuple>

Modified: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml?rev=38080&r1=38079&r2=38080&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_delivery.xml [utf8] Tue Aug 31 19:50:42 2010
@@ -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>

Modified: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml?rev=38080&r1=38079&r2=38080&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order.xml [utf8] Tue Aug 31 19:50:42 2010
@@ -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>
@@ -54,6 +55,12 @@
             <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>
                 </item>
@@ -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>
@@ -79,6 +90,10 @@
             <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>
                 </item>
@@ -119,6 +134,19 @@
       <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>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
             <value> <string>python: [(x, \'\') for x in here.getPortalOrderMovementTypeList()]</string> </value>
         </item>
       </dictionary>

Modified: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml?rev=38080&r1=38079&r2=38080&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Base_viewAdministrationFieldLibrary/my_order_ratio.xml [utf8] Tue Aug 31 19:50:42 2010
@@ -11,6 +11,7 @@
             <value>
               <list>
                 <string>description</string>
+                <string>enabled</string>
                 <string>title</string>
               </list>
             </value>
@@ -54,6 +55,16 @@
             <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>
                 </item>
@@ -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>
@@ -77,6 +92,10 @@
                     <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>
                 </item>
@@ -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>

Modified: erp5/trunk/bt5/erp5_administration/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/bt/revision?rev=38080&r1=38079&r2=38080&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/bt/revision [utf8] Tue Aug 31 19:50:42 2010
@@ -1 +1 @@
-113
\ No newline at end of file
+114
\ No newline at end of file




More information about the Erp5-report mailing list