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

[nobody at svn.erp5.org]

Author: jm
Date: Fri Sep  4 13:15:19 2009
New Revision: 28825

URL: http://svn.erp5.org?rev=28825&view=rev
Log:
Fix columns of Base_viewStockReportBySite

Added:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml
      - copied unchanged from r28500, erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml
Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml?rev=28825&r1=28824&r2=28825&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite.xml [utf8] Fri Sep  4 13:15:19 2009
@@ -94,6 +94,7 @@
                       <list>
                         <string>listbox_quantity_unit</string>
                         <string>listbox_variation_category_item_list</string>
+                        <string>listbox_aggregate_title_list</string>
                       </list>
                     </value>
                 </item>
@@ -103,7 +104,6 @@
                       <list>
                         <string>your_site_title</string>
                         <string>your_at_date</string>
-                        <string>listbox_aggregate_title_list</string>
                       </list>
                     </value>
                 </item>

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml?rev=28825&r1=28824&r2=28825&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml [utf8] Fri Sep  4 13:15:19 2009
@@ -133,11 +133,7 @@
                           <string>Variation</string>
                         </tuple>
                         <tuple>
-                          <string>aggregate_title_list</string>
-                          <string>Items aggregated</string>
-                        </tuple>
-                        <tuple>
-                          <string>getInventory</string>
+                          <string>inventory</string>
                           <string>Stock</string>
                         </tuple>
                         <tuple>
@@ -224,7 +220,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>context/Inventory_getStockReportBySiteDialogListboxColumnList</string> </value>
+            <value> <string>python: field.get_orig_value(\'columns\') + (context.REQUEST.form.get("item_stock") == 1 and [(\'aggregate_title_list\',\'Items aggregated\')] or [])</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=28825&r1=28824&r2=28825&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Fri Sep  4 13:15:19 2009
@@ -1,1 +1,1 @@
-730
+731