From fd479fc8947f1aab28ce1f3427402dc95ba6ff49 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Fri, 19 Dec 2014 11:36:50 +0100
Subject: [PATCH] [IMP] Better form view for payment mode

---
 account_banking_payment_transfer/view/payment_mode.xml | 8 +++-----
 account_payment_mode_term/views/payment_mode.xml       | 9 ++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/account_banking_payment_transfer/view/payment_mode.xml b/account_banking_payment_transfer/view/payment_mode.xml
index 20770de32..3516d5625 100644
--- a/account_banking_payment_transfer/view/payment_mode.xml
+++ b/account_banking_payment_transfer/view/payment_mode.xml
@@ -10,10 +10,8 @@
             <field name="model">payment.mode</field>
             <field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_form_inherit"/>
             <field name="arch" type="xml">
-                <field name="type" position="after">
-                    <group colspan="2">
-                        <separator colspan="2"
-                                   string="Transfer move settings" />
+                <xpath expr="/form/group[@col='4']" position="inside">
+                    <group name="trf-move-config" string="Transfer move settings" colspan="2">
                         <field name="transfer_account_id"
                                domain="[('type', '=', 'other'),
                                        ('reconcile', '=', True),
@@ -27,7 +25,7 @@
                                domain="[('company_id', '=', company_id)]"
                                />
                     </group>
-                </field>
+                </xpath>
             </field>
         </record>
 
diff --git a/account_payment_mode_term/views/payment_mode.xml b/account_payment_mode_term/views/payment_mode.xml
index 20c6cf083..63c0671c6 100644
--- a/account_payment_mode_term/views/payment_mode.xml
+++ b/account_payment_mode_term/views/payment_mode.xml
@@ -10,13 +10,12 @@
             <field name="model">payment.mode</field>
             <field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_form_inherit"/>
             <field name="arch" type="xml">
-                <field name="type" position="after">
-                    <group colspan="2">
-                        <separator colspan="2"
-                                   string="Optional filter by payment term" />
+                <xpath expr="/form/group[@col='4']" position="inside">
+                    <group string="Optional filter by payment term"
+                            name="filter-payment-term" colspan="2">
                         <field name="payment_term_ids" nolabel="1" colspan="2"/>
                     </group>
-                </field>
+                </xpath>
             </field>
         </record>