diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index e8d5965a4c0..e494db325e5 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-		<record model="crm.case.section" id="section_sales_department">
-			<field name="name">Sales Department</field>
-			<field name="code">Sales</field>
-		</record>
+        <record model="crm.case.section" id="section_sales_department">
+            <field name="name">Sales Department</field>
+            <field name="code">Sales</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 17211a9ef66..2b47140e396 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -2,79 +2,79 @@
 <openerp>
 <data noupdate="1">
 
-   
+
 <!--        CASE STATUS(stage_id)        -->
     <record model="crm.case.stage" id="stage_lead1">
         <field name="name">New</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_lead2">
         <field name="name">Assigned</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_lead3">
         <field name="name">In Process</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_lead4">
         <field name="name">Converted</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_lead5">
         <field name="name">Recycled</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_lead6">
         <field name="name">Dead</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
 
 <!--        CASE CATEGORY2(category2_id)        -->
     <record model="crm.case.resource.type" id="type_lead1">
         <field name="name">Telesales</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.resource.type" id="type_lead2">
         <field name="name">Mail</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.resource.type" id="type_lead3">
         <field name="name">Email</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.resource.type" id="type_lead4">
         <field name="name">Print</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   	        
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.resource.type" id="type_lead5">
         <field name="name">Web</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.resource.type" id="type_lead6">
         <field name="name">Radio</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>               
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.resource.type" id="type_lead7">
         <field name="name">Television</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>               
+           <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.resource.type" id="type_lead8">
         <field name="name">Newsletter</field>
         <field name="section_id" ref="section_sales_department"/>
-   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>               
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
 
 </data>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index cea854427dc..6edce727647 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
         <field name="name">Leads</field>
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index e96e17ac6a9..a7e4b400d76 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
         <!--    CASE CATEGORY(categ_id)        -->
 
-	    <record model="crm.case.categ" id="categ_meet1">
-	        <field name="name">Customer Meeting</field>
-	        <field name="section_id" ref="section_sales_department"/>
-			<field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
-	    </record>
+        <record model="crm.case.categ" id="categ_meet1">
+            <field name="name">Customer Meeting</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
+        </record>
 
-	    <record model="crm.case.categ" id="categ_meet2">
-	        <field name="name">Internal Meeting</field>
-	        <field name="section_id" ref="section_sales_department"/>
-			<field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
-	    </record>
+        <record model="crm.case.categ" id="categ_meet2">
+            <field name="name">Internal Meeting</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
+        </record>
 
-	    <record model="crm.case.categ" id="categ_meet3">
-	        <field name="name">Phone Call</field>
-	        <field name="section_id" ref="section_sales_department"/>
-	        <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
-	    </record>
+        <record model="crm.case.categ" id="categ_meet3">
+            <field name="name">Phone Call</field>
+            <field name="section_id" ref="section_sales_department"/>
+            <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
+        </record>
 
          <record model="res.request.link" id="request_link_meeting">
-	        <field name="name">Case Meeting</field>
-	        <field name="object">crm.meeting</field>
-	    </record>   	    
-	</data>
+            <field name="name">Case Meeting</field>
+            <field name="object">crm.meeting</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index ec58c116baf..bf1a8459655 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
 
     <act_window
         id="crm_case_categ_meet_create_partner"
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index b6b62628e4b..a7cfd2d46ca 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -4,91 +4,91 @@
     <record model="crm.case.categ" id="categ_oppor1">
         <field name="name">Existing Customer</field>
         <field name="section_id" ref="section_sales_department"/>
-      	<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>              
+          <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor2">
         <field name="name">Self Generated</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>                      
-    </record>    
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+    </record>
     <record model="crm.case.categ" id="categ_oppor3">
         <field name="name">Employee</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>                      
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor4">
         <field name="name">Partner</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>              
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ_oppor5">
         <field name="name">Campaign</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>              
-    </record>    
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+    </record>
     <record model="crm.case.categ" id="categ_oppor6">
         <field name="name">Website</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>              
-    </record>    
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+    </record>
     <record model="crm.case.categ" id="categ_oppor7">
         <field name="name">Word of mouth</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>                      
-    </record>    
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+    </record>
     <record model="crm.case.categ" id="categ_oppor8">
         <field name="name">Other</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>                      
-    </record>    
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+    </record>
 
 <!--        CASE STATUS(stage_id)        -->
     <record model="crm.case.stage" id="stage_oppor1">
         <field name="name">Prospecting</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>            
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_oppor2">
         <field name="name">Needs Analysis</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>    
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_oppor3">
         <field name="name">Value Proposition</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_oppor4">
         <field name="name">Proposal/Price Quote</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_oppor5">
         <field name="name">Negotiation/Review</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_oppor6">
         <field name="name">Closed Won</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage_oppor7">
         <field name="name">Closed Lost</field>
         <field name="section_id" ref="section_sales_department"/>
-         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/> 
+         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
 
 <!--        Case Resource(type_id)        -->
     <record model="crm.case.resource.type" id="type_oppor1">
         <field name="name">Existing Business</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/> 
-    </record>    
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
+    </record>
     <record model="crm.case.resource.type" id="type_oppor2">
         <field name="name">New Business</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
     </record>
 
 </data>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 36163abfa00..60ade626071 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
 
      <act_window
             id="act_crm_opportunity_crm_phonecall_new"
diff --git a/addons/crm/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index 49d02f8848e..723cfeaca26 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -2,39 +2,39 @@
 <openerp>
 <data noupdate="1">
 ->
-	
-	<!--
-	Phonecall Categories
-	-->
-	<record model="crm.case.categ" id="categ_phone1">
-		<field name="name">Inbound</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
-		
-	</record>
-	<record model="crm.case.categ" id="categ_phone2">
-		<field name="name">Outbound</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
-	</record>
-	
-	<!--
-	Case Stage
-	-->
-	<record model="crm.case.stage" id="stage_phone1">
-		<field name="name">Planned</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
-	</record>	
-	<record model="crm.case.stage" id="stage_phone2">
-		<field name="name">Held</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
-	</record>	
-	<record model="crm.case.stage" id="stage_phone3">
-		<field name="name">Not Held</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
-	</record>
+
+    <!--
+    Phonecall Categories
+    -->
+    <record model="crm.case.categ" id="categ_phone1">
+        <field name="name">Inbound</field>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
+
+    </record>
+    <record model="crm.case.categ" id="categ_phone2">
+        <field name="name">Outbound</field>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
+    </record>
+
+    <!--
+    Case Stage
+    -->
+    <record model="crm.case.stage" id="stage_phone1">
+        <field name="name">Planned</field>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.stage" id="stage_phone2">
+        <field name="name">Held</field>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.stage" id="stage_phone3">
+        <field name="name">Not Held</field>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
+    </record>
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index f1363456e2c..e269cadfaf1 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+<data>
 
     <act_window
         id="crm_case_categ_phone_create_partner"