From 4e8d6c6cf95ac32398dbe51513631569de792ee0 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 5 Jun 2012 17:23:15 +0530
Subject: [PATCH 1/2] [MARGE] CRM : Improve Dashbord View

bzr revid: aja@tinyerp.com-20120605115315-8l1qn4du3vziqmzs
---
 addons/crm/board_crm_view.xml   | 149 +++++++++++++-------------------
 addons/crm/crm_lead.py          |   2 +-
 addons/crm/crm_lead_menu.xml    |   1 -
 addons/crm/crm_meeting_menu.xml |   2 +-
 4 files changed, 64 insertions(+), 90 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index fd6b95d81f9..9262b3138a0 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -8,106 +8,58 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                    <field name="create_date" string="Creation Date"/>
                     <field name="name" string="Opportunity"/>
                     <field name="partner_id" string="Customer"/>
+                    <field name="title_action" />
                     <field name="stage_id"/>
                     <field name="planned_revenue" sum="Total of Planned Revenue"/>
                     <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
                     <field name="date_deadline" invisible="1"/>
-                    <field name="state" groups="base.group_no_one"/>
+                     <field name="user_id"/>
+                     <field name="state"/>
                 </tree>
             </field>
         </record>
+        
         <record model="ir.actions.act_window" id="act_my_oppor">
-            <field name="name">My Open Opportunities</field>
+            <field name="name">My Opportunities</field>
             <field name="res_model">crm.lead</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
+            <field name="domain">[('user_id','=',uid),('type', '=', 'opportunity')]</field>
             <field name="context">{'default_user_id': uid, 'default_type': 'opportunity'}</field>
         </record>
-        <record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="crm_case_my_open_oppor"/>
-            <field name="act_window_id" ref="act_my_oppor"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_my_oppor_form_view">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="crm_case_form_view_oppor"/>
-            <field name="act_window_id" ref="act_my_oppor"/>
-        </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>
-            <field name="type">graph</field>
+        
+        <!--All/My Lead Tree view -->
+        <record model="ir.ui.view" id="crm_tree_view_all_leads11">
+            <field name="name">Leads</field>
+            <field name="model">crm.lead</field>
+            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <graph orientation="vertical" string="Opportunity Analysis" type="bar">
+                <tree string="Leads" >
+                    <field name="create_date" string="Creation Date"/>
+                    <field name="name"/>
+                    <field name="contact_name"/>
+                    <field name="email_from"/>
+                    <field name="phone"/>
                     <field name="stage_id"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
+                    <field name="user_id"/>
+                    <field name="state" string="Status"/>
+                </tree>
             </field>
         </record>
-        <record model="ir.actions.act_window" id="act_my_oppor_stage">
-             <field name="name">Planned Revenue By Stage</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_report_crm_oppor_graph"/>
-             <field name="domain">[('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&amp;', ('state', '=', 'done'), ('date_closed','&gt;=',datetime.date.today().strftime('%Y-%m-01'))]</field>
-             <field name="context">{'search_default_Stage':1}</field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_form">
-            <field name="name">Sales Dashboard Form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales Dashboard" layout="manual">
-                    <board style="2-1">
-                        <column>
-                            <action string="My Opportunities" name="%(act_my_oppor)d" creatable="true"/>
-                        </column>
-                        <column>
-                            <action string="My Planned Revenues by Stage" name="%(act_my_oppor_stage)d"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="open_board_crm">
-            <field name="name">CRM</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_crm_form"/>
+        
+        <!--New Lead Tree view Action -->
+        <record model="ir.actions.act_window" id="act_crm_tag_tree_view_leads_all">
+            <field name="name">New Lead</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_tree_view_all_leads11"/>
         </record>
 
         <!-- crm mananger dashboard -->
-        <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
-            <field name="name">Opportunities By Categories - Graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                    <field name="categ_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="act_oppor_categ">
-            <field name="name">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>
-
+         <!--Planned Revenue By User pie graph -->
         <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
             <field name="name">Opportunities By Stage - Graph</field>
             <field name="model">crm.lead.report</field>
@@ -118,7 +70,9 @@
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>
-        </record>
+        </record><!--CRM Dashboard-->
+        <!--Planned Revenue By User pie graph action-->
+        
         <record model="ir.actions.act_window" id="act_opportunity_stage">
             <field name="name">Opportunities By Stage</field>
             <field name="res_model">crm.lead.report</field>
@@ -128,29 +82,43 @@
             <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
-
+        
+        <!--Planned Revenue By User line graph-->
         <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>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Opportunities By Stage" type="bar">
+                <graph string="Opportunities By Stage" type="line">
                     <field name="stage_id"/>
                     <field name="planned_revenue" operator="+"/>
                     <field name="user_id" group="True"/>
                 </graph>
             </field>
         </record>
+        
+        <!--Planned Revenue By User line graph action-->
         <record model="ir.actions.act_window" id="act_oppor_stage_user">
             <field name="name">Planned Revenue By User and Stage</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_user_stage_graph"/>
-            <field name="domain">[('state','!=','cancel')]</field>
+            <field name="domain">[('state','!=','cancel'),('opening_date','&gt;',datetime.date.today().strftime("%Y-%m-%d"))]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
-
+        
+        <!-- Metting calendar Action-->
+        <record model="ir.actions.act_window" id="crm_case_confirmed_meet">
+            <field name="name">Meetings</field>
+            <field name="res_model">crm.meeting</field>
+            <field name="view_mode">calendar,tree,form,gantt</field>
+            <field name="view_id" ref="crm_case_calendar_view_meet"/>
+            <field name="context">{"calendar_default_user_id":uid}</field>
+            <field name="domain">[('state','=','open'),('date','&gt;',datetime.date.today().strftime("%Y-%m-%d %H:%M:%S"))]</field>
+            <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+        </record>
+        <!--CRM Dashboard-->
         <record model="ir.ui.view" id="board_crm_statistical_form">
             <field name="name">CRM - Statistical Dashboard Form</field>
             <field name="model">board.board</field>
@@ -159,29 +127,36 @@
                 <form string="Statistics Dashboard" layout="manual">
                     <board style="1-1">
                         <column>
-                            <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
-                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
+                            <action string="New Leads" name="%(act_crm_tag_tree_view_leads_all)d"/>
+                            <action string="My Opportunities" name="%(act_my_oppor)d"/>
+                            <action string="My/All Scheduled Meeting for the Current Month" name="%(crm_case_confirmed_meet)d"/>
                         </column>
                         <column>
                             <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
+                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
                         </column>
                     </board>
                 </form>
             </field>
         </record>
+        
+        <!--CRM Dashboard Action-->
         <record model="ir.actions.act_window" id="open_board_statistical_dash">
-            <field name="name">CRM Manager</field>
+            <field name="name">CRM Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
+        
+        
+        <!--CRM Dashboard Action-->
         <menuitem 
             id="menu_board_statistics_dash"
             parent="base.menu_reporting_dashboard"
             action="open_board_statistical_dash"
-            sequence="11"
+            sequence="5"
             groups="base.group_sale_manager"/>
 
     </data>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 82bc50eafea..af65474ef4b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -669,7 +669,7 @@ class crm_lead(base_stage, osv.osv):
 
     def _send_mail_to_salesman(self, cr, uid, lead, context=None):
         """
-        Send mail to salesman with updated Lead details.
+        Send mail to salesman with updated Lead details.`
         @ lead: browse record of 'crm.lead' object.
         """
         #TOFIX: mail template should be used here instead of fix subject, body text.
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 02fc3369041..03e5a15feff 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -87,7 +87,6 @@ You and your team(s) will be able to plan meetings and phone calls from opportun
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
-
      <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
           <field name="sequence" eval="2"/>
           <field name="view_mode">form</field>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7c0b2f6cfa4..e68abc5e32f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -9,7 +9,7 @@
         src_model="res.partner"
         view_mode="calendar,tree,form,gantt"
         context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"
-        domain="[('partner_id', '=', active_id)]"
+        domain="[('partner_id', '=', active_id) ]"
     />
 
     <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">

From 6ad05ca750594f58d9ee02d23d619e738a6af0a3 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 6 Jun 2012 11:36:21 +0530
Subject: [PATCH 2/2] [MARG] CRM : Improve CRM dashboard

bzr revid: aja@tinyerp.com-20120606060621-b2v8vbnvzedei691
---
 addons/crm/board_crm_view.xml | 55 +++++------------------------------
 1 file changed, 8 insertions(+), 47 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 9262b3138a0..8f9f37215c4 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -1,61 +1,22 @@
 <?xml version="1.0"?>
 <openerp>
      <data>
-        <!-- crm user dashboard -->
-        <record model="ir.ui.view" id="crm_case_my_open_oppor">
-            <field name="name">Opportunities</field>
-            <field name="model">crm.lead</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
-                    <field name="create_date" string="Creation Date"/>
-                    <field name="name" string="Opportunity"/>
-                    <field name="partner_id" string="Customer"/>
-                    <field name="title_action" />
-                    <field name="stage_id"/>
-                    <field name="planned_revenue" sum="Total of Planned Revenue"/>
-                    <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                    <field name="date_deadline" invisible="1"/>
-                     <field name="user_id"/>
-                     <field name="state"/>
-                </tree>
-            </field>
-        </record>
-        
+        <!--My Opportunities Action -->
         <record model="ir.actions.act_window" id="act_my_oppor">
             <field name="name">My Opportunities</field>
             <field name="res_model">crm.lead</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('type', '=', 'opportunity')]</field>
-            <field name="context">{'default_user_id': uid, 'default_type': 'opportunity'}</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('user_id','=',uid),('type', '=', 'opportunity'),('state','not in',('cancel','done'))]</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_oppor"/>
         </record>
-        
-        <!--All/My Lead Tree view -->
-        <record model="ir.ui.view" id="crm_tree_view_all_leads11">
-            <field name="name">Leads</field>
-            <field name="model">crm.lead</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Leads" >
-                    <field name="create_date" string="Creation Date"/>
-                    <field name="name"/>
-                    <field name="contact_name"/>
-                    <field name="email_from"/>
-                    <field name="phone"/>
-                    <field name="stage_id"/>
-                    <field name="user_id"/>
-                    <field name="state" string="Status"/>
-                </tree>
-            </field>
-        </record>
-        
+                
         <!--New Lead Tree view Action -->
         <record model="ir.actions.act_window" id="act_crm_tag_tree_view_leads_all">
             <field name="name">New Lead</field>
             <field name="res_model">crm.lead</field>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="crm_tree_view_all_leads11"/>
+            <field name="domain">[('user_id','=',uid),('state','=','draft'),('type','=','lead')]</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
         </record>
 
         <!-- crm mananger dashboard -->
@@ -129,7 +90,7 @@
                         <column>
                             <action string="New Leads" name="%(act_crm_tag_tree_view_leads_all)d"/>
                             <action string="My Opportunities" name="%(act_my_oppor)d"/>
-                            <action string="My/All Scheduled Meeting for the Current Month" name="%(crm_case_confirmed_meet)d"/>
+                            <action string="My Next Meetings" name="%(crm_case_confirmed_meet)d"/>
                         </column>
                         <column>
                             <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>