[Erp5-report] r41355 jerome - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Dec 10 18:42:33 2010
New Revision: 41355

URL: http://svn.erp5.org?rev=41355&view=rev
Log:
- do not pass output here, otherwise this report does not work when issued in a date that is before the date of the last movement of an item
- pass variation_text to benefit from SQL filtering

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml?rev=41355&r1=41354&r2=41355&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Inventory_getAggregatedItemList.xml [utf8] Fri Dec 10 18:42:33 2010
@@ -63,21 +63,20 @@ tracking_parameters = dict(\n
     node_uid=brain.node_uid,\n
     resource_uid=brain.resource_uid,\n
     at_date=at_date,\n
-    output=True,)\n
+    )\n
 \n
 result_list = []\n
 \n
-current_variation = context.getVariationCategoryList()\n
+if context.getVariationCategoryList():\n
+  tracking_parameters[\'variation_text\'] = brain.variation_text\n
+\n
 \n
 for tracking_brain in portal.portal_simulation.getCurrentTrackingList(\n
                             **tracking_parameters):\n
   item = tracking_brain.getObject()\n
  \n
-  if current_variation and\\\n
-        item.Item_getVariationCategoryList(at_date=at_date) != current_variation:\n
-    continue\n
-\n
-  item_dict = "%s : %s"% ( item.getReference(), item.getQuantity(at_date=at_date) )\n
+  item_dict = "%s : %s"% ( item.getReference(),\n
+                           item.getQuantity(at_date=at_date) )\n
   result_list.append(item_dict)\n
 \n
 return result_list\n
@@ -126,10 +125,9 @@ return result_list\n
                             <string>request</string>
                             <string>brain</string>
                             <string>dict</string>
-                            <string>True</string>
                             <string>tracking_parameters</string>
                             <string>result_list</string>
-                            <string>current_variation</string>
+                            <string>_write_</string>
                             <string>_getiter_</string>
                             <string>_apply_</string>
                             <string>tracking_brain</string>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=41355&r1=41354&r2=41355&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Fri Dec 10 18:42:33 2010
@@ -1 +1 @@
-1088
\ No newline at end of file
+1089
\ No newline at end of file