diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
index d75c416a93e..dbf6bc8fbcc 100644
--- a/addons/document_webdav/webdav_setup.xml
+++ b/addons/document_webdav/webdav_setup.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
 <!--This file contains a typical setup of a WebDAV folders' structure, 
@@ -25,7 +24,7 @@
             <field eval="0" name="ressource_tree"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">groups</field>
@@ -36,7 +35,7 @@
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">resources</field>
@@ -48,7 +47,7 @@
             <field name="user_id" eval="False"/>
             <field name="resource_field" ref="base.field_res_users_login"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
             <field eval="[(6,0,[])]" name="group_ids"/>
@@ -61,7 +60,7 @@
             <field name="user_id" eval="False"/>
             <field name="resource_field" ref="base.field_res_users_login"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
             <field eval="[(6,0,[])]" name="group_ids"/>
@@ -72,7 +71,7 @@
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">locations</field>
@@ -91,4 +90,4 @@
         </record>
 
 </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_cr/l10n_cr_base_data.xml b/addons/l10n_cr/l10n_cr_base_data.xml
index 2268ecb37ed..28674185a85 100644
--- a/addons/l10n_cr/l10n_cr_base_data.xml
+++ b/addons/l10n_cr/l10n_cr_base_data.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -8,38 +7,38 @@
         -->
         <record id="state_SJ" model="res.country.state">
             <field name="code">SJ</field>
-            <field name="name">San José</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="name">San Jos&#233;</field>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_A" model="res.country.state">
             <field name="code">A</field>
             <field name="name">Alajuela</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_H" model="res.country.state">
             <field name="code">H</field>
             <field name="name">Heredia</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_C" model="res.country.state">
             <field name="code">C</field>
             <field name="name">Cartago</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_P" model="res.country.state">
             <field name="code">P</field>
             <field name="name">Puntarenas</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_G" model="res.country.state">
             <field name="code">G</field>
             <field name="name">Guanacaste</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_L" model="res.country.state">
             <field name="code">L</field>
-            <field name="name">Limón</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="name">Lim&#243;n</field>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <!--
         Resource: res.partner.title
@@ -71,7 +70,7 @@
             <field name="domain">contact</field>
         </record>
         <record id="res_partner_title_sal" model="res.partner.title">
-            <field name="name">Sociedad Anónima Laboral</field>
+            <field name="name">Sociedad An&#243;nima Laboral</field>
             <field name="shortcut">S.A.L.</field>
             <field name="domain">partner</field>
         </record>
@@ -136,4 +135,4 @@
             <field name="domain">contact</field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 92443fe987d..89a299e3a85 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <openerp>
     <data>
         <!-- Email tempalte -->
@@ -66,13 +65,13 @@
 
     <!-- Transition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
         <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_1"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_1"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_2"/>
         </record>
 
     <!-- Segment -->
@@ -85,9 +84,9 @@
             <field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
             <field name="name">OpenERP Partner</field>
             <field name="sync_mode">create_date</field>
-            <field name="ir_filter_id" ref="filter0"></field>
+            <field name="ir_filter_id" ref="filter0"/>
             <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 141981a21d6..f6eb8a1d905 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" ?>
 <openerp>
     <data>
         <record id="action_dummy" model="ir.actions.server">
             <field name="name">Dummy Action</field>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field name="state">dummy</field>
-            <field name="code"></field>
+            <field name="code"/>
             <field eval="5" name="sequence"/>
             <field eval="True" name="condition"/>
         </record>
@@ -40,10 +39,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for the genuine interest you have shown in OpenERP.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for the genuine interest you have shown in OpenERP.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
         <record id="email_template_2" model="email.template">
@@ -53,11 +52,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            We suggest you subscribe to the OpenERP Discovery Day on May 2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
@@ -68,10 +67,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and for subscribing to the OpenERP Discovery Day.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
@@ -82,10 +81,10 @@
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and buying the OpenERP book.</p>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and buying the OpenERP book.&lt;/p&gt;
             If any further information required kindly revert back.
-            <p>Regards,OpenERP Team,</p>]]></field>
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP book</field>
         </record>
 
@@ -95,11 +94,11 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our gold partners,We are arranging free technical training on june,2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our gold partners,We are arranging free technical training on june,2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">technical training to gold partners</field>
         </record>
 
@@ -110,11 +109,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our silver partners,We are  paid technical training on june,2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our silver partners,We are  paid technical training on june,2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">training to silver partners</field>
         </record>
 
@@ -125,11 +124,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our silver partners, we are  offering Gold partnership.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our silver partners, we are  offering Gold partnership.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">gold partnership to silver partners</field>
         </record>
 
