From d8d66845f16b726e105be51e7b885362f1c6ba8a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 23 Apr 2012 12:36:38 +0200
Subject: [PATCH 01/12] [FIX] Fixed button colspan in base_vat partner view

bzr revid: fme@openerp.com-20120423103638-gtumi3b1uyzlccpe
---
 addons/base_vat/base_vat_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index 18480b47814..5abc0e13ca4 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -10,7 +10,7 @@
                 <field name="property_account_payable" position="after">
                     <group colspan="2" col="6">
                         <field name="vat" on_change="vat_change(vat)"/>
-                        <button name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
+                        <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
                         <field name="vat_subjected" colspan="1" groups="base.group_extended" />
                     </group>
                 </field>

From 58b48cc10990790db850b3ad798bd5d86d8175b7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 23 Apr 2012 15:58:30 +0200
Subject: [PATCH 02/12] [IMP] Add explicit @for to concerned labels

bzr revid: fme@openerp.com-20120423135830-evj4ix4e5bqkq7jy
---
 addons/account/account_invoice_view.xml | 2 +-
 addons/crm/crm_lead_view.xml            | 2 +-
 addons/stock/product_view.xml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ca8530fb082..c7a255ea06f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,7 +53,7 @@
                 <form string="Invoice Line">
                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                     <field colspan="2" name="name"/>
-                    <label string="Quantity :" align="1.0"/>
+                    <label string="Quantity" for="quantity" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="quantity" nolabel="1"/>
                         <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7de9858713a..4fd756a811f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -415,7 +415,7 @@
                 <sheet layout="auto">
                 <group colspan="4" col="7">
                     <field name="name"  required="1" string="Opportunity"/>
-                    <label string="Stage:" align="1.0"/>
+                    <label string="Stage" for="stage_id" align="1.0"/>
                     <group colspan="1" col="4">
                         <field name="stage_id" nolabel="1"
                             on_change="onchange_stage_id(stage_id)"
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 19533933002..196abbccf40 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -61,7 +61,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
-                    <label string="Cost Price :" align="1.0"/>
+                    <label string="Cost Price" for="standard_price" align="1.0"/>
                     <group col="2" colspan="1">
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="Update"

From b5fa53e1727a783304e6b4fc3c28ae4d3721cddc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 24 Apr 2012 12:38:00 +0200
Subject: [PATCH 03/12] [IMP] Improved crm.opportunities form view

bzr revid: fme@openerp.com-20120424103800-ztjuev6efzjod6lq
---
 addons/crm/crm_lead_view.xml                | 88 +++++++++++----------
 addons/crm_partner_assign/crm_lead_view.xml | 17 ++--
 addons/sale_crm/sale_crm_view.xml           |  8 +-
 3 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4fd756a811f..db96f3cdf03 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -412,69 +412,71 @@
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
                 </div>
-                <sheet layout="auto">
-                <group colspan="4" col="7">
-                    <field name="name"  required="1" string="Opportunity"/>
-                    <label string="Stage" for="stage_id" align="1.0"/>
-                    <group colspan="1" col="4">
-                        <field name="stage_id" nolabel="1"
-                            on_change="onchange_stage_id(stage_id)"
-                            domain="section_id and [('section_ids', '=', section_id)] or []"/>
-                        <button name="stage_previous"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
-                        <button name="stage_next" states="draft,open,pending"
-                            type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
-                    </group>
+                <sheet layout="manual">
+                <div>
+                    <field name="name" required="1" nolabel="1" class="oe_form_title" style="width: 100%%"/>
+                    <div class="oe_right">
+                        <button string="Schedule/Log Call"
+                            name="%(opportunity2phonecall_act)d" icon="terp-call-start"
+                            type="action"/>
+                        <button string="Schedule Meeting" icon="gtk-redo"
+                            name="action_makeMeeting"
+                            type="object"/>
+                    </div>
+                </div>
+                <group colspan="4" col="4" layout="auto" class="oe_form_group_label_border">
                     <field name="user_id"/>
