[Erp5-report] r16100 - /erp5/trunk/products/ERP5/Tool/SimulationTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Sep  6 09:59:50 2007
New Revision: 16100

URL: http://svn.erp5.org?rev=16100&view=rev
Log:
Distinguish the case where no group by is given and the case where only a group by resource is given.

Modified:
    erp5/trunk/products/ERP5/Tool/SimulationTool.py

Modified: erp5/trunk/products/ERP5/Tool/SimulationTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/SimulationTool.py?rev=16100&r1=16099&r2=16100&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/SimulationTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/SimulationTool.py Thu Sep  6 09:59:50 2007
@@ -821,7 +821,7 @@
         group_by_payment=0,
         group_by_variation=0, group_by_sub_variation=0,
         group_by_movement=0,
-        group_by_resource=1,
+        group_by_resource=None,
         **ignored):
       """
       Set defaults group_by parameters
@@ -837,8 +837,10 @@
         if group_by_node or group_by_mirror_node or group_by_section or \
            group_by_mirror_section or group_by_payment or \
            group_by_sub_variation or group_by_variation or group_by_movement:
+          if group_by_resource is None:
+            group_by_resource = 1
           new_group_by_dict['group_by_resource'] = group_by_resource
-        else:
+        elif group_by_resource is None:
           new_group_by_dict['group_by_movement'] = 1
           new_group_by_dict['group_by_node'] = 1
           new_group_by_dict['group_by_resource'] = 1