From 57336b494f6f2492a5ce1875dd51403cdc4ab4e6 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 12:09:39 +0530
Subject: [PATCH] [IMP] crm:improved search views

bzr revid: tpa@tinyerp.com-20120720063939-37k1l812uxj6ukas
---
 addons/crm/crm_lead_view.xml                  | 107 +++++-------------
 addons/crm/crm_phonecall_view.xml             |  42 +++----
 addons/crm/crm_report_view.xml                |  54 ++++-----
 addons/crm/report/crm_lead_report_view.xml    | 107 +++++-------------
 .../crm/report/crm_phonecall_report_view.xml  |  70 ++++--------
 addons/crm/res_partner_view.xml               |   2 +-
 6 files changed, 115 insertions(+), 267 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f7bd27854f1..d4ea3c27892 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -51,7 +51,6 @@
             <field name="arch" type="xml">
                 <search string="Stage Search">
                     <field name="name" string="Stage Name"/>
-                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="type"/>
                 </search>
@@ -352,65 +351,37 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-mail-message-new"
-                    string="Inbox" help="Unread messages"
-                    name="needaction_pending"
-                    domain="[('needaction_pending','=',True)]"/>
                 <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
-                <field name="subjects"/>     
-                <separator orientation="vertical"/>
+                <field name="subjects"/>
                 <field name="create_date"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-check"
-                    string="New"
-                    name="new" help="New Leads"
-                    domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test"
-                    string="Open"
-                    name="open"
-                    domain="[('state','=','open')]"/>
-                <filter string="Unassigned Leads"
-                        icon="terp-personal-"
-                        domain="[('user_id','=', False)]"
-                        help="Unassigned Leads" />
-                <filter string="Leads Assigned to Me or My Team(s)"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
+                <field name="user_id"/>
+                <field name="section_id" context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
+                <separator/>
+                <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
+                <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
+                <separator/>
+                <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
+                <separator/>
+                <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="Leads that are assigned to one of the sale teams I manage, or to me"/>
-                <separator orientation="vertical"/>
-                <field name="user_id"/>
-                <field name="section_id" widget="selection"
-                    context="{'invisible_section': False}"/>
-                <field name="country_id" context="{'invisible_country': False}"/>
-                <separator orientation="vertical"/>
-                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
-                        domain="[]" context="{'group_by':'type_id'}" />
-                    <filter string="Channel" icon="terp-call-start"
-                        domain="[]" context="{'group_by':'channel_id'}" />
-                    <separator orientation="vertical"/>
+                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
+                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical" groups="base.group_no_one"/>
-                    <filter string="Creation" help="Create date" icon="terp-go-month"
-                        domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                    <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
-                <separator orientation="vertical"/>
                 <group string="Display">
                     <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
-                    <filter string="Show Sales Team"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
+                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
                 </group>
            </search>
         </field>
@@ -608,57 +579,37 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
-                <filter icon="terp-mail-message-new"
-                    string="Inbox" help="Unread messages"
-                    name="needaction_pending"
-                    domain="[('needaction_pending','=',True)]"/>
                 <field name="name" string="Opportunity / Customer"
                     filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-check"
-                    string="New" help="New Opportunities"
-                    name="new"
-                    domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test"
-                    string="Open" help="Open Opportunities"
-                    name="open"
-                    domain="[('state','=','open')]"/>
-                <filter string="Unassigned Opportunities"
-                        icon="terp-personal-"
-                        domain="[('user_id','=', False)]"
-                        help="Unassigned Opportunities" />
-               <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        context="{'invisible_section': False}"
-                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
-                <separator orientation="vertical"/>
                 <field name="user_id"/>
                 <field name="country_id"/>
                 <field name="partner_id"/>