-
-                    <button string="Schedule/Log Call"
-                        name="%(opportunity2phonecall_act)d" icon="terp-call-start"
-                        type="action"/>
-
                     <field name="planned_revenue"/>
-                    <field name="probability"/>
+
+                    <field name="date_action"/>
                     <field name="date_deadline"/>
 
-                    <button name="action_makeMeeting" type="object"
-                    string="Schedule Meeting" icon="gtk-redo" />
-                    <newline/>
-                    <field name="date_action"/>
                     <field name="title_action"/>
-                    <field name="priority" string="Priority"/>
-                    <newline/>
+                    <field name="probability"/>
+
                     <field name="type" invisible="1"/>
                 </group>
-                <notebook colspan="4">
+                <notebook colspan="4" layout="auto">
                 <page string="Opportunity">
                     <group col="4" colspan="2">
                         <separator colspan="4" string="Contacts"/>
-                        <group colspan="2">
+                        <group colspan="2" col="3" class="oe_form_group_label_border">
                             <field name="partner_id" select="1"
-                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
-                                colspan="2" />
+                                on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
                             <button name="%(action_crm_lead2partner)d"
                                 icon="terp-partner" type="action"
                                 string="Create"
                                 attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                        </group>
-                        
-                        <group col="3" colspan="2">
-                            <field name="email_from" string="Email" />
-                            <button string="Mail"
-                            name="%(mail.action_email_compose_message_wizard)d"
-                            context="{'mail':'new', 'model': 'crm.lead'}"
-                            icon="terp-mail-message-new" type="action" />
-                        </group>
-                            <field name="phone"/>
 
+                            <field name="phone" colspan="3"/>
+
+                            <field name="email_from" string="Email"/>
+                            <button string="Mail"
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                context="{'mail':'new', 'model': 'crm.lead'}"
+                                icon="terp-mail-message-new" type="action" />
+                        </group>
                     </group>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" class="oe_form_group_label_border">
                         <separator colspan="2" string="Categorization"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="categ_id" select="1"
-                        string="Category" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.lead')]" />
+                            string="Category" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.lead')]" />
+
+                        <label string="Stage" for="stage_id" align="1.0"/>
+                        <group colspan="1" col="4">
+                            <field name="stage_id" nolabel="1"
+                                on_change="onchange_stage_id(stage_id)"
+                                domain="section_id and [('section_ids', '=', section_id)] or []"/>
+                            <button name="stage_previous"
+                                states="draft,open,pending" type="object"
+                                icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
+                            <button name="stage_next" states="draft,open,pending"
+                                type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
+                        </group>
+
+                        <field name="priority" string="Priority"/>
                     </group>
 
                     <separator colspan="4" string="Details"/>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 224a52a104c..7a19bf66a78 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -10,7 +10,7 @@
                 <data>
                     <xpath expr="//notebook/page[@string='Lead']" position="after">
                         <page string="Assignation" groups="base.group_extended">
-                        <group name="partner_assign_group" col="5" colspan="4">
+                        <group name="partner_assign_group" col="5" colspan="4" class="oe_form_group_label_border">
                             <separator string="Partner Assignation" colspan="5"/>
                             <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
                             <field name="date_assign"/>
@@ -22,15 +22,12 @@
                                     context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
                                 />
                             </group>
-                            <group name="geo_assign_group" col="5" colspan="4">
-                                <separator string="Geo Assignation" colspan="5"/>
-                                <field name="partner_latitude"/>
-                                <field name="partner_longitude"/>
-                                <group colspan="1" col="1">
-                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                        icon="gtk-apply"/>
-                                </group>
-                            </group>
+
+                            <separator string="Geo Assignation" colspan="5"/>
+                            <field name="partner_latitude"/>
+                            <field name="partner_longitude"/>
+                            <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
+                                icon="gtk-apply"/>
                         </group>
                         </page>
                     </xpath>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index a96892b990f..872727f4a36 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,9 +8,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
