From 8c403c671c20a0b45adb367b5510f8a6f91ad8a2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:08:22 +0200
Subject: [PATCH 1/4] [FIX] in all wizards, move buttons to footer

bzr revid: rco@openerp.com-20120718130822-wn71hhjukhqblijc
---
 addons/plugin_outlook/plugin_outlook.xml         | 2 +-
 addons/plugin_thunderbird/plugin_thunderbird.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 0340a7c502f..811661bf127 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -14,7 +14,7 @@
                     <separator string="title" position="before">
                         <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
                     </separator>
-                    <xpath expr="//header" position="replace"/>
+                    <xpath expr="//footer" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
                             <field name="plugin32" widget="url"/>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index fef7772dfdf..69e83bf6df2 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -14,7 +14,7 @@
                      <separator string="title" position="before">
                         <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
                     </separator>
-                    <xpath expr="//header" position="replace"/>
+                    <xpath expr="//footer" position="replace"/>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>
                             <field name="thunderbird" invisible="1"/>

From 531444a6f6b1d94e8ab4893a8f976e32e038bfff Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 15:51:02 +0200
Subject: [PATCH 2/4] [IMP] account: do not open a non-existing view after
 setting taxes

bzr revid: rco@openerp.com-20120718135102-34gvep3dbpqznozc
---
 addons/account/account.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b6fd7232a25..fab9de5407c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3351,15 +3351,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
-        action = {
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'board.board',
-            'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'board_account_form')[1],
-            'menu_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'menu_finance')[1]
-        }
-        return action
+        return {}
 
     def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
         '''

From 5510ee74b2f97959d129aa4e45933bd65bd42981 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 16:11:12 +0200
Subject: [PATCH 3/4] [IMP] sale: in customer form, move action 'Quotations and
 Sales' from contextual menu to button

bzr revid: rco@openerp.com-20120718141112-tdw4vb1c2am6rwl3
---
 addons/sale/res_partner_view.xml | 34 +++++++++++++++++++++++++++++++-
 addons/sale/sale_view.xml        |  8 --------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index bb5695eac39..9c557620e75 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <!-- Partner kanban view inherte -->
+        <record id="act_res_partner_2_sale_order" model="ir.actions.act_window">
+            <field name="name">Quotations and Sales</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="context">{'search_default_partner_id': active_id}</field>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
+            <field name="help">
+                This customer has no quotation or sale order.
+                Click here to create a new quotation.
+                &lt;p&gt;
+                The "Quotation" is the first step of the Sales flow.  Manage your sales from quotation to invoice.
+                &lt;p&gt;
+                You will be able to sell products (manage deliveries) as well as services (create projects).
+            </field>
+        </record>
+
+        <!-- Partner kanban view inherte -->
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
             <field name="name">res.partner.kanban.saleorder.inherit</field>
             <field name="model">res.partner</field>
@@ -18,6 +35,21 @@
                 </xpath>
             </field>
         </record>
+
+        <record id="res_partner_view_buttons" model="ir.ui.view">
+            <field name="name">res.partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button name="%(sale.act_res_partner_2_sale_order)d" type="action"
+                        string="Quotations and Sales"
+                        groups="base.group_sale_salesman"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 619ea161f28..aa30f023ae8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -569,14 +569,6 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <act_window
-            context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
-            id="act_res_partner_2_sale_order"
-            name="Quotations and Sales"
-            groups="base.group_sale_salesman"
-            res_model="sale.order"
-            src_model="res.partner"/>
-
         <act_window
             context="{'search_default_product_id': active_id, 'default_product_id': active_id}"
             id="action_order_line_product_tree"

From 8ac5c9c0ac978d50d637b79ceaaaf5676a19a3be Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Jul 2012 16:14:36 +0200
Subject: [PATCH 4/4] [IMP] crm, sale: put priorities in inherited views to
 control the order of buttons

bzr revid: rco@openerp.com-20120718141436-k19c7g3lz5gu2iqo
---
 addons/crm/res_partner_view.xml  | 1 +
 addons/sale/res_partner_view.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 29e733e2496..482a0d37e97 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -123,6 +123,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="10">
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 9c557620e75..55a049376bd 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -41,6 +41,7 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="20">
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="%(sale.act_res_partner_2_sale_order)d" type="action"