[Erp5-report] r40983 jerome - /erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Dec 1 16:31:18 CET 2010


Author: jerome
Date: Wed Dec  1 16:31:18 2010
New Revision: 40983

URL: http://svn.erp5.org?rev=40983&view=rev
Log:
fix group by for node budget variations when using category membership on movement.

Modified:
    erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py

Modified: erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py?rev=40983&r1=40982&r2=40983&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py [utf8] Wed Dec  1 16:31:18 2010
@@ -196,10 +196,13 @@ class NodeBudgetVariation(BudgetVariatio
     if axis == 'movement':
       axis = 'default_%s_uid' % base_category
       query_dict['select_list'] = [axis]
-    if axis == 'movement_strict_membership':
+      query_dict['group_by'] = [axis]
+    elif axis == 'movement_strict_membership':
       axis = 'default_strict_%s_uid' % base_category
       query_dict['select_list'] = [axis]
-    query_dict['group_by_%s' % axis] = True
+      query_dict['group_by'] = [axis]
+    else:
+      query_dict['group_by_%s' % axis] = True
 
     # TODO: This is not correct if axis is a category (such as
     # section_category)



More information about the Erp5-report mailing list