From 62eaa71eb81977d74951f571cd8be091e4a578f3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 4 Oct 2010 11:17:57 +0530
Subject: [PATCH] [IMP]: crm_claim, crm_fundraising, crm_helpdesk: Aligned tags
 properly in xml

bzr revid: rpa@tinyerp.com-20101004054757-1nls44mg0jicj1rs
---
 addons/crm_claim/crm_claim_data.xml           |   8 +-
 addons/crm_claim/crm_claim_view.xml           |  90 ++++++-------
 .../report/crm_claim_report_view.xml          |  97 +++++++-------
 .../crm_fundraising/crm_fundraising_data.xml  |  40 +++---
 .../crm_fundraising/crm_fundraising_menu.xml  |   4 +-
 .../crm_fundraising/crm_fundraising_view.xml  |   4 +-
 .../report/crm_fundraising_report_view.xml    | 124 ++++++++----------
 addons/crm_helpdesk/crm_helpdesk_menu.xml     |  62 ++++-----
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  22 ++--
 .../report/crm_helpdesk_report_view.xml       | 108 +++++++--------
 10 files changed, 267 insertions(+), 292 deletions(-)

diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index fc387658c97..cb41f1bf21e 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -31,7 +31,7 @@
         <record model="crm.case.resource.type" id="type_claim1">
             <field name="name">Corrective</field>
             <field name="section_id" ref="crm.section_sales_department"/>
-        </record>    
+        </record>
         
         <record model="crm.case.resource.type" id="type_claim2">
             <field name="name">Preventive</field>
@@ -46,7 +46,7 @@
             <field name="name">Accepted as Claim</field>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-        </record>    
+        </record>
         
         <record model="crm.case.stage" id="stage_claim2">
             <field name="name">Fixed</field>
@@ -58,13 +58,13 @@
             <field name="name">Won't fix</field>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-        </record>    
+        </record>
         
         <record model="crm.case.stage" id="stage_claim4">
             <field name="name">Invalid</field>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-        </record>    
+        </record>
         
         <record model="crm.case.stage" id="stage_claim5">
             <field name="name">Awaiting Response</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6b5f21df920..5ba80dfa68e 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -251,66 +251,66 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="terp-check" string="Current" name="current"
-                       domain="[('state','in',('draft', 'open'))]"
-                       separator="1" help="Draft and Open Claims" default="1"
-                   />
-                   <filter icon="terp-camera_test"
-                       string="In Progress"
-                       domain="[('state','=','open')]"
-                       separator="1" help="In Progress Claims"
-                   />
-                   <filter icon="terp-gtk-media-pause"
-                       string="Pending"
-                       domain="[('state','=','pending')]"
-                       separator="1" help="All pending Claims"
-                   />
-                   <separator orientation="vertical"/>
-                   <field name="name" select='1'/>
-                   <field name="partner_id" select="1"/>
-                   <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-personal-"
-                               domain="[('user_id','=', False)]"
-                               help="Unassigned Claims" />
-                   </field>
-                   <field name="section_id" select="1"
-                       widget="selection">
-                       <filter icon="terp-personal+"
+                    <filter icon="terp-check" string="Current" name="current"
+                        domain="[('state','in',('draft', 'open'))]"
+                        separator="1" help="Draft and Open Claims" default="1"
+                    />
+                    <filter icon="terp-camera_test"
+                        string="In Progress"
+                        domain="[('state','=','open')]"
+                        separator="1" help="In Progress Claims"
+                    />
+                    <filter icon="terp-gtk-media-pause"
+                        string="Pending"
+                        domain="[('state','=','pending')]"
+                        separator="1" help="All pending Claims"
+                    />
+                    <separator orientation="vertical"/>
+                    <field name="name" select='1'/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection">
+                            <filter icon="terp-personal-"
+                                domain="[('user_id','=', False)]"
+                                help="Unassigned Claims" />
+                    </field>
+                    <field name="section_id" select="1"
+                        widget="selection">
+                        <filter icon="terp-personal+"
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My section" />
                     </field>
