From 8621b5cc895d10dcdbf694be61f1ca8a9d87f73e Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 29 Jan 2014 11:39:29 +0100
Subject: [PATCH] [IMP] removes the hardcoded day, month, year values in
 crm.lead.report.assign model and updates the corresponding view (addon
 crm_partner_assign)

bzr revid: ged@openerp.com-20140129103929-f26368pjhswxvzci
---
 .../crm_partner_assign/report/crm_lead_report.py  | 13 +------------
 .../report/crm_lead_report_view.xml               | 15 ++++++++-------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index c7a6b76ee44..572e1796b00 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -30,22 +30,14 @@ class crm_lead_report_assign(osv.osv):
     _auto = False
     _description = "CRM Lead Report"
     _columns = {
-        'year': fields.char('Year', size=64, required=False, readonly=True),
         'partner_assigned_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'grade_id':fields.many2one('res.partner.grade', 'Grade', readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'country_id':fields.many2one('res.country', 'Country', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
-        'month':fields.selection([('01', 'January'), ('02', 'February'), \
-                                  ('03', 'March'), ('04', 'April'),\
-                                  ('05', 'May'), ('06', 'June'), \
-                                  ('07', 'July'), ('08', 'August'),\
-                                  ('09', 'September'), ('10', 'October'),\
-                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'date_assign': fields.date('Partner Date', readonly=True),
+        'date_assign': fields.date('Assign Date', readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
         'delay_open': fields.float('Delay to Assign',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
         'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
@@ -77,9 +69,6 @@ class crm_lead_report_assign(osv.osv):
             CREATE OR REPLACE VIEW crm_lead_report_assign AS (
                 SELECT
                     c.id,
-                    to_char(c.date_assign, 'YYYY') as year,
-                    to_char(c.date_assign, 'MM') as month,
-                    to_char(c.date_assign, 'YYYY-MM-DD') as day,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index a7ff8d80f0f..271c9b2016f 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -35,10 +35,9 @@
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" />
-                        <filter string="Assign Month" icon="terp-go-today" domain="[]" name="group_partner_date" context="{'group_by':'date_assign'}"/>
-                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" />
+                        <filter string="Assign Date (day)" icon="terp-go-today" domain="[]" context="{'group_by':'date_assign:day'}"/>
+                        <filter string="Assign Date (month)" icon="terp-go-month" domain="[]" context="{'group_by':'date_assign:month'}"/>
+                        <filter string="Assign Date (year)" icon="terp-go-year" domain="[]" context="{'group_by':'date_assign:year'}"/>
                     </group>
                 </search>
             </field>
@@ -50,9 +49,11 @@
             <field name="name">crm.lead.assign.graph</field>
             <field name="model">crm.lead.report.assign</field>
             <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Lead Assign" type="pivot" stacked="True">
-                    <field name="user_id" type="row"/>
+                <graph string="Lead Assign" type="pivot" stacked="True">
+                    <field name="grade_id" type="row"/>
+                    <field name="date_assign" interval="month" type="row"/>
                     <field name="nbr" type="measure"/>
+                    <field name="probable_revenue" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -63,7 +64,7 @@
             <field name="name">Opp. Assignment Analysis</field>
             <field name="res_model">crm.lead.report.assign</field>
             <field name="view_type">form</field>
-            <field name="context">{'default_type': 'opportunity', "search_default_group_partner_date": 1, "search_default_group_grade":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'default_type': 'opportunity', 'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">graph</field>
             <field name="domain">[('type', '=', 'opportunity')]</field>
         </record>