@@ -140,11 +139,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and for subscribing to technical training.</p>
-            If any further information required kindly revert back.I really appreciate your co-operation on this.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and for subscribing to technical training.&lt;/p&gt;
+            If any further information required kindly revert back.I really appreciate your co-operation on this.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">subscribing to technical training</field>
         </record>
         <!-- Report -->
@@ -171,7 +170,7 @@
         <record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
             <field name="name">Propose a 1 month free trial for an OnDemand offer</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="report_directory_id" ref="document_directory_campaign1"/>
             <field name="type">report</field>
             <field eval="1" name="start"/>
@@ -180,27 +179,27 @@
         <record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
             <field name="name">Thanks for showing interest</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_1"/>
         </record>
 
         <record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
             <field name="name">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
              <field name="email_template_id" ref="email_template_2"/>
         </record>
 
         <record id="marketing_campaign_activity_3" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to the OpenERP Discovery Day</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_3"/>
         </record>
         <record id="marketing_campaign_activity_4" model="marketing.campaign.activity">
             <field name="name">Propose to buy the OpenERP Book</field>
            <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="report_directory_id" ref="document_directory_campaign1"/>
             <field name="type">report</field>
             <field name="report_id" ref="mc_crm_lead_demo_report"/>
@@ -209,81 +208,81 @@
         <record id="marketing_campaign_activity_5" model="marketing.campaign.activity">
             <field name="name">Thanks for buying the OpenERP book</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_4"/>
         </record>
         <record id="marketing_campaign_activity_6" model="marketing.campaign.activity">
             <field name="name">Propose a free technical training to Gold partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_5"/>
         </record>
         <record id="marketing_campaign_activity_7" model="marketing.campaign.activity">
             <field name="name">Propose paid training to Silver partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_6"/>
         </record>
 
         <record id="marketing_campaign_activity_8" model="marketing.campaign.activity">
             <field name="name">Propose gold partnership to silver partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_7"/>
         </record>
 
          <record id="marketing_campaign_activity_9" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to technical training</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
         <field name="email_template_id" ref="email_template_8"/>
         </record>
 
     <!-- Tranisition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
         <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_2"/>
         </record>
         <record id="marketing_campaign_transition_2" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_3"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_2"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_3"/>
         </record>
         <record id="marketing_campaign_transition_3" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_4"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_2"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_4"/>
         </record>
         <record id="marketing_campaign_transition_4" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_5"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_5"/>
         </record>
         <record id="marketing_campaign_transition_5" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_6"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_6"/>
         </record>
         <record id="marketing_campaign_transition_6" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_7"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_7"/>
         </record>
         <record id="marketing_campaign_transition_7" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_6"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_6"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_9"/>
         </record>
         <record id="marketing_campaign_transition_8" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_8"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_7"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_8"/>
         </record>
         <record id="marketing_campaign_transition_9" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_7"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_9"/>
         </record>
         <record id="marketing_campaign_transition_10" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_9"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_9"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
     <!-- Segment -->
@@ -296,4 +295,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml
index 31c48046d64..67d610c65c9 100644
--- a/addons/procurement/stock_orderpoint.xml
+++ b/addons/procurement/stock_orderpoint.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
 
@@ -7,50 +6,50 @@
         <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">25.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_dozen"/>
+            <field name="product_uom" ref="product.product_uom_dozen"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_36"/>
+            <field name="product_id" ref="product.product_product_36"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">10.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_28"/>
+            <field name="product_id" ref="product.product_product_28"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">12.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_20"/>
+            <field name="product_id" ref="product.product_product_20"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_46"/>
+            <field name="product_id" ref="product.product_product_46"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">15.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_23"/>
+            <field name="product_id" ref="product.product_product_23"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">5.0</field>
             <field name="product_min_qty">3.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_48"/>
+            <field name="product_id" ref="product.product_product_48"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 11936db0bed..68a6cd12733 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -57,7 +57,7 @@
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">invoice</field>
             <field name="kind">subflow</field>
-            <field name="subflow_id" search="[('osv','=','account.invoice')]" type="int"/>
+            <field name="subflow_id" search="[('osv','=','account.invoice')]"/>
             <field name="action">action_invoice_create()</field>
         </record>
         <record id="act_invoice_done" model="workflow.activity">
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 6578a961ff3..d9a220daef6 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
          <record id="product.product_product_9" model="product.product">
@@ -73,7 +72,7 @@
             <field name="company_id" ref="stock.res_company_1"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>
-            <field model="product.product" name="product_id" ref="product.product_product_9"/>
+            <field name="product_id" ref="product.product_product_9"/>
         </record>
 
         <record id="sale_shop2" model="sale.shop">
@@ -89,4 +88,4 @@
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file