-                   <newline/>
-                   <group expand="0" string="Group By...">
+                    <newline/>
+                    <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
-                           domain="[]" help="Partner"
-                           context="{'group_by':'partner_id'}" />
+                            domain="[]" help="Partner"
+                            context="{'group_by':'partner_id'}" />
                         <filter string="Responsible" icon="terp-personal"
-                           domain="[]" help="Responsible User"
-                           context="{'group_by':'user_id'}" />
+                            domain="[]" help="Responsible User"
+                            context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
-                           domain="[]" help="Sales Team"
-                           context="{'group_by':'section_id'}" />
+                            domain="[]" help="Sales Team"
+                            context="{'group_by':'section_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Stage" icon="terp-stage"
                             domain="[]" context="{'group_by':'stage_id'}" />
                         <filter string="Type" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
-                       <filter string="State"
+                        <filter string="State"
                             icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Claim Date" icon="terp-go-month"
-                           domain="[]" help="Claim Date"
-                           context="{'group_by':'date'}" />
-                       <filter string="Deadline" icon="terp-go-month"
-                           domain="[]"
-                           context="{'group_by':'date_deadline'}" />
-                       <filter string="Closure" icon="terp-go-month"
-                           domain="[]" help="Date Closed"
-                           context="{'group_by':'date_closed'}" />
-                   </group>
-               </search>
-           </field>
+                            domain="[]" help="Claim Date"
+                            context="{'group_by':'date'}" />
+                        <filter string="Deadline" icon="terp-go-month"
+                            domain="[]"
+                            context="{'group_by':'date_deadline'}" />
+                        <filter string="Closure" icon="terp-go-month"
+                            domain="[]" help="Date Closed"
+                            context="{'group_by':'date_closed'}" />
+                    </group>
+                </search>
+            </field>
         </record>
 
         <act_window
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 5eeecf3d3ad..f75f9c1eb53 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -77,54 +77,54 @@
             <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="Claims created in current year"/>
+                        <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="Claims created 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="Claims created in current month"/>
+                        <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="Claims created in current month"/>
 
-                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                        <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="Claims created in last month"/>
 
-                           <separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="Draft"
                             domain="[('state','=','draft')]"/>
-                       <filter icon="terp-camera_test"
+                        <filter icon="terp-camera_test"
                             string="Open"
                             domain="[('state','=','open')]"/>
-                       <filter icon="terp-gtk-media-pause"
+                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
 
-                           <separator orientation="vertical" />
-                              <field name="section_id" string="Sales Team"
-                               default="context.get('section_id', False)"
-                               context="{'invisible_section': False}">
+                        <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" />
+                            <filter icon="terp-personal+"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id','=',uid)]"
+                                help="My team" />
 
-                           </field>
-                           <field name="company_id">
-                           <filter icon="terp-go-home"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
+                        </field>
+                        <field name="company_id">
+                            <filter icon="terp-go-home"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id.company_id','=',uid)]"
+                                help="My company"/>
                         </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">
-                         <filter icon="terp-dialog-close"
+                        <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">
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
                         <filter icon="gtk-cancel"
@@ -138,33 +138,33 @@
                             <field name="priority" />
                             <field name="type_action" />
                         </group>
-                   </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'}" />
-                            
+
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]"
-                             context="{'group_by':'stage_id'}" />
+                            context="{'group_by':'stage_id'}" />
                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                             context="{'group_by':'priority'}" />
+                            context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
-                             context="{'group_by':'type_action'}" />
+                            context="{'group_by':'type_action'}" />
                         <filter string="State" 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'}"
@@ -177,8 +177,8 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" 
                             help="Year of claim"/>
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -188,30 +188,29 @@
             <field name="name">Claims Analysis</field>
             <field name="res_model">crm.claim.report</field>
             <field name="view_type">form</field>
-              <field name="view_mode">tree,graph</field>
-              <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
-
         </record>
 
-           <record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
+        <record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
             <field name="act_window_id" ref="action_report_crm_claim"/>
         </record>
 
-           <record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
+        <record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_report_crm_claim_graph"/>
             <field name="act_window_id" ref="action_report_crm_claim"/>
         </record>
 
-       <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
-           groups="base.group_extended"
-           action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
+        <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
+            groups="base.group_extended"
+            action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
 
 
     </data>
diff --git a/addons/crm_fundraising/crm_fundraising_data.xml b/addons/crm_fundraising/crm_fundraising_data.xml
index 03613d87a7f..cb0cb5fd24a 100644
--- a/addons/crm_fundraising/crm_fundraising_data.xml
+++ b/addons/crm_fundraising/crm_fundraising_data.xml
@@ -3,56 +3,56 @@
 <data noupdate="1">
 
         <!--    FUNDRAISING CATEGORY(categ_id)        -->
-        
+
     <record model="crm.case.categ" id="categ_fund1">
         <field name="name">Social Rehabilitation And Rural Upliftment</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
-    
+
     <record model="crm.case.categ" id="categ_fund2">
         <field name="name">Learning And Education</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>      
-    </record>    
-    
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
+
     <record model="crm.case.categ" id="categ_fund3">
         <field name="name">Healthcare</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>         
-    </record>        
-    
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
+
     <record model="crm.case.categ" id="categ_fund4">
         <field name="name">Arts And Culture</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>         
-    </record>    
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
 
         <!--    CASE Resource(type_id)        -->
-        
+
     <record model="crm.case.resource.type" id="type_fund1">
         <field name="name">Cash</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-       	<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>  
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
-    
+
     <record model="crm.case.resource.type" id="type_fund2">
         <field name="name">Cheque</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
-    </record>        
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
 
     <record model="crm.case.resource.type" id="type_fund3">
         <field name="name">Credit Card</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
-    
+
     <record model="crm.case.resource.type" id="type_fund4">
         <field name="name">Demand Draft</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
-    </record>    
+        <field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index ea94e8be92a..cd54a11e615 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -40,8 +40,8 @@
     </record>
 
     <menuitem name="Fund Raising" id="menu_crm_case_fund_raise"
-    	parent="base.menu_fundrising"
-    	action="crm_case_category_act_fund_all1" sequence="1" />
+        parent="base.menu_fundrising"
+        action="crm_case_category_act_fund_all1" sequence="1" />
 
 </data>
 </openerp>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6bcf019dabe..c7788e0449f 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -3,8 +3,8 @@
     <data>
            <!-- Fund Raising Configuration Menu -->
         <menuitem id="menu_config_fundrising" name="Fund Raising"
-        groups="base.group_extended"
-        parent="base.menu_base_config" sequence="8" />
+            groups="base.group_extended"
+            parent="base.menu_base_config" sequence="8" />
 
         <!-- Fund Raising Categories Form View -->
 
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index ab90f7ad0c1..62da63c1129 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -9,15 +9,15 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Fundraising">
-	              	<field name="name" invisible="1"/>
-					<field name="month" invisible="1"/>
-					<field name="section_id" invisible="1"/>
+                <tree string="Fundraising">
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-    				<field name="company_id" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                	<field name="nbr" string='#Fundraising' sum="#Fundraising"/>
-                	<field name="planned_cost"  sum='Planned Costs'/>
+                    <field name="nbr" string='#Fundraising' sum="#Fundraising"/>
+                    <field name="planned_cost"  sum='Planned Costs'/>
                     <field name="amount_revenue"  sum='Est.Revenue'/>
                     <field name="probability" avg='Avg. Probability' widget="progressbar"/>
                     <field name="amount_revenue_prob" sum='Est. Rev*Prob.'/>
@@ -26,7 +26,7 @@
                     <field name="categ_id" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="type_id" invisible="1"/>
-               </tree>
+                </tree>
             </field>
 
 <!-- Fundraising by user and section Form View-->
@@ -37,11 +37,11 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Cases">
+                <form string="Cases">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
-					<field name="section_id" select="1"/>
+                    <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
                     <field name="delay_close"/>
                     <field name="amount_revenue"/>
@@ -75,78 +75,67 @@
             <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="Funds raised 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="Funds raised 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="Funds raised 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="Funds raised 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="Funds raised in last month"/>
-
-                   		<separator orientation="vertical" />
+                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-camera_test"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					   <filter icon="terp-gtk-media-pause"
-                    		string="Pending"
-                    		domain="[('state','=','pending')]"/>
-
-                   		<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="company_id">
-                           <filter icon="terp-go-home"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
+                            string="Draft"
+                            domain="[('state','=','draft')]"/>
+                        <filter icon="terp-camera_test"
+                            string="Open"
+                            domain="[('state','=','open')]"/>
+                        <filter icon="terp-gtk-media-pause"
+                            string="Pending"
+                            domain="[('state','=','pending')]"/>
+                        <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" select="1" string="Salesman">
-	            			<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">
-                         <filter icon="terp-dialog-close"
+                        <field name="company_id">
+                            <filter icon="terp-go-home"
+                                context="{'invisible_section': False}"
+                                domain="[('section_id.user_id.company_id','=',uid)]"
+                                help="My company"/>
+                        </field>
+                        <field name="user_id" select="1" string="Salesman">
+                            <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">
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
-
                         <filter icon="gtk-cancel"
                             string="Cancel"
                             domain="[('state','=','cancel')]"/>
-
                         <group>
                             <separator orientation="vertical"/>
                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-                         </group>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
+                        </group>
+                    </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'}" />
-
                         <separator orientation="vertical" />
-                         <filter string="State" icon="terp-stock_effects-object-colorize"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
@@ -157,20 +146,17 @@
                         <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
-                            
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"
                             help="Date of fundraising"/>
-
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" 
                             help="Month of fundraising"/>
-
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 867c8358c83..5a4e9df19bc 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    <menuitem id="base.menu_aftersale" name="After-Sale Services"
-    	parent="base.menu_base_partner" sequence="7" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services"
+            parent="base.menu_base_partner" sequence="7" />
 
 <!-- Help Desk (menu) -->
 
-    <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
-        <field name="name">Helpdesk Requests</field>
-        <field name="res_model">crm.helpdesk</field>
-        <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
-        <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
-        <field name="help">Alike records and processing of claims, Helpdesk and Support is a good tool to trace your interventions. This menu is more adapted to an oral communication, which is not necessarily related to a claim. Select a customer, add notes and categorize your interventions with a channel and a priority level.</field>
-    </record>
+        <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
+            <field name="name">Helpdesk Requests</field>
+            <field name="res_model">crm.helpdesk</field>
+            <field name="view_mode">tree,calendar,form</field>
+            <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
+            <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
+            <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
+            <field name="help">Alike records and processing of claims, Helpdesk and Support is a good tool to trace your interventions. This menu is more adapted to an oral communication, which is not necessarily related to a claim. Select a customer, add notes and categorize your interventions with a channel and a priority level.</field>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
+            <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">calendar</field>
+            <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
+            <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
-        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
-    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_case_form_view_helpdesk"/>
+            <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
+        </record>
 
-    <menuitem name="Helpdesk and Support" id="menu_help_support_main"
-    	parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/>
+        <menuitem name="Helpdesk and Support" id="menu_help_support_main"
+            parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0531092dd98..832f1f0782e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -255,14 +255,14 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
-                           domain="[]" help="Partner"
-                           context="{'group_by':'partner_id'}" />
+                            domain="[]" help="Partner"
+                            context="{'group_by':'partner_id'}" />
                         <filter string="Responsible" icon="terp-personal"
