From c0646b0f0e5d9b3e315c7a217ef5b3619fc85ee1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 17 Sep 2011 14:05:07 +0200
Subject: [PATCH] fix

bzr revid: fp@tinyerp.com-20110917120507-a1o3jmvdsbr6jrmy
---
 .../account_voucher/voucher_payment_receipt_view.xml   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index bf7cedfb24b..98b242443a4 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -56,16 +56,6 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-<<<<<<< TREE
-=======
-                    <newline/>
-                    <group expand="0" string="Extended Filters...">
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="narration"/>
-                        <field name="amount"/>
-                   </group>
->>>>>>> MERGE-SOURCE
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>