-                <field name="priority" position="after">
-                    <button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
-                </field>
+                <data>
+                    <xpath expr="//div[contains(@class,'oe_form_topbar')]/div[contains(@class,'oe_right')]" position="before">
+                        <button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
+                    </xpath>
+                </data>
             </field>
         </record>
 

From 79219ad9979023f4510b4c60befd1490d402301b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 24 Apr 2012 15:47:15 +0200
Subject: [PATCH 04/12] [IMP] Improved crm.opportunities form view

bzr revid: fme@openerp.com-20120424134715-g0xouqbshmbhknaw
---
 addons/crm/crm_lead_view.xml                | 73 +++++++++++----------
 addons/crm_partner_assign/crm_lead_view.xml | 12 ++--
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index db96f3cdf03..ed23fa3f3ee 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -412,19 +412,17 @@
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
                 </div>
-                <sheet layout="manual">
-                <div>
-                    <field name="name" required="1" nolabel="1" class="oe_form_title" style="width: 100%%"/>
-                    <div class="oe_right">
-                        <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d" icon="terp-call-start"
-                            type="action"/>
-                        <button string="Schedule Meeting" icon="gtk-redo"
-                            name="action_makeMeeting"
-                            type="object"/>
-                    </div>
-                </div>
-                <group colspan="4" col="4" layout="auto" class="oe_form_group_label_border">
+                <sheet layout="auto">
+                <group colspan="4" col="3">
+                    <field name="name" required="1" nolabel="1" class="oe_form_title" width="80%%"/>
+                    <button string="Schedule/Log Call"
+                        name="%(opportunity2phonecall_act)d" icon="terp-call-start"
+                        type="action"/>
+                    <button string="Schedule Meeting" icon="gtk-redo"
+                        name="action_makeMeeting"
+                        type="object"/>
+                </group>
+                <group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
                     <field name="user_id"/>
                     <field name="planned_revenue"/>
 
@@ -436,12 +434,12 @@
 
                     <field name="type" invisible="1"/>
                 </group>
-                <notebook colspan="4" layout="auto">
+                <notebook colspan="4">
                 <page string="Opportunity">
                     <group col="4" colspan="2">
                         <separator colspan="4" string="Contacts"/>
                         <group colspan="2" col="3" class="oe_form_group_label_border">
-                            <field name="partner_id" select="1"
+                            <field width="80%%" name="partner_id" select="1"
                                 on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
                             <button name="%(action_crm_lead2partner)d"
                                 icon="terp-partner" type="action"
@@ -450,7 +448,7 @@
 
                             <field name="phone" colspan="3"/>
 
-                            <field name="email_from" string="Email"/>
+                            <field width="80%%" name="email_from" string="Email"/>
                             <button string="Mail"
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 context="{'mail':'new', 'model': 'crm.lead'}"
@@ -465,10 +463,10 @@
                             domain="[('object_id.model', '=', 'crm.lead')]" />
 
                         <label string="Stage" for="stage_id" align="1.0"/>
-                        <group colspan="1" col="4">
+                        <group colspan="1" col="3">
                             <field name="stage_id" nolabel="1"
                                 on_change="onchange_stage_id(stage_id)"
-                                domain="section_id and [('section_ids', '=', section_id)] or []"/>
+                                domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
                             <button name="stage_previous"
                                 states="draft,open,pending" type="object"
                                 icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
@@ -483,46 +481,49 @@
                     <field name="description" nolabel="1" colspan="4"/>
                 </page>
                 <page string="Lead">
-                    <group colspan="2" col="4">
-                        <separator string="Contact" colspan="4" col="4"/>
+                    <separator string="Contact" colspan="4"/>
+                    <group colspan="4" col="4" class="oe_form_group_label_border">
                         <field name="partner_name" string="Customer Name" colspan="4"/>
-                        <newline/>
+                    </group>
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
                         <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                        <field name="function" />