-                <field name="section_id"
-                    context="{'invisible_section': False, 'default_section_id': self}"/>
-                <newline/>
+                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <separator/>
+                <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
+                <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
+                <separator/>
+                <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
+                <separator/>
+                <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
+                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                     <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical" />
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                     <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                     <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                     <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
                     <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical" />
                     <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
                 <group string="Display">
-                    <filter string="Show Sales Team"
-                        icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
+                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
                 </group>
             </search>
         </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index e83ad45d851..64b3686c807 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -215,40 +215,24 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-mail-message-new"
-                   string="Inbox" help="Unread messages"
-                   name="needaction_pending"
-                   domain="[('needaction_pending','=',True)]"/>
-               <separator orientation="vertical"/>
                <field name="name" string="Phonecalls"/>
-               <separator orientation="vertical"/>
                <field name="date"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-               <filter string="Unassigned Phonecalls"
-                       icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls"/>
-               <filter string="Phone Calls Assigned to Me or My Team(s)"
-                        icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="Phone Calls that are assigned to me or to my team(s)" />
-               <separator orientation="vertical"/>
                <field name="partner_id"/>
                <field name="user_id"/>
-               <field name="section_id"
-                   widget="selection" string="Sales Team"/>
-               <newline/>
+               <field name="section_id" string="Sales Team"/>
+               <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+               <separator/>
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+               <separator/>
+               <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
+               <separator/>
+               <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       help="Phone Calls that are assigned to me or to my team(s)" />
                <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
+                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
+                   <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                   <filter string="Creation" icon="terp-go-month" help="Creation Date" domain="[]" context="{'group_by':'create_date'}" />
+                   <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Date of Call" />
                </group>
            </search>
         </field>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index c3ccde5360b..f46be9b6dfa 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,15 +69,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                    <group>
-                        <field name="name"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                        <field name="section_id" widget="selection" />
-                        <field name="category2_id"/>
-                        <field name="nbr"/>
-                        <field name="state"/>
-                   </group>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="section_id"/>
+                    <field name="category2_id"/>
+                    <field name="nbr"/>
+                    <field name="state"/>
                </search>
             </field>
         </record>
@@ -157,14 +154,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
-                   <group>
-                        <field name="name"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                        <field name="section_id" widget="selection"/>
-                        <field name="nbr"/>
-                        <field name="state"/>
-                   </group>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="section_id"/>
+                    <field name="nbr"/>
+                    <field name="state"/>
                </search>
             </field>
         </record>
@@ -229,14 +223,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
-                    <group>
-                        <field name="name"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                        <field name="section_id" widget="selection"/>
-                        <field name="nbr"/>
-                        <field name="state"/>
-                    </group>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="section_id"/>
+                    <field name="nbr"/>
+                    <field name="state"/>
                </search>
             </field>
         </record>
@@ -318,14 +309,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
-                    <group>
-                        <field name="name"/>
-                        <separator orientation="vertical"/>
-                        <field name="month"/>
-                        <field name="section_id" widget="selection"/>
-                        <field name="nbr"/>
-                        <field name="state"/>
-                    </group>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="section_id"/>
+                    <field name="nbr"/>
+                    <field name="state"/>
                </search>
             </field>
     </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 142d44432f0..bffb7a31326 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -71,94 +71,47 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
