[IMP] account_followup: improved search views.

bzr revid: tpa@tinyerp.com-20120719132744-qhxfacp5tkduqmyb

diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 9c11815..3f65919 100644 (file)
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -71,11 +71,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Follow-up">
-                    <group>
-                        <field name="name" string="Follow-up"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <field name="name" string="Follow-up"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>

diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 2bdf8eb..dbdafdb 100644 (file)
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -40,31 +40,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Follow-ups Sent">
-                    <group>
-                        <field name="date_move"/>
-                        <field name="date_move_last"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Fiscal year"
-                            name="fiscalyear"
-                            domain="[('period_id','in','current_year')]"
-                            help="Follow-up Entries with period in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" string="Not Litigation"
-                            domain="[('blocked','=', False)]"
-                            help = "Including journal entries marked as a litigation"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="balance"/>
-                    </group>
-                    <newline/>
+                    <field name="date_move"/>
+                    <field name="date_move_last"/>
+                    <field name="partner_id"/>
+                    <field name="balance"/>
+                    <filter icon="terp-go-year" string="This Fiscal year" name="fiscalyear" domain="[('period_id','in','current_year')]"
+                        help="Follow-up Entries with period in current year"/>
+                    <separator/>
+                    <filter icon="terp-camera_test" string="Not Litigation" domain="[('blocked','=', False)]"
+                        help = "Including journal entries marked as a litigation"/>
                     <group expand="1" string="Group By...">
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical"/>
                         <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
-                        <separator orientation="vertical"/>
                         <filter string="Follow-up Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
                         <filter string="Latest Follow-up Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
                     </group>
                 </search>