From ad76a5430f04073fb1fbbf5d836ad167667db75e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 13:08:37 +0530
Subject: [PATCH] [FIX]: Bank statement

bzr revid: atp@tinyerp.com-20120706073837-9exeh7u00caun46s
---
 addons/account_payment/account_payment_view.xml |  6 +++---
 addons/l10n_ch/wizard/bvr_import_view.xml       | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 29da4c12e06..c652d82cfb1 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -334,9 +334,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@string='Import Invoices']" position="before">
-                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
-                </xpath>
+             <xpath expr="//div[@name='import_buttons']" position="inside">
+                  <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
+              </xpath>
             </field>
         </record>
 
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index e9dab515bf8..d6b7c9d1314 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -30,15 +30,15 @@
             <field name="target">new</field>
         </record>
         
-        <record model="ir.ui.view" id="view_bank_statement_form">
+        <record model="ir.ui.view" id="view_bank_statement_form_bvr">
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account_payment.view_bank_statement_form"/>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@string='Import Invoices']" position="after">
-                    <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
-                </xpath>
+            <xpath expr="//div[@name='import_buttons']" position="inside">
+                   <button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
+              </xpath>
             </field>
         </record>
     </data>