From c43c411bf900264ed29ef3e1eb11f7e59d265e42 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 17:32:42 +0530
Subject: [PATCH] [IMP] marketing_campaign: improved search views.

bzr revid: tpa@tinyerp.com-20120720120242-1v1v4xr34f5rs35d
---
 .../marketing_campaign_view.xml               | 46 ++++++-------------
 .../report/campaign_analysis_view.xml         | 31 ++++---------
 2 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 6a06cb33f1d..a3d8af6c048 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -114,19 +114,15 @@
         <field name="arch" type="xml">
             <search string="Campaigns">
                 <field name="name" string="Campaign"/>
-                <separator orientation="vertical"/>
+                <field name="object_id" string="Resource"/>
                 <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
                 <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
+                <separator/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/>
                 <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
-                <separator orientation="vertical"/>
-                <field name="object_id" string="Resource"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
             </search>
@@ -214,23 +210,18 @@
         <field name="arch" type="xml">
             <search string="Segments">
                 <field name="name" string="Segment"/>
-                <separator orientation="vertical"/>
                 <field name="date_run"/>
-                <separator orientation="vertical"/>
+                <field name="campaign_id"/>
+                <field name="object_id"/>
                 <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
                 <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <separator/>
                 <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
                 <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
                 <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
-                <separator orientation="vertical"/>
-                <field name="campaign_id"/>
-                <field name="object_id"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/>
                 </group>
             </search>
@@ -414,31 +405,22 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Marketing Campaign Activities">
-                <group>
-                    <field name="res_name" string="Marketing Campaign Activity"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-                    <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="campaign_id"/>
-                    <field name="segment_id"/>
-                    <field name="object_id"/>
-                    <field name="partner_id"/>
-                    <field name="res_id"/>
-                </group>
-                <newline/>
+                <field name="res_name" string="Marketing Campaign Activity"/>
+                <field name="date"/>
+                <field name="campaign_id"/>
+                <field name="segment_id"/>
+                <field name="object_id"/>
+                <field name="partner_id"/>
+                <field name="res_id"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
                     <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
                     <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
                     <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                 </group>
             </search>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 7b3d848cc8b..04b91a268b0 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -31,35 +31,22 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
-                <group>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl"
-                            string="To Do"
-                            domain="[('state','=','todo')]"/>
-                    <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
-                    <filter icon="terp-emblem-important"
-                            string="Exceptions"
-                            domain="[('state','=','exception')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="campaign_id"/>
-                    <field name="activity_id"/>
-                    <field name="segment_id"/>
-                    <field name="partner_id"/>
-                    <field name="country_id"/>
-                </group>
-                <newline/>
+                <field name="date"/>
+                <field name="campaign_id"/>
+                <field name="activity_id"/>
+                <field name="segment_id"/>
+                <field name="partner_id"/>
+                <field name="country_id"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','todo')]"/>
+                <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]"/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                     <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
                     <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>