From 8f7ff79c14e96e43c8a81f433f1066c1090233a6 Mon Sep 17 00:00:00 2001
From: Rucha Dave <rda@openerp.com>
Date: Thu, 12 Jun 2014 16:03:50 +0530
Subject: [PATCH] [IMP] crm deduplicate contacts view

Move buttons to the footer.

Closes: #562
---
 addons/crm/base_partner_merge_view.xml | 75 +++++++++++++-------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/addons/crm/base_partner_merge_view.xml b/addons/crm/base_partner_merge_view.xml
index 60d1a6cfeb7..bbbf27ee444 100644
--- a/addons/crm/base_partner_merge_view.xml
+++ b/addons/crm/base_partner_merge_view.xml
@@ -23,39 +23,6 @@
             <field name='model'>base.partner.merge.automatic.wizard</field>
             <field name='arch' type='xml'>
                 <form string='Automatic Merge Wizard'>
-                    <header>
-                        <button name='merge_cb' string='Merge Selection'
-                            class='oe_highlight'
-                            type='object'
-                            attrs="{'invisible': [('state', 'in', ('option', 'finished' ))]}"
-                            />
-                        <button name='next_cb' string='Skip these contacts'
-                            type='object'  class='oe_link'
-                            attrs="{'invisible': [('state', '!=', 'selection')]}" />
-                        <button name='start_process_cb'
-                            string='Merge with Manual Check'
-                            type='object'  class='oe_highlight'
-                            attrs="{'invisible': [('state', '!=', 'option')]}" />
-                        <button name='automatic_process_cb'
-                            string='Merge Automatically'
-                            type='object' class='oe_highlight'
-                            confirm="Are you sure to execute the automatic merge of your contacts ?"
-                            attrs="{'invisible': [('state', '!=', 'option')]}" />
-                        <button name='update_all_process_cb'
-                            string='Merge Automatically all process'
-                            type='object'
-                            confirm="Are you sure to execute the list of automatic merges of your contacts ?"
-                            attrs="{'invisible': [('state', '!=', 'option')]}" />
-                        <span class="or_cancel" attrs="{'invisible': [('state', '=', 'finished')]} ">or
-                            <button name="close_cb" special="nosave" string="Cancel" type="object" class="oe_link oe_inline"/>
-                        </span>
-                        <span class="or_cancel" attrs="{'invisible': [('state', '!=', 'finished')]} ">
-                            <button name="close_cb" special="nosave"
-                                string="Close"
-                                type="object"
-                                class="oe_link oe_inline"/>
-                        </span>
-                    </header>
                     <sheet>
                         <group attrs="{'invisible': [('state', '!=', 'finished')]}" col="1">
                             <h2>There is no more contacts to merge for this request...</h2>
@@ -93,12 +60,14 @@
                             attrs="{'invisible': [('state', 'in', ('option', 'finished'))]}"/>
                         <group attrs="{'invisible': [('state', 'in', ('option', 'finished'))]}" col="1">
                             <p class="oe_grey">
-                                The selected contacts will be merged together. All
-                                documents linking to one of these contacts will be
-                                redirected to the aggregated contact. You can remove
-                                contacts from this list to avoid merging them.
+                                Selected contacts will be merged together.
+                                All documents linked to one of these contacts
+                                will be redirected to the destination contact.
+                                You can remove contacts from this list to avoid merging them.
                             </p>
-                            <field name="dst_partner_id" domain="[('id', 'in', partner_ids and partner_ids[0] and partner_ids[0][2] or False)]" attrs="{'required': [('state', '=', 'selection')]}"/>
+                            <group col="2">
+                                <field name="dst_partner_id" domain="[('id', 'in', partner_ids and partner_ids[0] and partner_ids[0][2] or False)]" attrs="{'required': [('state', '=', 'selection')]}"/>
+                            </group>
                             <field name="partner_ids" nolabel="1">
                                 <tree string="Partners">
                                     <field name="id" />
@@ -111,6 +80,36 @@
                             </field>
                         </group>
                     </sheet>
+                    <footer>
+                        <button name='merge_cb' string='Merge Contacts'
+                            class='oe_highlight'
+                            type='object'
+                            attrs="{'invisible': [('state', 'in', ('option', 'finished' ))]}"
+                            />
+                        <button name='start_process_cb'
+                            string='Merge with Manual Check'
+                            type='object'  class='oe_highlight'
+                            attrs="{'invisible': [('state', '!=', 'option')]}" />
+                        <button name='automatic_process_cb'
+                            string='Merge Automatically'
+                            type='object' class='oe_highlight'
+                            confirm="Are you sure to execute the automatic merge of your contacts ?"
+                            attrs="{'invisible': [('state', '!=', 'option')]}" />
+                        <button name='update_all_process_cb'
+                            string='Merge Automatically all process'
+                            type='object'
+                            confirm="Are you sure to execute the list of automatic merges of your contacts ?"
+                            attrs="{'invisible': [('state', '!=', 'option')]}" />
+                        <span class="or_cancel" attrs="{'invisible': [('state', '=', 'finished')]} ">or
+                            <button name="close_cb" special="nosave" string="Cancel" type="object" class="oe_link oe_inline"/>
+                        </span>
+                        <span class="or_cancel" attrs="{'invisible': [('state', '!=', 'finished')]} ">
+                            <button name="close_cb" special="nosave"
+                                string="Close"
+                                type="object"
+                                class="oe_link oe_inline"/>
+                        </span>
+                    </footer>
                 </form>
             </field>
         </record>