-                        <field name="street" colspan="4"/>
-                        <field name="street2" colspan="4"/>
+                        <field name="fax"/>
+                        <field name="street"/>
                         <field name="zip"/>
-                        <field name="city"/>
                         <field name="country_id"/>
+                    </group>
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
+                        <field name="function" />
+                        <field name="mobile"/>
+                        <field name="street2"/>
+                        <field name="city"/>
                         <field name="state_id"/>
                     </group>
-                    <group colspan="2" col="2">
-                        <separator string="Communication" colspan="2"/>
-                        <field name="fax"/>
-                        <field name="mobile"/>
-                    </group>
-                    <group colspan="2" col="2">
+
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Categorization" colspan="2"/>
                         <field name="type_id" widget="selection" groups="base.group_extended"/>
                         <field name="channel_id" widget="selection"/>
                     </group>
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" class="oe_form_group_label_border">
                         <separator string="Mailings" colspan="2"/>
                         <field name="optin" on_change="on_change_optin(optin)"/>
                         <field name="optout" on_change="on_change_optout(optout)"/>
                     </group>
                 </page>
                 <page string="Extra Info" groups="base.group_extended">
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" class="oe_form_group_label_border">
                         <separator string="Misc" colspan="2"/>
                         <field name="active"/>
                         <field name="day_open" groups="base.group_no_one"/>
                         <field name="day_close" groups="base.group_no_one"/>
                         <field name="referred"/>
                     </group>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
+                    <group col="2" colspan="2" class="oe_form_group_label_border">
+                        <separator colspan="4" string="References"/>
+                        <field name="ref"/>
+                        <field name="ref2"/>
+                    </group>
                 </page>
                 </notebook>
                 </sheet>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 7a19bf66a78..92821fb26ee 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -12,9 +12,9 @@
                         <page string="Assignation" groups="base.group_extended">
                         <group name="partner_assign_group" col="5" colspan="4" class="oe_form_group_label_border">
                             <separator string="Partner Assignation" colspan="5"/>
-                            <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                            <field name="date_assign"/>
-                            <group colspan="1" col="1">
+                            <field width="50%%" name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                            <field width="40%%" name="date_assign"/>
+                            <group width="10%%" colspan="1" col="1">
                                 <button string="Forward"
                                     attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                     name="%(crm_lead_forward_to_partner_act)d"
@@ -24,9 +24,9 @@
                             </group>
 
                             <separator string="Geo Assignation" colspan="5"/>
-                            <field name="partner_latitude"/>
-                            <field name="partner_longitude"/>
-                            <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
+                            <field width="50%%" name="partner_latitude"/>
+                            <field width="40%%" name="partner_longitude"/>
+                            <button width="10%%" string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
                                 icon="gtk-apply"/>
                         </group>
                         </page>

From 7d76236ca99715d6f91161387bcb8ff4d5a7464a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 25 Apr 2012 16:43:15 +0200
Subject: [PATCH 05/12] [IMP] Improved res.user form view

bzr revid: fme@openerp.com-20120425144315-gt6pnrp644tk5qqz
---
 addons/mail/res_users_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 93a60e1cdb1..c993ae7f589 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -23,11 +23,13 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/notebook/page[@string='User']/group/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                <xpath expr="/form/sheet/notebook/page[@string='User']/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
                     <field name="notification_email_pref"/>
                 </xpath>
-                <xpath expr="/form/notebook" position="after">
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                <xpath expr="/form/sheet" position="after">
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </xpath>
             </data>
             </field>

From 25c2687af8c75173f402ad557ace0f85a024cbfe Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 30 Apr 2012 03:08:05 +0200
Subject: [PATCH 06/12] mail fix user preference

bzr revid: al@openerp.com-20120430010805-uc75mr1fq602tucp
---
 addons/mail/res_users_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 93a60e1cdb1..9af3d480b0d 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                <field name="menu_tips" position="after">
                     <field name="notification_email_pref" readonly="0"/>
