[MERGE] marketing_compaign: update search views

bzr revid: psi@tinyerp.com-20120618085103-zsjrgzwblmjff5rb

2 files changed, 95 insertions, 91 deletions

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 4e9658d98a4..818e872788b 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -81,31 +81,32 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.search</field>
-       <field name="model">marketing.campaign</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Campaigns">
-               <filter icon="terp-document-new" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
-               <separator orientation="vertical"/>
-               <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="name"/>
-               <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>
-       </field>
-   </record>
+    <record id="view_marketing_campaign_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.search</field>
+        <field name="model">marketing.campaign</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Campaigns">
+                <field name="name" filter_domain="[('name','ilike',self)]" string="Campaign"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
+                <separator orientation="vertical"/>
+                <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>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_form">
         <field name="name">Campaigns</field>
@@ -185,34 +186,35 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.segment.search</field>
-       <field name="model">marketing.campaign.segment</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Segments">
-               <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
-               <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-               <separator orientation="vertical"/>
-               <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="name"/>
-               <field name="campaign_id"/>
-               <field name="object_id"/>
-               <field name="date_run"/>
-               <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>
-       </field>
-   </record>
+    <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.segment.search</field>
+        <field name="model">marketing.campaign.segment</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Segments">
+                <field name="name" filter_domain="[('name','ilike',self)]" string="Segment"/>
+                <field name="date_run"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
+                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <separator orientation="vertical"/>
+                <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>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_segment_form">
         <field name="name">Segments</field>
@@ -382,41 +384,42 @@
         </field>
     </record>
 
-   <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
-       <field name="name">marketing.campaign.workitem.search</field>
-       <field name="model">marketing.campaign.workitem</field>
-       <field name="type">search</field>
-       <field name="arch" type="xml">
-           <search string="Marketing Campaign Activities">
-               <group>
-                <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="date"/>
+    <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
+        <field name="name">marketing.campaign.workitem.search</field>
+        <field name="model">marketing.campaign.workitem</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Marketing Campaign Activities">
+                <group>
+                    <field name="res_name" filter_domain="[('name','ilike',self)]" 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="object_id"/>
-                <field name="res_name"/>
-                <field name="res_id"/>
-                <field name="partner_id"/>
-               </group>
-               <newline/>
-               <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>
-       </field>
-   </record>
+                <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>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
         <field name="name">Campaign Followup</field>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 2a3b8c80d48..7b3d848cc8b 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -31,7 +31,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
-                   <group>
+                <group>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl"
                             string="To Do"
                             domain="[('state','=','todo')]"/>
@@ -47,13 +49,12 @@
                     <field name="segment_id"/>
                     <field name="partner_id"/>
                     <field name="country_id"/>
-                    <field name="date"/>
                 </group>
                 <newline/>
                 <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="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"/>