[IMP]: Group by works correctly when zoom on graph view of Sale Dashboard and select...

bzr revid: rch@tinyerp.com-20101119125839-yzspdbfxek7yt15b

diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index ae76031..333a868 100644 (file)
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -28,7 +28,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_crm_opportunity_user_stage_graph">
             <field name="name">Opportunities By Stage Per User - Graph</field>
             <field name="model">crm.lead.report</field>
@@ -43,12 +43,13 @@
         </record>
 
         <record model="ir.actions.act_window" id="act_oppor_categ">
-            <field name="res_model">Opportunities By Categories</field>
+            <field name="res_model">Opportunities by Categories</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_categ_graph"/>
             <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
+            <field name="context">{'search_default_Category':1}</field>
         </record>
 
         <record model="ir.actions.act_window" id="act_opportunity_stage">
@@ -57,6 +58,7 @@
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
             <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
+            <field name="context">{'search_default_Stage':1}</field>
         </record>
 
         <record model="ir.actions.act_window" id="act_oppor_stage_user">
@@ -66,6 +68,7 @@
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
             <field name="domain">[('state','!=','cancel')]</field>
+            <field name="context">{'search_default_Stage':1}</field>
         </record>
 
         <record model="ir.ui.view" id="board_crm_statistical_form">
@@ -77,14 +80,14 @@
                     <hpaned>
                         <child1>
                             <action
-                                string="Opportunities By Categories"
+                                string="Opportunities by Categories"
                                 name="%(act_oppor_categ)d"
                                 colspan="4"
                                 height="200"
                                 width="250"/>
 
                             <action
-                                string="Opportunities By Stage"
+                                string="Opportunities by Stage"
                                 name="%(act_opportunity_stage)d"
                                 height="200"
                                 colspan="4"/>

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index f316ed4..80e7fbf 100644 (file)
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -18,17 +18,6 @@
                </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>
@@ -110,21 +99,9 @@
                <field name="view_type">form</field>
                <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>
+               <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">{'search_default_Stage':1}</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 f099cee..fd27e55 100644 (file)
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -136,9 +136,9 @@
                             domain="[]"
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
+                        <filter string="Category" name="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'type_id'}" />