-                </xpath>
+                </field>
             </data>
             </field>
         </record>

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 07/12] 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>

From 1d953a040086fd6c9d018eb03801686d14a835db Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 30 Apr 2012 17:29:03 +0200
Subject: [PATCH 08/12] [FIX] mail preferences

bzr revid: al@openerp.com-20120430152903-8gg09r0ztbgcu041
---
 addons/mail/res_users_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 6143fd8d108..072f2fc3ba5 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -23,9 +23,9 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/sheet/notebook/page[@string='User']/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                <field name="menu_tips" position="after">
                     <field name="notification_email_pref"/>
-                </xpath>
+                </field>
                 <xpath expr="/form/sheet" position="after">
                     <div class="oe_form_sheet_width">
                         <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>

From 533a9273d942e5ec49ffc0b030d6152d2007c9e2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 3 May 2012 13:42:51 +0200
Subject: [PATCH 09/12] [ADD] Shortcuts as a module

bzr revid: fme@openerp.com-20120503114251-p6yueoreiyu4dya0
---
 addons/web_shortcuts/LICENSE                  |  15 ++
 addons/web_shortcuts/__init__.py              |  22 +++
 addons/web_shortcuts/__openerp__.py           |  50 ++++++
 addons/web_shortcuts/controllers/__init__.py  |   3 +
 addons/web_shortcuts/controllers/main.py      |  18 +++
 .../static/src/css/web_shortcuts.css          |  57 +++++++
 addons/web_shortcuts/static/src/img/icon.png  | Bin 0 -> 5369 bytes
 .../static/src/js/web_shortcuts.js            | 145 ++++++++++++++++++
 .../static/src/xml/web_shortcuts.xml          |  24 +++
 9 files changed, 334 insertions(+)
 create mode 100644 addons/web_shortcuts/LICENSE
 create mode 100644 addons/web_shortcuts/__init__.py
 create mode 100644 addons/web_shortcuts/__openerp__.py
 create mode 100644 addons/web_shortcuts/controllers/__init__.py
 create mode 100644 addons/web_shortcuts/controllers/main.py
 create mode 100644 addons/web_shortcuts/static/src/css/web_shortcuts.css
 create mode 100644 addons/web_shortcuts/static/src/img/icon.png
 create mode 100644 addons/web_shortcuts/static/src/js/web_shortcuts.js
 create mode 100644 addons/web_shortcuts/static/src/xml/web_shortcuts.xml

