From 88a2361c1bf3781bb175005118c4258110dccdd0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 30 Apr 2012 04:17:03 +0200
Subject: [PATCH] crm,sale,stock: menu and dashboard cleanups

bzr revid: al@openerp.com-20120430021703-7sxuvx4l1hrnyor4
---
 addons/board/board_data_admin.xml         |   5 +-
 addons/crm/__openerp__.py                 |   1 -
 addons/crm/board_crm_statistical_view.xml | 114 ------------
 addons/crm/board_crm_view.xml             | 216 +++++++++++++++-------
 addons/product/product_view.xml           |   2 +-
 addons/sale/board_sale_view.xml           | 186 +++++++++----------
 addons/sale/sale_view.xml                 |   6 +-
 addons/sale_crm/__openerp__.py            |   1 -
 addons/sale_crm/board_sale_crm_view.xml   |  35 ----
 addons/stock/board_warehouse_view.xml     |   5 +-
 10 files changed, 240 insertions(+), 331 deletions(-)
 delete mode 100644 addons/crm/board_crm_statistical_view.xml
 delete mode 100644 addons/sale_crm/board_sale_crm_view.xml

diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index dfe4134be99..4f049d08d10 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -53,11 +53,10 @@
         </record>
 
         <!-- bind adminitration dashboard to the root administration -->
-        <menuitem id="base.menu_administration" name="Settings" action="open_board_administration_form"/>
+        <menuitem id="base.menu_administration" name="Settings"/>
 
         <!-- add a menu item in adminitration/reporting/dashboards -->
-        <menuitem id="base.menu_reporting_admin" name="Administration" parent="base.menu_reporting_dashboard" groups="base.group_system"/>
-        <menuitem id="base.menu_reporting_admin_dashboard" parent="base.menu_reporting_admin" action="open_board_administration_form"/>
+        <menuitem id="base.menu_reporting_admin_dashboard" parent="base.menu_reporting_dashboard" action="open_board_administration_form" groups="base.group_system"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 447645f615c..460e6493552 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -108,7 +108,6 @@ Creates a dashboard for CRM that includes:
         'process/crm_configuration_process.xml',
 
         'res_partner_view.xml',
-        'board_crm_statistical_view.xml',
         'board_crm_view.xml',
         
         'res_config_view.xml',
diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
deleted file mode 100644
index 14b0afdc6bb..00000000000
--- a/addons/crm/board_crm_statistical_view.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!--
-         Board for statistical view of the sections
-         -->
-
-         <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.ui.view" id="view_crm_opportunity_stage_graph">
-            <field name="name">Opportunities By Stage - 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="pie">
-                    <field name="stage_id"/>
-                    <field name="nbr" operator="+"/>
-                </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>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Opportunities By Stage" type="bar">
-                    <field name="stage_id"/>
-                    <field name="planned_revenue" operator="+"/>
-                    <field name="user_id" group="True"/>
-                </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>
-
-        <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>
-            <field name="view_type">form</field>
-            <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">
-            <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="context">{'search_default_Stage':1}</field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_statistical_form">
-            <field name="name">CRM - Statistical Dashboard Form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <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"/>
-                        </column>
-                        <column>
-                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="open_board_statistical_dash">
-            <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>
-
-        <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
-
-        <menuitem
-            id="menu_board_statistics_dash"
-            name="CRM Dashboard"
-            sequence="0"
-            parent="board.menu_sales_dashboard"
-            action="open_board_statistical_dash"
-            groups="base.group_sale_manager"/>
-
-    </data>
-</openerp>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index bc0b41b24b9..60fb24f1a7a 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -1,31 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
      <data>
-          <record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
-               <field name="name">crm.opportunity.user.graph1</field>
-               <field name="model">crm.lead.report</field>
-               <field name="type">graph</field>
-               <field name="arch" type="xml">
-                    <graph string="Opportunities by User and Team" type="bar">
-                         <field name="stage_id"/>
-                         <field name="nbr" operator="+"/>
-                         <field name="user_id" group="True"/>
-                    </graph>
-               </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>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="Opportunity Analysis" type="bar">
-                   <field name="stage_id"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
+        <!-- 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>
@@ -59,23 +35,20 @@
                 </tree>
             </field>
         </record>
-
-          <record model="ir.actions.act_window" id="act_my_oppor">
-              <field name="name">My Open 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="context">{'default_user_id': uid, 'default_type': 'opportunity'}</field>
-          </record>
-
+        <record model="ir.actions.act_window" id="act_my_oppor">
+            <field name="name">My Open 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="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>
-
+            <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>
@@ -83,44 +56,151 @@
             <field name="act_window_id" ref="act_my_oppor"/>
         </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 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>