-                    <group>
-                        <filter icon="terp-personal"
-                            name="lead"
-                            string="Lead"
-                            domain="[('type','=', 'lead')]"
-                            help="Show only lead"/>
-                        <filter icon="terp-personal+"
-                            string="Opportunity"
-                            name="opportunity"
-                            domain="[('type','=','opportunity')]"
-                            help="Show only opportunity"/>
-                        <separator orientation="vertical" />
-                        <filter icon="terp-check"
-                            string="New"
-                            domain="[('state','=','draft')]"
-                            help="Leads/Opportunities which are in New state"/>
-                        <filter icon="terp-camera_test"
-                            string="Open"
-                            domain="[('state','=','open')]"
-                            help="Leads/Opportunities which are in open state"/>
-                        <filter icon="gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"
-                            help="Leads/Opportunities which are in pending state"/>
-                        <filter icon="terp-dialog-close"
-                            string="Closed"
-                            domain="[('state','=','done')]"
-                            help="Leads/Opportunities which are in done state"/>
-                        <filter string="My Sales Team(s)" icon="terp-personal+"
-                                context="{'invisible_section': False}"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
-                        <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id"
-                            context="{'invisible_section': False}"/>
-                        <field name="user_id" string="Salesperson"/>
-                    </group>
-                    <newline/>
+                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
+                    <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
+                    <separator/>
+                    <filter icon="terp-check" string="New" domain="[('state','=','draft')]" help="Leads/Opportunities which are in New state"/>
+                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Leads/Opportunities which are in open state"/>
+                    <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Leads/Opportunities which are in pending state"/>
+                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/>
+                    <separator/>
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
+                            help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" />
-                        <field name="categ_id" widget="selection"/>
-                        <field name="type_id" widget="selection"/>
-                        <field name="channel_id" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <newline/>
+                        <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
+                        <field name="categ_id"/>
+                        <field name="type_id"/>
+                        <field name="channel_id"/>
+                        <field name="company_id"groups="base.group_multi_company"/>
                         <field name="create_date"/>
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesperson" name="user" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
+                        <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}"
-                            groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Category" name="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
-                            domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-call-start"
-                            domain="[]" context="{'group_by':'channel_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'creation_year'}"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'creation_month'}"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'creation_day'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Exp. Closing"  icon="terp-go-month"
-                            domain="[]" context="{'group_by':'deadline_month'}"/>
+                        <filter string="Category" name="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'creation_year'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'creation_month'}"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'creation_day'}"/>
+                        <filter string="Exp. Closing"  icon="terp-go-month" domain="[]" context="{'group_by':'deadline_month'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 3f28fb8730e..26db9c1df66 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -51,65 +51,37 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <filter icon="terp-gtk-go-back-rtl"
-                            string="Todo"
-                            domain="[('state','in',('draft','open'))]"
-                            help="Phone calls which are in draft and open state"/>
-                        <filter icon="terp-camera_test"
-                            string="Held"
-                            domain="[('state','=','done')]"
-                            help="Phone calls which are in closed state"/>
-                        <filter icon="gtk-media-pause"
-                            string="Not Held"
-                            domain="[('state','=','pending')]"
-                            help="Phone calls which are in pending state"/>
-                        <filter string="My Sales Team(s)"
-                                icon="terp-personal+"
-                                context="{'invisible_section': False}"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="Phone calls that are assigned to one of the sale teams I manage"/>
-                        <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
-                        <separator orientation="vertical"/>
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}"/>
-                        <field name="user_id" string="Salesperson"/>
-                    </group>
-                    <newline/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="Todo" domain="[('state','in',('draft','open'))]"
+                        help="Phone calls which are in draft and open state"/>
+                    <filter icon="terp-camera_test" string="Held" domain="[('state','=','done')]"
+                        help="Phone calls which are in closed state"/>
+                    <filter icon="gtk-media-pause" string="Not Held" domain="[('state','=','pending')]"
+                        help="Phone calls which are in pending state"/>
+                    <separator/>
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
+                            help="Phone calls that are assigned to one of the sale teams I manage"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
                     <group expand="0" string="Extended Filters...">
                         <field name="partner_id"/>
-                        <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>
-                        <newline/>
                         <field name="creation_date"/>
                         <field name="opening_date"/>
                         <field name="date_closed"/>
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesperson" name="Salesperson" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
+                        <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Date of call"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Month of call"/>
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" help="Year of call"/>
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of call"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of call"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of call"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 26c74427009..1637f799495 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -37,7 +37,7 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="category_id" position="after">
-                        <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1"/>
                     </field>
                     <xpath expr="//field[@name='user_id']" position="after">
                         <field name="country_id"/>