[Erp5-report] r28435 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Aug 18 11:33:47 2009
New Revision: 28435

URL: http://svn.erp5.org?rev=28435&view=rev
Log:
- use preferred sales use in the sale order fast input
- extend a bit Base_getResourceItemList to display or not the default quantity unit of the resource in the title

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getResourceItemList.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getResourceItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getResourceItemList.xml?rev=28435&r1=28434&r2=28435&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getResourceItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getResourceItemList.xml [utf8] Tue Aug 18 11:33:47 2009
@@ -78,7 +78,7 @@
                validation_state=validation_state,\n
                sort_on=((\'portal_type\', \'asc\'),\n
                         (\'title\', \'asc\'))) :\n
-  if resource.getQuantityUnit():\n
+  if show_default_quantity_unit and resource.getQuantityUnit():\n
     result.append(\n
      (\'%s (%s)\' % (resource.getTitle(),\n
                    translateString(resource.getQuantityUnitTitle()),),\n
@@ -101,7 +101,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>use_list, validation_state=\'validated\', portal_type=None</string> </value>
+            <value> <string>use_list, validation_state=\'validated\', portal_type=None, show_default_quantity_unit=True</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -121,7 +121,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>3</int> </value>
+                        <value> <int>4</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -130,6 +130,7 @@
                             <string>use_list</string>
                             <string>validation_state</string>
                             <string>portal_type</string>
+                            <string>show_default_quantity_unit</string>
                             <string>_getitem_</string>
                             <string>_getattr_</string>
                             <string>container</string>
@@ -161,6 +162,7 @@
               <tuple>
                 <string>validated</string>
                 <none/>
+                <int>1</int>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml?rev=28435&r1=28434&r2=28435&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml [utf8] Tue Aug 18 11:33:47 2009
@@ -13,9 +13,9 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>default</string>
                 <string>items</string>
+                <string>title</string>
               </list>
             </value>
         </item>
@@ -133,7 +133,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: [(\'\', \'\')] + [(x.getTitle(), x.getRelativeUrl()) for x in here.portal_catalog(portal_type=[\'Product\',\'Service\'])]</string> </value>
+            <value> <string>python: context.Base_getResourceItemList(use_list=preferences.getPreferredPurchaseUseList(), validation_state=\'validated\', show_default_quantity_unit=False)</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=28435&r1=28434&r2=28435&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Tue Aug 18 11:33:47 2009
@@ -1,1 +1,1 @@
-716
+717