+            <field name="arch" type="xml">
+                <graph orientation="vertical" string="Opportunity Analysis" type="bar">
+                    <field name="stage_id"/>
+                    <field name="planned_revenue" operator="+"/>
+                </graph>
+            </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>
+        <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">Sales</field>
+            <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"/>
         </record>
-        <menuitem id="base.menu_base_partner"
-            action="open_board_crm"/>
+        <menuitem id="menu_board_crm" parent="base.menu_reporting_dashboard" action="open_board_crm" sequence="10" groups="base.group_sale_salesman"/>
+
+        <!-- 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>
+
+        <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>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunities By Stage" type="pie">
+                    <field name="stage_id"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <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>
+            <field name="view_type">form</field>
+            <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.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">
+                    <field name="stage_id"/>
+                    <field name="planned_revenue" operator="+"/>
+                    <field name="user_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+        <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="context">{'search_default_Stage':1}</field>
+        </record>
+
+        <record model="ir.ui.view" id="board_crm_statistical_form">
+            <field name="name">CRM - Statistical Dashboard Form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <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"/>
+                        </column>
+                        <column>
+                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
+                        </column>
+                    </board>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="open_board_statistical_dash">
+            <field name="name">CRM Manager</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>
+        <menuitem 
+            id="menu_board_statistics_dash"
+            parent="base.menu_reporting_dashboard"
+            action="open_board_statistical_dash"
+            sequence="11"
+            groups="base.group_sale_manager"/>
+
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1642d28e35f..a9921fdc1c0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -275,7 +275,7 @@
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
+        <menuitem id="base.menu_product" parent="base.menu_base_partner" name="Products"  sequence="9"/>
         <menuitem action="product.product_normal_action_sell" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 3780c68b2b3..a0101c347bf 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -1,6 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- Sale user dashboard -->
+        <record id="action_quotation_for_sale" model="ir.actions.act_window">
+            <field name="name">My Quotations</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+            <field name="view_id" ref="sale.view_order_tree"/>
+        </record>
+
+        <record id="view_turnover_by_month_tree" model="ir.ui.view">
+            <field name="name">turnover.by.month.tree</field>
+            <field name="model">account.invoice.report</field>
+            <field name="type">tree</field>
+            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+                <tree string="Monthly Turnover">
+                    <field name="month"/>
+                    <field name="price_total"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_turnover_by_month_graph" model="ir.ui.view">
+            <field name="name">turnover.by.month.graph</field>
+            <field name="model">account.invoice.report</field>
+            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
+            <field name="priority" eval="32"/>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+            <graph string="Monthly Turnover" type="bar">
+                <field name="month"/>
+                <field name="price_total" operator="+"/>
+            </graph>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="action_turnover_by_month">
+            <field name="name">Monthly Turnover</field>
+            <field name="res_model">account.invoice.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_turnover_by_month_graph"/>
+            <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
+            <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+            <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
+       </record>
+       <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
+            <field name="act_window_id" ref="action_turnover_by_month"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_turnover_by_month_graph"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
+            <field name="act_window_id" ref="action_turnover_by_month"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_turnover_by_month_tree"/>
+        </record>
+
+        <record id="board_sales_form" model="ir.ui.view">
+            <field name="name">board.sales.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 name="%(action_quotation_for_sale)d" string="My Quotations" creatable="true"/>
+                        </column>
+                        <column>
+                            <action name="%(action_turnover_by_month)d" string="Monthly Turnover"/>
+                        </column>
+                    </board>
+                </form>
+            </field>
+        </record>
+        <record id="open_board_sales" model="ir.actions.act_window">
+            <field name="name">Sales</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_sales_form"/>
+        </record>
+        <menuitem id="menu_board_sales" parent="base.menu_reporting_dashboard" action="open_board_sales" sequence="15" groups="base.group_sale_salesman"/>
+
+        <!-- Sale manager dashboard -->
         <record id="board_sales_manager_form" model="ir.ui.view">
             <field name="name">board.sales.manager.form</field>
             <field name="model">board.board</field>
@@ -21,112 +105,14 @@
                 </form>
             </field>
         </record>
-
         <record id="open_board_sales_manager" model="ir.actions.act_window">
