From df6c91299f73753cd24919685f8889778bf0b091 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Tue, 26 Oct 2010 15:47:38 +0530
Subject: [PATCH 1/2] [Improved Sale Manager Dashboard]

bzr revid: vro@tinyerp.com-20101026101738-235ut6ckvsh69yi8
---
 addons/sale/report/sale_report_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index c4cc59f7b9a..c2ac712fe3d 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -163,6 +163,7 @@
         <field name="view_mode">graph,tree</field>
         <field name="domain">[('state','in',('manual','progress')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_by_partner_graph"/>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['partner_id']}</field>
     </record>
     <record id="open_view_sales_by_partner_graph" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -208,6 +209,7 @@
         <field name="view_mode">graph,tree</field>
         <field name="domain">[('state','in',('manual','progress','done')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_by_salesman_graph"/>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['user_id']}</field>
     </record>
    <record id="open_view_sales_by_salesman_graph" model="ir.actions.act_window.view">
             <field eval="7" name="sequence"/>
@@ -227,7 +229,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Sales by Product Category">
-                <field name="product_id"/>
+                <field name="categ_id"/>
                 <field name="price_total"/>
             </tree>
         </field>
@@ -252,6 +254,7 @@
         <field name="view_mode">graph,tree</field>
         <field name="domain">[('state','in',('manual','progress','done')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_product_total_price_graph"/>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['categ_id']}</field>
     </record>
     <record id="open_view_sales_product_total_price_graph" model="ir.actions.act_window.view">
             <field eval="3" name="sequence"/>

From 93d5118017a83a2a493d2404ac0b68dd2914249b Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Tue, 26 Oct 2010 15:49:41 +0530
Subject: [PATCH 2/2] [Improved Sales Dashboard]

bzr revid: vro@tinyerp.com-20101026101941-wskw7xuajxwyj8pc
---
 addons/crm/board_crm_view.xml              | 24 ++++++++++++++++++++++
 addons/crm/report/crm_lead_report_view.xml |  7 ++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 79dadadbcd0..6d9b7aadd00 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -18,6 +18,17 @@
                </field>
           </record>
 
+        <record id="view_report_crm_oppor_tree" model="ir.ui.view">
+            <field name="name">crm.lead.report.tree</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Opportunity Analysis">
+                   <field name="stage_id"/>
+                   <field name="planned_revenue"/>
+                </tree>
+            </field>
+        </record>
         <record id="view_report_crm_oppor_graph" model="ir.ui.view">
             <field name="name">crm.lead.report.graph</field>
             <field name="model">crm.lead.report</field>
@@ -100,7 +111,20 @@
                <field name="view_mode">graph,tree,form</field>
                <field name="view_id" ref="view_report_crm_oppor_graph"/>
             <field name="domain">['&amp;', '&amp;', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&amp;', ('state', '=', 'done'),  ('date_closed','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
+        		<field name="context">{'group_by_no_leaf':1,'group_by':['stage_id']}</field>
           </record>
+          <record id="open_view_report_crm_oppor_graph" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_oppor_graph"/>
+            <field name="act_window_id" ref="act_my_oppor_stage"/>
+	    </record>
+	    <record id="open_view_report_crm_oppor_tree" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_oppor_tree"/>
+            <field name="act_window_id" ref="act_my_oppor_stage"/>
+   		</record>
 
           <record model="ir.actions.act_window" id="act_sales_pipeline">
                <field name="res_model">crm.lead.report</field>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index b711bd68fb5..61bc6dfe94c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -29,6 +29,7 @@
                 <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
                 <field name="delay_close"/>
+                <field name="planned_revenue"/>
              </tree>
             </field>
         </record>
@@ -79,7 +80,7 @@
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Leads/Opportunities created in last month"/>
-                            
+
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Active"
@@ -93,7 +94,7 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-                            
+
                         <separator orientation="vertical" />
                         <field name="section_id"
                             default="context.get('section_id', False)"
@@ -127,7 +128,7 @@
                         <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]" 
+                            domain="[]"
                             context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />