From b6e10c5eb31b58c4c1500edbfa46902e196c94a0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 11:47:01 +0530
Subject: [PATCH] [IMP,REM]: crm: Aligned tags properly + Removed type field
 from extended options

bzr revid: rpa@tinyerp.com-20101004061701-w8xc8rc0n3fz3rji
---
 .../crm/report/crm_phonecall_report_view.xml  | 70 +++++++++----------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 0f5452ad736..9ba923b2d3b 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.phonecall.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-               <tree string="Phone calls">
+                <tree string="Phone calls">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
@@ -41,7 +41,7 @@
                     <field name="user_id" select="1"/>
                     <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
-                   <field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -73,20 +73,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="8">
-                           <filter string="  Year  " icon="terp-go-year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Phone calls made in current year"/>
-
-                       <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                           help="Phone calls made in current month"/>
-
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                    <group col="16" colspan="8">
+                        <filter string="  Year  " icon="terp-go-year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Phone calls made in current year"/>
+                        <filter string="   Month   " icon="terp-go-month" name="This Month"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            help="Phone calls made in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                             help="Phone calls made in last month"/>
-
-                           <separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"
@@ -99,40 +96,37 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
-                      <separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"
-                            context="{'invisible_section': False}">               
-                       <filter icon="terp-personal+"
-                           context="{'invisible_section': False}"
-                           domain="[('section_id.user_id','=',uid)]"
-                           help="My team" />
-                        </field>   
-                          <field name="user_id" string="Salesman" select="1">
+                            context="{'invisible_section': False}">
+                            <filter icon="terp-personal+"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id','=',uid)]"
+                                help="My team" />
+                        </field>
+                        <field name="user_id" string="Salesman" select="1">
                             <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                           </field>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                      <field name="partner_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="categ_id" widget="selection" string="Type"
-                            domain="[('object_id.model', '=', 'crm.phonecall')]" />
+                        </field>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                        <field name="partner_id"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>
-                           <newline/>
+                        <newline/>
                         <field name="creation_date"/>
                         <field name="opening_date"/>
                         <field name="date_closed"/>
-                   </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
                         <filter string="Salesman" name="Salesman" 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="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="Type" icon="terp-stock_symbol-selection"
@@ -150,8 +144,8 @@
                             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>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -168,7 +162,7 @@
             <field name="help">Get an anlysis of Phone Calls number and delay to close, stage, user suits to different groups for a global or a fine grained analysis.</field>
         </record>
 
-           <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
+        <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>