[Erp5-report] r43820 seb - in /erp5/trunk/bt5/erp5_project: SkinTemplateItem/portal_skins/e...

[nobody at svn.erp5.org]

Author: seb
Date: Mon Feb 28 16:39:44 2011
New Revision: 43820

URL: http://svn.erp5.org?rev=43820&view=rev
Log:
* remove some logs
* take into account simulation movement because task lines are not accountable

Modified:
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml
    erp5/trunk/bt5/erp5_project/bt/revision

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml?rev=43820&r1=43819&r2=43820&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml [utf8] Mon Feb 28 16:39:44 2011
@@ -94,22 +94,18 @@ result_list = []\n
 # Launch report only if we have restrictive parameters in inventory_kw,\n
 # otherwise getInventoryList will take all task reports and this will\n
 # kill the current node\n
-from Products.ERP5Type.Log import log\n
-log(\'simulation_state_set\', simulation_state_set)\n
 if len(inventory_kw):\n
   before_confirmed_task_state_set = set(portal.getPortalPlannedOrderStateList() + \\\n
            portal.getPortalDraftOrderStateList())\n
   task_state_set = simulation_state_set.intersection(before_confirmed_task_state_set)\n
-  log(\'task_state_set\', task_state_set)\n
   if len(task_state_set):\n
     result_list.extend(portal.portal_simulation.getInventoryList(\n
                   simulation_state = [x for x in task_state_set],\n
-                  portal_type=\'Task Line\',\n
+                  portal_type=[\'Task Line\', \'Simulation Movement\'],\n
                   from_date=from_date,\n
                   at_date=at_date, **inventory_kw))\n
 \n
   task_report_state_set = simulation_state_set.difference(before_confirmed_task_state_set)\n
-  log(\'task_report_state_set\',task_report_state_set)\n
   if len(task_report_state_set):\n
     result_list.extend(portal.portal_simulation.getInventoryList(\n
                   simulation_state = [x for x in task_report_state_set],\n

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=43820&r1=43819&r2=43820&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Mon Feb 28 16:39:44 2011
@@ -1 +1 @@
-796
\ No newline at end of file
+797
\ No newline at end of file