From cf254c131fd1444bdcde50e893fa0516d4a52820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 29 Apr 2015 09:00:30 +0200
Subject: [PATCH] [IMP] mis_builder: query group by

---
 mis_builder/models/mis_builder.py | 25 ++++++++++++++++++++-----
 mis_builder/views/mis_builder.xml |  2 ++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py
index 04b75b4b..56f9b964 100644
--- a/mis_builder/models/mis_builder.py
+++ b/mis_builder/models/mis_builder.py
@@ -261,6 +261,11 @@ class mis_report_query(orm.Model):
                                        store={'mis.report.query':
                                               (lambda self, cr, uid, ids, c={}:
                                                ids, ['field_ids'], 20), }),
+        'groupby': fields.boolean(string="Group by"),
+        'groupby_field_ids': fields.many2many('ir.model.fields',
+                                              'ir_model_fields_'
+                                              'mis_report_query_groupby_rel',
+                                              string='Fields to group by'),
         'date_field': fields.many2one('ir.model.fields', required=True,
                                       string='Date field',
                                       domain=[('ttype', 'in',
@@ -521,11 +526,21 @@ class mis_report_instance_period(orm.Model):
             if obj._columns.get('company_id', False):
                 domain.extend(['|', ('company_id', '=', False),
                                ('company_id', '=', c.company_id.id)])
-            field_names = [field.name for field in query.field_ids]
-            obj_ids = obj.search(cr, uid, domain, context=context)
-            obj_datas = obj.read(
-                cr, uid, obj_ids, field_names, context=context)
-            res[query.name] = [AutoStruct(**d) for d in obj_datas]
+            field_names = [f.name for f in query.field_ids]
+            if not query.groupby:
+                obj_ids = obj.search(cr, uid, domain, context=context)
+                obj_datas = obj.read(
+                    cr, uid, obj_ids, field_names, context=context)
+                res[query.name] = [AutoStruct(**d) for d in obj_datas]
+            else:
+                groupby_field_names = [f.name for f in query.groupby_field_ids]
+                obj_datas = obj.read_group(
+                    cr, uid, domain, field_names, groupby_field_names,
+                    context=context)
+                if groupby_field_names or not obj_datas:
+                    res[query.name] = [AutoStruct(**d) for d in obj_datas]
+                else:
+                    res[query.name] = AutoStruct(**obj_datas[0])
         return res
 
     def _compute(self, cr, uid, lang_id, c, aep, context=None):
diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml
index f7e09a83..cc6e65f2 100644
--- a/mis_builder/views/mis_builder.xml
+++ b/mis_builder/views/mis_builder.xml
@@ -36,6 +36,8 @@
                                 <field name="field_ids" domain="[('model_id', '=', model_id)]" widget="many2many_tags"
                                                         on_change="onchange_field_ids(field_ids, context)"/>
                                 <field name="field_names"/>
+                                <field name="groupby"/>
+                                <field name="groupby_field_ids" domain="[('model_id', '=', model_id)]" widget="many2many_tags"/>
                                 <field name="date_field" domain="[('model_id', '=', model_id), ('ttype', 'in', ('date', 'datetime'))]"/>
                                 <field name="domain"/>
                             </tree>