-            <field name="name">Sales Manager Dashboard</field>
+            <field name="name">Sales Manager</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
-
-        <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
-        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dashboard" sequence="0" groups="base.group_sale_manager"/>
-
-
-    <record id="action_quotation_for_sale" model="ir.actions.act_window">
-        <field name="name">My Quotations</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
-        <field name="view_id" ref="sale.view_order_tree"/>
-        </record>
-
-    <record id="view_turnover_by_month_tree" model="ir.ui.view">
-        <field name="name">turnover.by.month.tree</field>
-        <field name="model">account.invoice.report</field>
-        <field name="type">tree</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
-        <field name="priority" eval="32"/>
-        <field name="arch" type="xml">
-            <tree string="Monthly Turnover">
-                <field name="month"/>
-                <field name="price_total"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_turnover_by_month_graph" model="ir.ui.view">
-        <field name="name">turnover.by.month.graph</field>
-        <field name="model">account.invoice.report</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
-        <field name="priority" eval="32"/>
-        <field name="type">graph</field>
-        <field name="arch" type="xml">
-        <graph string="Monthly Turnover" type="bar">
-            <field name="month"/>
-            <field name="price_total" operator="+"/>
-        </graph>
-        </field>
-    </record>
-
-        <record model="ir.actions.act_window" id="action_turnover_by_month">
-            <field name="name">Monthly Turnover</field>
-            <field name="res_model">account.invoice.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_turnover_by_month_graph"/>
-            <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
-            <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
-            <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
-       </record>
-
-       <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
-            <field name="act_window_id" ref="action_turnover_by_month"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_turnover_by_month_graph"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
-            <field name="act_window_id" ref="action_turnover_by_month"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_turnover_by_month_tree"/>
-        </record>
-
-        <record id="board_sales_form" model="ir.ui.view">
-            <field name="name">board.sales.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 name="%(action_quotation_for_sale)d"
-                                string="My Quotations" creatable="true"/>
-                             <!--groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"-->
-                        </column>
-                        <column>
-                            <action name="%(action_turnover_by_month)d"
-                                  string="Monthly Turnover"/>
-                             <!--groups="base.group_sale_salesman,account.group_account_manager"-->
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-
-        <record id="open_board_sales" model="ir.actions.act_window">
-            <field name="name">Sales Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="board_sales_form"/>
-        </record>
-
-        <menuitem
-            id="base.menu_base_partner" action="open_board_sales"
-            name="Sales"/>
+        <menuitem id="menu_board_sales_manager" parent="base.menu_reporting_dashboard" action="open_board_sales_manager" sequence="16" groups="base.group_sale_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 847e2e8f463..467ccae72a9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,10 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-partner"
-            id="base.menu_base_partner" name="Sales"
-            sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
-
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="1" groups="base.group_sale_salesman"/>
 
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 3fefc59c20a..8da96384d0a 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -43,7 +43,6 @@ crm modules.
     'init_xml': [],
     'update_xml': ['wizard/crm_make_sale_view.xml',
                    'sale_crm_view.xml',
-                   'board_sale_crm_view.xml',
                    'process/sale_crm_process.xml',
                    'security/sale_crm_security.xml',
                    'security/ir.model.access.csv'
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
deleted file mode 100644
index a5fa08222e0..00000000000
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
-            <field name="name">board.crm.form.inherit.replace1</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="sale.board_sales_form"/>
-            <field name="arch" type="xml">
-            <xpath expr="/form/board/column/action[@string='My Quotations']" position="before">
-                <action name="%(crm.act_my_oppor)d"
-                     string="My Opportunities"
-                    creatable="true"
-                     />
-            </xpath>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_form_inherit_replace3">
-            <field name="name">board.crm.form.inherit.replace1</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="sale.board_sales_form"/>
-            <field name="arch" type="xml">
-            <xpath expr="/form/board/column/action[@string='Monthly Turnover']" position="before">
-                <action name="%(crm.act_my_oppor_stage)d"
-                     string="My Planned Revenues by Stage"
-                     />
-            </xpath>
-            </field>
-        </record>
-        <menuitem name="Sales"
-            id="base.menu_base_partner" action="sale.open_board_sales"/>
-    </data>
-</openerp>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b99b7e98609..9f15eba5389 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -68,9 +68,8 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_reporting_dashboard"/>
-        <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
+        <menuitem id="menu_board_warehouse" parent="base.menu_reporting_dashboard" action="open_board_warehouse" sequence="20" groups="group_stock_manager"/>
+        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" groups="group_stock_manager" sequence="5"/>
 
     </data>
 </openerp>