fix

bzr revid: fp@tinyerp.com-20110917120507-a1o3jmvdsbr6jrmy
2011-09-17 14:05:07 +02:00
parent faecba956e
commit c0646b0f0e
1 changed files with 0 additions and 10 deletions
@@ -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'}"/>