[IMP] report crm opportunities

bzr revid: fp@tinyerp.com-20100416200303-zcj2smjq6yqddxj6

2 files changed, 36 insertions, 36 deletions

diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 1e917d83710..560cfe17fd9 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -29,10 +29,10 @@ class crm_opportunity_report(osv.osv):
     _inherit = "crm.case.report"
     _description = "CRM Opportunity Report"
     _columns = {
-        'probability': fields.float('Avg. Probability', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True, group_operator="avg"),
         'amount_revenue': fields.float('Est.Revenue', readonly=True),
         'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
-        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+        'delay_close': fields.float('Delay to close', digits=(16,2), readonly=True, group_operator="avg"),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                      domain="[('section_id','=',section_id),\
                     ('object_id.model', '=', 'crm.opportunity')]", readonly=True),
@@ -70,7 +70,7 @@ class crm_opportunity_report(osv.osv):
                     sum(planned_revenue) as amount_revenue,
                     sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob,
                     avg(probability)::decimal(16,2) as probability,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                    avg(extract('epoch' from (date_closed-c.create_date)))/3600 as delay_close
                 from
                     crm_opportunity c
                 group by
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index 3ee8498fb3a..8cd174843a7 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -9,18 +9,18 @@
             <field name="model">crm.opportunity.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Opportunities">
-	              	<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
-                    <field name="user_id" />
-                    <field name="company_id"/>
-					<field name="partner_id"/>
-                	<field name="nbr" string="#Opportunities"/>
+                <tree string="Opportunities">
+                    <field name="name"  invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="section_id"  invisible="1"/>
+                    <field name="user_id"  invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
+                    <field name="nbr" string="#Opportunities"/>
                     <field name="amount_revenue"  sum="Total Revenue"/>
                     <field name="probability" widget="progressbar"/>
                     <field name="amount_revenue_prob"/>
-                    <field name="delay_close"/>
+                    <field name="delay_close" widget="float_time"/>
                     <field name="state" invisible="1"/>
                     <field name="stage_id"  invisible="1"/>
                     <field name="categ_id" invisible="1"/>
@@ -37,7 +37,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_costs"/>
                     <field name="amount_revenue_prob"/>
@@ -69,15 +69,15 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-				<xpath
-					expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-					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'}" />
-				</xpath>
+                <xpath
+                    expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+                    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'}" />
+                </xpath>
             </field>
         </record>
 
@@ -88,25 +88,25 @@
             <field name="res_model">crm.opportunity.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1, "group_by": [], 'group_by_no_leaf': 1}</field>
             <field name="search_view_id" ref="view_report_crm_opportunity_filter"/>
         </record>
-      	<record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_opportunity_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_opportunity"/>
-	    </record>
+          <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_opportunity_tree"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity"/>
+        </record>
         <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_opportunity_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_opportunity"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_opportunity_graph"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity"/>
+        </record>
 
         <menuitem name="Opportunities"
-        	action="action_report_crm_opportunity"
-        	id="menu_report_crm_opportunity_tree" parent="base.next_id_64" />
+            action="action_report_crm_opportunity"
+            id="menu_report_crm_opportunity_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>