[Erp5-report] r36810 jerome - in /erp5/trunk/bt5/erp5_budget: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Jul  2 15:54:46 2010
New Revision: 36810

URL: http://svn.erp5.org?rev=36810&view=rev
Log:
- Don't fail if there are the cell range is empty on the budget line
- If we make a report based on section category, filter directly budgets that have a budget level variation on group and this group is not member of section category.

Modified:
    erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml
    erp5/trunk/bt5/erp5_budget/bt/revision

Modified: erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml?rev=36810&r1=36809&r2=36810&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml [utf8] Fri Jul  2 15:54:46 2010
@@ -83,15 +83,31 @@ else:\n
   budget_list = portal.portal_catalog.searchResults(\n
                                 portal_type=\'Budget\',\n
                                 validation_state=validation_state)\n
+\n
+  group_filtered_budget_list = []\n
+  filtered_budget_list = []\n
+  for budget in budget_list:\n
+    budget = budget.getObject()\n
+    if \'group\' in budget.getVariationBaseCategoryList():\n
+      group_matches = False\n
+      for category in budget.getVariationCategoryList():\n
+        if category.startswith(defined_group): \n
+          group_matches = True\n
+          break\n
+    if not group_matches:\n
+      continue\n
+    group_filtered_budget_list.append(budget)\n
+\n
   if from_date or at_date:\n
-    new_budget_list = []\n
-    for budget in budget_list:\n
+    for budget in group_filtered_budget_list:\n
       if from_date and budget.getStartDateRangeMax() < from_date:\n
         continue\n
       if at_date and budget.getStartDateRangeMin() > at_date:\n
         continue\n
-      new_budget_list.append(budget)\n
-    budget_list = new_budget_list\n
+      filtered_budget_list.append(budget)\n
+    group_filtered_budget_list = filtered_budget_list\n
+\n
+  budget_list = group_filtered_budget_list\n
 \n
 line_list = []\n
 \n
@@ -151,6 +167,8 @@ for budget in budget_list:\n
     level_1_line_list = []\n
 \n
     budget_line_cell_range = budget_line.BudgetLine_asCellRange()\n
+    if len(budget_line_cell_range) == 0:\n
+      continue\n
     if len(budget_line_cell_range) == 1:\n
       # if there\'s only one dimension, we add a virtual level 2, to keep the\n
       # same structure\n
@@ -413,8 +431,12 @@ return pformat(line_list)\n
                             <string>from_date</string>
                             <string>at_date</string>
                             <string>validation_state</string>
-                            <string>new_budget_list</string>
+                            <string>group_filtered_budget_list</string>
+                            <string>filtered_budget_list</string>
                             <string>budget</string>
+                            <string>False</string>
+                            <string>group_matches</string>
+                            <string>True</string>
                             <string>line_list</string>
                             <string>None</string>
                             <string>target_currency_title</string>
@@ -422,7 +444,6 @@ return pformat(line_list)\n
                             <string>conversion_ratio</string>
                             <string>isVisibleCell</string>
                             <string>dict</string>
-                            <string>True</string>
                             <string>budget_line</string>
                             <string>total_level_1_initial_budget</string>
                             <string>total_level_1_current_budget</string>

Modified: erp5/trunk/bt5/erp5_budget/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/bt/revision?rev=36810&r1=36809&r2=36810&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_budget/bt/revision [utf8] Fri Jul  2 15:54:46 2010
@@ -1 +1 @@
-285
\ No newline at end of file
+287
\ No newline at end of file