From 859f59f156315844baff673bd90d359f1d712cc7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 23 May 2012 13:45:20 +0200
Subject: [PATCH] [FIX] account: fix some conflicts from a previous merge

bzr revid: stw@openerp.com-20120523114520-85zzx9efwqtu48ry
---
 addons/account/account_view.xml | 46 ---------------------------------
 1 file changed, 46 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2bf3d0c050c..5c5fd28b0f9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -619,13 +619,6 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-<<<<<<< TREE
-                <form string="Bank Statement">
-                    <group col="7" colspan="4">
-                        <field name="name"/>
-                        <field name="date" on_change="onchange_date(date, company_id)"/>
-                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-=======
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
@@ -641,7 +634,6 @@
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
                         <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
->>>>>>> MERGE-SOURCE
                         <newline/>
                         <field name="period_id"/>
                         <field name="balance_start"/>
@@ -692,12 +684,6 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-<<<<<<< TREE
-                <form string="Bank Statement">
-                    <group col="7" colspan="4">
-                        <field name="name"/>
-                        <field name="date" on_change="onchange_date(date, company_id)"/>
-=======
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
@@ -712,7 +698,6 @@
                     <group col="7" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
->>>>>>> MERGE-SOURCE
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <newline/>
@@ -2669,16 +2654,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-<<<<<<< TREE
-                <form string="Statement" layout="manual">
-                    <div class="oe_form_topbar">
-                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object"/>
-                        <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
-                        <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
-                        <div class="oe_right">
-				<field name="state" widget="statusbar" statusbar_visible="draft,open,confirm" nolabel="1"/>
-                        </div>
-=======
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
@@ -2688,17 +2663,10 @@ action = pool.get('res.config').next(cr, uid, [], context)
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
                     <div class="oe_clear"/>
->>>>>>> MERGE-SOURCE
                 </div>
-<<<<<<< TREE
-                <sheet layout="auto">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-=======
                 <sheet string="Statement" layout="auto">
                     <group col="6" colspan="4" class="oe_form_header">
                         <field name="name" select="1"/>
->>>>>>> MERGE-SOURCE
                         <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1" widget="selection" domain="[('type', '=', 'cash')]"/>
                         <field name="user_id" select="1" readonly="1"/>
@@ -2768,25 +2736,11 @@ action = pool.get('res.config').next(cr, uid, [], context)
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Closing Balance" colspan="4"/>
-<<<<<<< TREE
-                            <field name="balance_end_real" readonly="1" string="Closing Cash Control"/>
-                            <field name="balance_end" string="Theorical Cash Closing"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Dates" colspan="4"/>
-                            <field name="date" readonly="1"/>
-                            <field name="closing_date" readonly="1"/>
-=======
                             <field name="balance_end"/>
                             <field name="balance_end_cash"/>
->>>>>>> MERGE-SOURCE
                         </group>
                     </group>
-<<<<<<< TREE
-                    </sheet>
-=======
                 </sheet>
->>>>>>> MERGE-SOURCE
                 </form>
             </field>
         </record>