From 2eeb2a1f7981a68aec561ade79c12e6ae3e924fd Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Mon, 26 Apr 2010 16:59:00 +0530
Subject: [PATCH] [IMP]: Improve SQL view report for crm oppertunities. Add
 fields in Extended option in search view.

bzr revid: rch_open_erp-20100426112900-cfx18360ey1p6zqo
---
 addons/crm/report/crm_opportunity_report.py       | 12 +++++++++++-
 addons/crm/report/crm_opportunity_report_view.xml | 13 ++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index a3af4be8b7c..3e11307ee36 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -21,6 +21,7 @@
 
 from osv import fields,osv
 import tools
+import crm_report
 
 AVAILABLE_STATES = [
     ('draft','Draft'),
@@ -50,6 +51,9 @@ class crm_opportunity_report(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'date_open': fields.datetime('Opened', readonly=True),
+        'priority': fields.selection(crm_report.AVAILABLE_PRIORITIES, 'Priority')
     }
 
     def init(self, cr):
@@ -76,6 +80,9 @@ class crm_opportunity_report(osv.osv):
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
+                    c.date_closed as date_closed,
+                    c.date_open as date_open,
+                    c.priority as priority,
                     date_trunc('day',c.create_date) as create_date,
                     sum(planned_revenue) as amount_revenue,
                     sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob,
@@ -94,7 +101,10 @@ class crm_opportunity_report(osv.osv):
                     c.categ_id,
                     c.partner_id,
                     company_id,
-                    create_date
+                    create_date,
+                    c.date_closed,
+                    c.date_open,
+                    c.priority
             )""")
 
 crm_opportunity_report()
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index 29a66b838f0..3daa72c717c 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -25,6 +25,9 @@
                     <field name="stage_id"  invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="day" invisible="1"/>
+                    <field name="date_closed"  invisible="1"/>
+                    <field name="date_open" invisible="1"/>
+                    <field name="priority" invisible="1"/>
                </tree>
             </field>
         </record>
@@ -75,7 +78,13 @@
                  <group>
             	    <separator orientation="vertical"/>
             	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+            	    <field name="partner_id" />
+            	    <separator orientation="vertical"/>
+            	    <field name="priority" />
 	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+	                <newline/>
+	                <field name="date_closed" />
+	                <field name="date_open" />
 	               </group>
             	</xpath>
 				<xpath
@@ -83,9 +92,11 @@
 					position='after'>
 					<filter string="Stage" icon="terp-sale" domain="[]"
 						context="{'group_by':'stage_id'}" />
-					<separator orientation="vertical" />
 					<filter string="Partner" icon="terp-partner"
 						domain="[]" context="{'group_by':'partner_id'}" />
+					<separator orientation="vertical"/>
+				    <filter string="Priority" icon="terp-sale"
+						domain="[]" context="{'group_by':'priority'}" />
 				</xpath>
 			 </data>
             </field>