diff --git a/addons/web_shortcuts/LICENSE b/addons/web_shortcuts/LICENSE
new file mode 100644
index 00000000000..ff64be448e9
--- /dev/null
+++ b/addons/web_shortcuts/LICENSE
@@ -0,0 +1,15 @@
+OpenERP, Open Source Management Solution
+Copyright © 2010-2011 OpenERP SA (<http://openerp.com>).
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public Lice
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/web_shortcuts/__init__.py b/addons/web_shortcuts/__init__.py
new file mode 100644
index 00000000000..6c74add0cca
--- /dev/null
+++ b/addons/web_shortcuts/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import controllers
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/__openerp__.py b/addons/web_shortcuts/__openerp__.py
new file mode 100644
index 00000000000..150b30909e9
--- /dev/null
+++ b/addons/web_shortcuts/__openerp__.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Web Shortcuts',
+    'version': '1.0',
+    'category': 'Tools',
+    'complexity': "easy",
+    'description': """
+Enable shortcuts feature in the web client
+==========================================
+
+Add a Shortcut icon in the systray in order to access the user's shortcuts (if any).
+Add a Shortcut icon besides the views title in order to add/remove a shortcut.
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://openerp.com',
+    'depends': ['base'],
+    'update_xml': [],
+    'js' : [
+        'static/src/js/web_shortcuts.js',
+    ],
+    'css' : [
+        'static/src/css/web_shortcuts.css',
+    ],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
+    'installable': True,
+    'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/__init__.py b/addons/web_shortcuts/controllers/__init__.py
new file mode 100644
index 00000000000..9f828025b8e
--- /dev/null
+++ b/addons/web_shortcuts/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/main.py b/addons/web_shortcuts/controllers/main.py
new file mode 100644
index 00000000000..23f4bbd3fbe
--- /dev/null
+++ b/addons/web_shortcuts/controllers/main.py
@@ -0,0 +1,18 @@
+try:
+    # embedded
+    import openerp.addons.web.common.http as openerpweb
+    import openerp.addons.web.controllers.main as webmain
+except ImportError:
+    # standalone
+    import web.common.http as openerpweb
+    import web.controllers.main as webmain
+
+class Shortcuts(openerpweb.Controller):
+    _cp_path = "/web/shortcuts"
+
+    @openerpweb.jsonrequest
+    def list(self, req):
+        return req.session.model('ir.ui.view_sc').get_sc(
+            req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
new file mode 100644
index 00000000000..e2deff8d406
--- /dev/null
+++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css
@@ -0,0 +1,57 @@
+/* Shortcuts*/
+.oe_systray_shortcuts {
+    margin: 3px;
+}
+.oe-shortcut-toggle {
+    height: 20px;
+    margin-top: 3px;
+    padding: 0;
+    width: 24px;
+    cursor: pointer;
+    display: block;
+    background: url(/web/static/src/img/add-shortcut.png) no-repeat center center;
+    float: left;
+}
+.oe-shortcut-remove{
+    background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center;
+}
+.oe-shortcuts {
+    position: absolute;
+    margin: 0;
+    padding: 6px 15px;
+    top: 37px;
+    left: 197px;
+    right: 0;
+    height: 17px;
+    line-height: 1.2;
+}
+.oe-shortcuts ul {
+    display: block;
+    overflow: hidden;
+    list-style: none;
+    white-space: nowrap;
+    padding: 0;
+    margin: 0;
+}
+.oe-shortcuts li {
+    cursor: pointer;
+    display: -moz-inline-stack;
+    display: inline-block;
+    display: inline; /*IE7 */
+    color: #fff;
+    text-align: center;
+    border-left: 1px solid #909090;
+    padding: 0 4px;
+    font-size: 80%;
+    font-weight: normal;
+    vertical-align: top;
+}
+
+.oe-shortcuts li:hover {
+    background-color: #666;
+}
+.oe-shortcuts li:first-child {
+    border-left: none;
+    padding-left: 0;
+}
+
diff --git a/addons/web_shortcuts/static/src/img/icon.png b/addons/web_shortcuts/static/src/img/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..44347e95f4586548085405afc3960bf9f3be042e
GIT binary patch
literal 5369
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
X7N_QJWu=O_00000NkvXXu0mjfz5O5B

literal 0
HcmV?d00001

diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
new file mode 100644
index 00000000000..948e6ab3d82
--- /dev/null
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -0,0 +1,145 @@
+/*############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011-2012 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################*/
+
+openerp.web_shortcuts = function (instance) {
+
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
+
+instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
+    template: 'Systray.Shortcuts',
+
+    init: function() {
+        this._super();
+        this.on('load', this, this.load);
+        this.on('add', this, this.add);
+        this.on('display', this, this.display);
+        this.on('remove', this, this.remove);
+        this.on('click', this, this.click);
+        this.dataset = new instance.web.DataSet(this, 'ir.ui.view_sc');
+    },
+    start: function() {
+        var self = this;
+        this._super();
+        this.trigger('load');
+        this.$element.on('click', '.oe_systray_shortcuts_items a', function() {
+            self.trigger('click', $(this));
+        });
+    },
+    load: function() {
+        var self = this;
+        this.$element.find('.oe_systray_shortcuts_items').empty();
+        return this.rpc('/web/shortcuts/list', {}, function(shortcuts) {
+            _.each(shortcuts, function(sc) {
+                self.trigger('display', sc);
+            });
+        });
+    },
+    add: function (sc) {
+        var self = this;
+        this.dataset.create(sc, function (out) {
+            self.trigger('display', {
+                name : sc.name,
+                id : out.result,
+                res_id : sc.res_id
+            });
+        });
+    },
+    display: function(sc) {
+        var self = this;
+        this.$element.find('.oe_systray_shortcuts_items').append()
+        var $sc = $(QWeb.render('Systray.Shortcuts.Item', {'shortcut': sc}));
+        $sc.appendTo(self.$element.find('.oe_systray_shortcuts_items'));
+    },
+    remove: function (menu_id) {
+        var menu_id = this.session.active_id;
+        var $shortcut = this.$element.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
+        var shortcut_id = $shortcut.data('shortcut-id');
+        $shortcut.remove();
+        this.dataset.unlink([shortcut_id]);
+    },
+    click: function($link) {
+        var self = this,
+            id = $link.data('id');
+        self.session.active_id = id;
+        self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) {
+            if (ir_menu_data.action.length){
+                instance.webclient.menu.on_action(ir_menu_data.action[0][2]);
+            }
+        });
+        this.$element.find('.oe_systray_shortcuts').trigger('mouseout');
+    },
+    has: function(menu_id) {
+        return !!this.$element.find('a[data-id=' + menu_id + ']').length;
+    }
+});
+
+instance.web.UserMenu.include({
+    do_update: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+        this.update_promise.then(function() {
+            if (self.shortcuts) {
+                self.shortcuts.trigger('load');
+            } else {
+                self.shortcuts = new instance.web_shortcuts.Shortcuts(self);
+                self.shortcuts.appendTo(instance.webclient.$element.find('.oe_systray'));
+            }
+        });
+    },
+});
+
+instance.web.ViewManagerAction.include({
+    on_mode_switch: function (view_type, no_store) {
+        var self = this;
+        this._super.apply(this, arguments).then(function() {
+            self.shortcut_check(self.views[view_type]);
+        });
+    },
+    shortcut_check : function(view) {
+        var self = this;
+        var shortcuts_menu = instance.webclient.user_menu.shortcuts;
+        var grandparent = this.getParent() && this.getParent().getParent();
+        // display shortcuts if on the first view for the action
+        var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
+        if (!this.action.name ||
+                !(view.view_type === this.views_src[0].view_type
+                    && view.view_id === this.views_src[0].view_id)) {
+            $shortcut_toggle.hide();
+            return;
+        }
+        $shortcut_toggle.toggleClass('oe-shortcut-remove', shortcuts_menu.has(self.session.active_id));
+        $shortcut_toggle.unbind("click").click(function() {
+            if ($shortcut_toggle.hasClass("oe-shortcut-remove")) {
+                shortcuts_menu.trigger('remove', self.session.active_id);
+            } else {
+                shortcuts_menu.trigger('add', {
+                    'user_id': self.session.uid,
+                    'res_id': self.session.active_id,
+                    'resource': 'ir.ui.menu',
+                    'name': self.action.name
+                });
+            }
+            $shortcut_toggle.toggleClass("oe-shortcut-remove");
+        });
+    }
+});
+
+};
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
new file mode 100644
index 00000000000..656fded1d75
--- /dev/null
+++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+<t t-name="Systray.Shortcuts">
+    <div class="oe_systray_shortcuts oe_systray_dropdown">
+        <a href="#"><img src="/web_shortcuts/static/src/img/icon.png" width="22" height="22" border="0"/></a>
+        <ul class="oe_systray_shortcuts_items oe_systray_dropdown_options"/>
+    </div>
+</t>
+<t t-name="Systray.Shortcuts.Item">
+    <li>
+        <a href="#" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
+            <t t-esc="shortcut.name"/>
+        </a>
+    </li>
+</t>
+<t t-extend="ViewManagerAction">
+    <t t-jquery="h2.oe_view_title" t-operation="prepend">
+        <a t-if="widget.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+            href="javascript: void(0)"> </a>
+    </t>
+</t>
+</templates>

From ca0460b76e372d19ba794a36069957713955b566 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Wed, 9 May 2012 13:55:41 +0200
Subject: [PATCH 10/12] Wall polish

bzr revid: mit@openerp.com-20120509115541-jb7r7h9hr8uklv39
---
 addons/mail/static/src/css/mail.css | 10 ----------
 addons/mail/static/src/js/mail.js   |  2 +-
 addons/mail/static/src/xml/mail.xml |  8 ++++----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 7f0cc6f222c..895ca575f08 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -274,16 +274,6 @@
     margin: 0;
 }
 
-.openerp .oe_mail_oe_right {
-    float: right;
-    margin-right: 8px;
-}
-
-.openerp .oe_mail_oe_left {
-    float: left;
-    margin-right: 8px;
-}
-
 .openerp a.oe_mail_oe_intlink {
     color: #8786b7;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d99674f98a7..4ac7f0d5e3e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -646,7 +646,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_row'));
+            var search_view_loaded = this.searchview.prependTo(this.$element.find('.oe_header_row'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f034b04311d..81c311daacf 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -3,14 +3,14 @@
 
     <div t-name="Wall" class="oe_mail_wall">
         <div class="oe_view_manager_header">
-            <div class="oe_view_manager_row">
+            <div class="oe_header_row">
                 <h2 class="oe_view_title">All Feeds</h2>
             </div>
         </div>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
-                <button class="oe_mail_oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
+                <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_clear"></div>
             <div class="oe_mail_wall_threads">
@@ -45,7 +45,7 @@
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
-            <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
+            <img class="oe_mail_msg_image oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
@@ -58,7 +58,7 @@
 
     <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
                 <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>

From 9aae22e06b16a74a5c4115cb92e9e3a45f3dcb1f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 11 May 2012 12:37:17 +0200
Subject: [PATCH 11/12] changed header to table in mail addons

bzr revid: mit@openerp.com-20120511103717-c1fgqdmshj1rc9u3
---
 addons/mail/static/src/js/mail.js   |  2 +-
 addons/mail/static/src/xml/mail.xml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 4ac7f0d5e3e..bed8faea5e0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -646,7 +646,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.prependTo(this.$element.find('.oe_header_row'));
+            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_view_search'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 81c311daacf..657a9c3a89e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,11 +2,12 @@
 <template>
 
     <div t-name="Wall" class="oe_mail_wall">
-        <div class="oe_view_manager_header">
-            <div class="oe_header_row">
-                <h2 class="oe_view_title">All Feeds</h2>
-            </div>
-        </div>
+        <table class="oe_view_manager_header">
+            <tr class="oe_header_row">
+                <td><h2 class="oe_view_title">All Feeds</h2></td>
+                <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
+            </tr>
+        </table>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>

From 2fd1f9e52f00bc703d6ff2d395c8136553bc11f3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 14 May 2012 12:28:44 +0200
Subject: [PATCH 12/12] [FIX] Broken Web Shortcuts links

bzr revid: fme@openerp.com-20120514102844-923swknaxhpgmpyi
---
 addons/web_shortcuts/static/src/js/web_shortcuts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index 948e6ab3d82..ecd07e35c72 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -64,7 +64,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
     },
     display: function(sc) {
         var self = this;
-        this.$element.find('.oe_systray_shortcuts_items').append()
+        this.$element.find('.oe_systray_shortcuts_items').append();
         var $sc = $(QWeb.render('Systray.Shortcuts.Item', {'shortcut': sc}));
         $sc.appendTo(self.$element.find('.oe_systray_shortcuts_items'));
     },
@@ -81,7 +81,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
         self.session.active_id = id;
         self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) {
             if (ir_menu_data.action.length){
-                instance.webclient.menu.on_action(ir_menu_data.action[0][2]);
+                instance.webclient.user_menu.on_action(ir_menu_data.action[0][2]);
             }
         });
         this.$element.find('.oe_systray_shortcuts').trigger('mouseout');