-                           domain="[]" help="Responsible User"
-                           context="{'group_by':'user_id'}" />
+                            domain="[]" help="Responsible User"
+                            context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
-                           domain="[]" help="Sales Team"
-                           context="{'group_by':'section_id'}" />
+                            domain="[]" help="Sales Team"
+                            context="{'group_by':'section_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
@@ -270,11 +270,11 @@
                             context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month"
-                           domain="[]" help="Request Date"
-                           context="{'group_by':'date'}" />
-                       <filter string="Deadline" icon="terp-go-month"
-                           domain="[]"
-                           context="{'group_by':'date_deadline'}" />
+                            domain="[]" help="Request Date"
+                            context="{'group_by':'date'}" />
+                        <filter string="Deadline" icon="terp-go-month"
+                            domain="[]"
+                            context="{'group_by':'date_deadline'}" />
                     </group>
                 </search>
             </field>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 9490172e3e8..9c3bb97d67e 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.helpdesk.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-           <tree string="Helpdesk">
+                <tree string="Helpdesk">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
@@ -38,16 +38,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cases">
-					<field name="name" select="1"/>
-					<field name="month" select="1"/>
-					<field name="user_id" select="1"/>
-					<field name="section_id" select="1"/>
-					<field name="nbr" select="1"/>
-					<field name="delay_close"/>
-					<field name="amount_revenue"/>
-					<field name="amount_revenue_prob"/>
-					<field name="probability"/>
-					<field name="state" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="section_id" select="1"/>
+                    <field name="nbr" select="1"/>
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
@@ -75,8 +75,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="9">
-               			<filter string="  Year  " icon="terp-go-year"
+                    <group col="16" colspan="9">
+                        <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="Helpdesk requests occurred in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
@@ -85,46 +85,40 @@
                         <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="Helpdesk requests occurred in last month"/>
-
-                   		<separator orientation="vertical" />
-                   		<filter string="Current" icon="terp-check"
-                   			domain="[('state','in',('open','draft'))]" />
-
-                   		<filter string="Won" icon="terp-check"
-                   			domain="[('state','=','done')]" />
-
-                   		<filter string="Lost" icon="terp-dialog-close"
-                   			domain="[('state','=','cancel')]" />
-
-                   		<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="company_id">
-                        <filter icon="terp-go-home"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
+                        <separator orientation="vertical" />
+                        <filter string="Current" icon="terp-check"
+                        domain="[('state','in',('open','draft'))]" />
+                        <filter string="Won" icon="terp-check"
+                        domain="[('state','=','done')]" />
+                        <filter string="Lost" icon="terp-dialog-close"
+                        domain="[('state','=','cancel')]" />
+                        <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">
-                         <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="priority" string="Priority"/>
-                         <field name="categ_id"/>
-                         <field name="date_closed" string="Close Date"/>
-                   </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
+                        <field name="company_id">
+                            <filter icon="terp-go-home"
+                            context="{'invisible_section': False}"
+                            domain="[('section_id.user_id.company_id','=',uid)]"
+                            help="My company"/>
+                        </field>
+                        <field name="user_id" string="Salesman">
+                            <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="priority" string="Priority"/>
+                        <field name="categ_id"/>
+                        <field name="date_closed" string="Close Date"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
                         <filter string="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
@@ -134,21 +128,17 @@
                         <filter string="Partner" icon="terp-partner"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
-                            
                         <separator orientation="vertical" />
                         <filter string="Channel" icon="terp-call-start"
                             domain="[]"
-                            context="{'group_by':'canal_id'}" />
-                            
+                        context="{'group_by':'canal_id'}" />
                         <separator orientation="vertical" />
                         <filter string="State" 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'}" />
-                            
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
@@ -156,8 +146,8 @@
                             domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
-                  </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>