From b8947954bf8ab4e410272937621815f73b1cdd98 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Mon, 26 Apr 2010 12:56:32 +0530
Subject: [PATCH] [IMP]: Improve SQL view for crm fundraising.

bzr revid: rch_open_erp-20100426072632-wcny8y4x5ud18y4t
---
 addons/crm/report/crm_fundraising_report.py       |  8 ++++++--
 addons/crm/report/crm_fundraising_report_view.xml | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/addons/crm/report/crm_fundraising_report.py b/addons/crm/report/crm_fundraising_report.py
index af867ea0008..2b3fbcb4c7a 100644
--- a/addons/crm/report/crm_fundraising_report.py
+++ b/addons/crm/report/crm_fundraising_report.py
@@ -21,7 +21,7 @@
 
 from osv import fields,osv
 import tools
-
+import crm_report
 
 class crm_fundraising_report(osv.osv):
     """CRM Fundraising Report"""
@@ -41,6 +41,8 @@ class crm_fundraising_report(osv.osv):
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'company_id': fields.many2one('res.company', 'Company'),
+        'priority': fields.selection(crm_report.AVAILABLE_PRIORITIES, 'Priority'),
+        'date_closed': fields.datetime('Closed', readonly=True)
     }
 
     def init(self, cr):
@@ -67,6 +69,8 @@ class crm_fundraising_report(osv.osv):
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
+                    c.priority as priority,
+                    c.date_closed as date_closed,
                     date_trunc('day',c.create_date) as create_date,
                     sum(planned_revenue) as amount_revenue,
                     sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
@@ -76,7 +80,7 @@ class crm_fundraising_report(osv.osv):
                     crm_fundraising c
                 group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
                      c.state, c.user_id,c.section_id,c.categ_id,c.partner_id,c.company_id,
-                     c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
+                     c.create_date,to_char(c.create_date, 'YYYY-MM-DD'),c.priority,c.date_closed
             )""")
 
 crm_fundraising_report()
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index e1c32726b4f..1d97b868a34 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -24,6 +24,8 @@
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="day" invisible="1"/>
+                    <field name="priority" invisible="1"/>
+                    <field name="date_closed" invisible="1"/>
                </tree>
             </field>
 
@@ -73,8 +75,17 @@
             	<group>
             	    <separator orientation="vertical"/>
 	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+	                <field name="priority"/>
+	                <separator orientation="vertical"/>
+	                <field name="date_closed"/>
 	             </group>
             	</xpath>
+            	<xpath
+                 expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Category"]'
+                 position='after'>
+                 <filter string="Priority" icon="terp-sale" domain="[]"
+                     context="{'group_by':'priority'}" />
+             </xpath>
                 </data>
             </field>
         </record>