diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index d3acde730a9..1679e32bd86 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -19,9 +19,9 @@
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
                 </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='rowspan'>23</attribute>
-                    <attribute name='string'></attribute>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="rowspan">23</attribute>
+                    <attribute name="string"/>
                 </xpath>
                 <group colspan="8">
                     <group colspan="4" width="600">
@@ -52,7 +52,7 @@
                 <data>
                     <xpath expr="//group[@name='account_accountant']" position="replace">
                     <newline/>
-                    <separator  string="Accounting &amp; Finance Features" colspan="4" />
+                    <separator string="Accounting &amp; Finance Features" colspan="4"/>
                     <field name="account_followup"/>
                     <field name="account_payment"/>
                     <field name="account_analytic_plans"/>
@@ -86,4 +86,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index fbae77349af..6dc8496b055 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
         <!-- Types -->
-        <record model="account.account.type" id="conf_account_type_receivable" >
+        <record model="account.account.type" id="conf_account_type_receivable">
           <field name="name">Receivable</field>
           <field name="code">receivable</field>
           <field name="report_type">income</field>
           <field name="close_method">unreconciled</field>
         </record>
 
-        <record model="account.account.type" id="conf_account_type_payable" >
+        <record model="account.account.type" id="conf_account_type_payable">
           <field name="name">Payable</field>
           <field name="code">payable</field>
           <field name="report_type">expense</field>
@@ -43,7 +42,7 @@
 	        <field name="report_type">liability</field>
 	    </record>
 
-        <record model="account.account.type" id="conf_account_type_income" >
+        <record model="account.account.type" id="conf_account_type_income">
           <field name="name">Income</field>
           <field name="code">income</field>
           <field name="report_type">income</field>
@@ -591,15 +590,15 @@
 
 
     	<record id="fiscal_position_normal_taxes" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_normal_taxes_template1" />
-            <field name="tax_src_id" ref="itaxs" />
-            <field name="tax_dest_id" ref="otaxs" />
+            <field name="position_id" ref="fiscal_position_normal_taxes_template1"/>
+            <field name="tax_src_id" ref="itaxs"/>
+            <field name="tax_dest_id" ref="otaxs"/>
         </record>
 
     	<record id="fiscal_position_tax_exempt" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_tax_exempt_template2" />
-            <field name="tax_src_id" ref="itaxx" />
-            <field name="tax_dest_id" ref="otaxx" />
+            <field name="position_id" ref="fiscal_position_tax_exempt_template2"/>
+            <field name="tax_src_id" ref="itaxx"/>
+            <field name="tax_dest_id" ref="otaxx"/>
         </record>
 
 
@@ -622,4 +621,4 @@
 
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
index 2bdd003cad4..a8a1899302a 100644
--- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
   <data>
 
@@ -19,6 +18,4 @@
   </record>
 
   </data>
-</openerp>
-
-
+</openerp>
\ No newline at end of file
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index d8d45a38753..de93af331db 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
 <data>
 
@@ -14,29 +13,29 @@
             <form string="Asset category">
                 <field name="name"/>
                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                <separator string="Accounting information" colspan="4" />
+                <separator string="Accounting information" colspan="4"/>
                 <field name="journal_id"/>
                 <field name="account_asset_id" on_change="onchange_account_asset(account_asset_id)"/>
                 <field name="account_depreciation_id"/>
                 <field name="account_expense_depreciation_id"/>
                 <group colspan="2" col="2">
-                    <separator string="Depreciation Dates" colspan="2" />
+                    <separator string="Depreciation Dates" colspan="2"/>
                     <field name="method_time"/>
                     <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
                     <field name="method_period"/>
                     <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
                 </group>
                 <group colspan="2" col="2">
-                    <separator string="Depreciation Method" colspan="2" />
+                    <separator string="Depreciation Method" colspan="2"/>
                     <field name="method"/>
                     <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                     <field name="prorata" attrs="{'invisible':[('method','&lt;&gt;','linear')]}"/>
                     <field name="open_asset"/>
                 </group>
         	<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
-        	    <separator string="Analytic information" colspan="4" />
+        	    <separator string="Analytic information" colspan="4"/>
         	    <newline/>
-        	    <field name="account_analytic_id" />
+        	    <field name="account_analytic_id"/>
         	</group>
                 <separator string="Notes" colspan="4"/>
                 <field name="note" colspan="4" nolabel="1"/>
@@ -100,28 +99,22 @@
                     <field name="purchase_date"/>
                     <newline/>
                     <group colspan="2" col="2">
-                        <separator string="Depreciation Dates" colspan="2" />
+                        <separator string="Depreciation Dates" colspan="2"/>
                         <field name="method_time" on_change="onchange_method_time(method_time)"/>
                         <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
                         <field name="method_period"/>
                         <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
                         <newline/>
-                        <button 
-                             name="%(action_asset_modify)d" 
-                             states="open" 
-                             string="Change Duration" 
-                             type="action"
-                             icon="terp-stock_effects-object-colorize" 
-                             colspan="2"/> 
+                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/> 
                     </group>
                     <group colspan="2" col="2">
-                        <separator string="Depreciation Method" colspan="2" />
+                        <separator string="Depreciation Method" colspan="2"/>
                         <field name="method" on_change="onchange_method_time(method)"/>
                         <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                         <field name="prorata" attrs="{'invisible': ['|',('method_time','=','end'),('method','!=','linear')]}"/>
                     </group>
                     <newline/>
-                    <separator string="" colspan="4" />
+                    <separator string="" colspan="4"/>
                     <field name="state" readonly="1" colspan="2"/>
                     <group colspan="2" col="2">
                        <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
@@ -129,7 +122,7 @@
                     </group>
                  </page>
                  <page string="Depreciation board">
-                    <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph" >
+                    <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
                        <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
                           <field name="depreciation_date"/>
                           <field name="sequence" invisible="1"/>
@@ -235,7 +228,7 @@
                 <field name="user_id"/>
               </group>
               <group col="2" colspan="2">
-                <separator string="Depreciation Dates" colspan="2" />
+                <separator string="Depreciation Dates" colspan="2"/>
                 <field name="method_time"/>
                 <field name="method_number" attrs="{'invisible':[('method_time','=','end')]}"/>
                 <field name="method_period"/>
@@ -297,10 +290,7 @@
     </record>
 
     <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/>
-    <menuitem
-        parent="menu_finance_assets"
-        id="menu_action_account_asset_asset_tree"
-        action="action_account_asset_asset_tree"/>
+    <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree" action="action_account_asset_asset_tree"/>
       <record model="ir.actions.act_window" id="action_account_asset_asset_form">
         <field name="name">Assets</field>
         <field name="res_model">account.asset.asset</field>
@@ -309,17 +299,9 @@
         <field name="search_view_id" ref="view_account_asset_search"/>
     </record>
 
-    <menuitem
-        parent="menu_finance_assets"
-        id="menu_action_account_asset_asset_form"
-        action="action_account_asset_asset_form"/>
+    <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_form" action="action_account_asset_asset_form"/>
     
-    <act_window
-        id="act_entries_open"
-        name="Entries"
-        res_model="account.move.line"
-        src_model="account.asset.asset"
-        context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
+    <act_window id="act_entries_open" name="Entries" res_model="account.move.line" src_model="account.asset.asset" context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
 
     <menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_accounting"/>
     <record model="ir.actions.act_window" id="action_account_asset_asset_list_normal">
@@ -329,10 +311,7 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem
-        parent="menu_finance_config_assets"
-        id="menu_action_account_asset_asset_list_normal"
-        action="action_account_asset_asset_list_normal"/>
+    <menuitem parent="menu_finance_config_assets" id="menu_action_account_asset_asset_list_normal" action="action_account_asset_asset_list_normal"/>
     
     <record model="ir.actions.act_window" id="action_account_asset_asset_form_normal">
         <field name="name">Asset Categories</field>
@@ -349,5 +328,4 @@
     </record>
     
 </data>
-</openerp>
-
+</openerp>
\ No newline at end of file
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index a7bf4259c6e..cd7615883fb 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -22,8 +21,8 @@
             <field name="arch" type="xml">
                 <form string="Follow-Up Lines">
                   <group col="6" colspan="4">
-                     <field name="name" />
-                     <field name="delay" />
+                     <field name="name"/>
+                     <field name="delay"/>
                      <field name="start" groups="base.group_extended"/>
                   </group>
                     <newline/>
@@ -44,9 +43,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-Up">
-                    <field name="name" />
+                    <field name="name"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string="" />
+                    <separator colspan="4" string=""/>
                     <field colspan="4" name="followup_line" nolabel="1"/>
                 </form>
             </field>
@@ -90,8 +89,7 @@
             <field name="view_type">form</field>
             <field name="help">Define follow up levels and their related messages and delay. For each step, specify the message and the day of delay. Use the legend to know the using code to adapt the email content to the good context (good name, good date) and you can manage the multi language of messages.</field>
         </record>
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu"
-            parent="account.menu_configuration_misc"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_configuration_misc"/>
 
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Followup Report"/>
 
@@ -142,23 +140,11 @@
             </field>
         </record>
 
-        <act_window
-            domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]"
-            id="act_account_partner_account_move_all"
-            name="Receivable Items"
-            res_model="account.move.line"
-            src_model=""
-            view_id="account_move_line_partner_tree"/>
+        <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="Receivable Items" res_model="account.move.line" src_model="" view_id="account_move_line_partner_tree"/>
 
       <!--<menuitem action="act_account_partner_account_move_all" id="menu_account_move_open_unreconcile" parent="account_followup.menu_action_followup_stat"/> -->
 
-        <act_window
-            domain="[('reconcile_id', '=', False), ('account_id.type','=','payable')]"
-            id="act_account_partner_account_move_payable_all"
-            name="Payable Items"
-            res_model="account.move.line"
-            src_model=""
-            view_id="account_move_line_partner_tree"/>
+        <act_window domain="[('reconcile_id', '=', False), ('account_id.type','=','payable')]" id="act_account_partner_account_move_payable_all" name="Payable Items" res_model="account.move.line" src_model="" view_id="account_move_line_partner_tree"/>
 
       <!-- <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/> -->
 
@@ -168,8 +154,8 @@
             <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="overdue_msg" nolabel="1" colspan ="4" position="after">
-                    <field name="follow_up_msg" nolabel="1" colspan ="4"/>
+                <field name="overdue_msg" nolabel="1" colspan="4" position="after">
+                    <field name="follow_up_msg" nolabel="1" colspan="4"/>
                     <separator string="Follow-up Message" colspan="4"/>
                 </field>
             </field>
@@ -197,4 +183,4 @@
         
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 2eb8648e2de..1a01a14f01d 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
 
@@ -15,8 +14,8 @@
             <separator string="title" position="attributes">
                 <attribute name="string">Configure Your Account Sequence Application</attribute>
             </separator>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                <attribute name="string"/>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
                 <attribute name="string">You can enhance the Account Sequence Application by installing .</attribute>
@@ -55,4 +54,4 @@
     </record>
 
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
index 34c1cc51ce6..99f2f3eacab 100644
--- a/addons/base_contact/base_contact_installer_view.xml
+++ b/addons/base_contact/base_contact_installer_view.xml
@@ -14,13 +14,12 @@
                     <separator string="title" position="attributes">
                         <attribute name="string">Select the Option for Addresses Migration</attribute>
                     </separator>
-                    <xpath expr="//label[@string='description']"
-                    position="attributes">
+                    <xpath expr="//label[@string='description']" position="attributes">
                         <attribute name="string">You can migrate Partner's current addresses to the contact.</attribute>
                     </xpath>
-                    <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                        <attribute name='rowspan'>13</attribute>
-                        <attribute name='string'></attribute>
+                    <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                        <attribute name="rowspan">13</attribute>
+                        <attribute name="string"/>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="attributes">
                         <attribute name="string">Configure</attribute>
@@ -28,8 +27,8 @@
                     <group colspan="8">
                         <group colspan="2" col="2">
                             <label string="Due to changes in Address and Partner's relation, some of the details from address are needed to be migrated into contact information." colspan="4"/>
-                            <label string="Otherwise these details will not be visible from address/contact."  colspan="4"/>
-                            <label string="Do you want to migrate your Address data in Contact Data?" colspan="4" />
+                            <label string="Otherwise these details will not be visible from address/contact." colspan="4"/>
+                            <label string="Do you want to migrate your Address data in Contact Data?" colspan="4"/>
                             <group colspan="6">
                                 <field name="migrate" string="Migrate" colspan="1"/>
                             </group>
@@ -56,4 +55,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 0afee6233ef..dd74da8c68a 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
   <data>
 
@@ -21,16 +20,14 @@
               </xpath>
               <xpath expr="//button[@string='Install Modules']" position="replace">
                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                <button name="action_next" icon="gtk-go-forward"
-                        type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
               <xpath expr="//button[@string='Skip']" position="replace">
-                <button name="action_skip" icon="gtk-jump-to" special="cancel"
-                        type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
-              <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
-                  <attribute name='rowspan'>15</attribute>
+              <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                  <attribute name="rowspan">15</attribute>
                 </xpath>
                 <group colspan="8" position="replace">
               <group colspan="8" height="450" width="750">
@@ -72,11 +69,7 @@
       <field name="context">{'menu':True}</field> 
     </record>
 
-    <menuitem parent="base.reporting_menu" name="Report Designer"
-        action="action_report_designer_wizard"
-        id="menu_action_report_designer_wizard" sequence="70" />
+    <menuitem parent="base.reporting_menu" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="70"/>
 
   </data>
-</openerp>
-
-
+</openerp>
\ No newline at end of file
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 586de522a07..051bcf0c594 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -14,9 +14,9 @@
           <xpath expr="//label[@string='description']" position="attributes">
                 <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
           </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                    <attribute name='rowspan'>15</attribute>
+          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
+                    <attribute name="rowspan">15</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Install</attribute>
@@ -82,15 +82,10 @@
       <field name="name">Start Configuration</field>
       <field name="model_id" ref="base.model_ir_actions_todo"/>
       <field name="state">code</field>
-      <field name="code"
-             eval="'# obj is a browse_record and will provide stupid ids to method\n'
-'action = obj.pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
+      <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = obj.pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
     </record>
     
-    <menuitem name="Add More Features"
-              action="action_start_configurator"
-              id="menu_view_base_module_configuration" parent="base.menu_config"
-              type="server" icon="STOCK_EXECUTE" sequence="100" />
+    <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
     <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
       <field name="name">Add More Features</field>
       <field name="resource">ir.ui.menu</field>
@@ -118,8 +113,8 @@
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
                 </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
                 </xpath>
                 <group colspan="8">
                     <field name="import_saleforce"/>
@@ -179,23 +174,22 @@
               <form position="attributes">
                 <attribute name="string">Define default users preferences</attribute>
               </form>
-            <xpath expr='//separator[@string="title"]' position='attributes'>
-                  <attribute name='string'>Define default users preferences</attribute>
+            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                  <attribute name="string">Define default users preferences</attribute>
             </xpath>
-            <xpath expr="//label[@string='description']"
-               position="attributes">
+            <xpath expr="//label[@string='description']" position="attributes">
               <attribute name="string">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
             </xpath>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
-                  <attribute name='rowspan'>12</attribute>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                  <attribute name="rowspan">12</attribute>
             </xpath>
              <group string="res_config_contents" position="replace">
                     <group colspan="4">
-                        <field colspan="4" name="view" />
-                        <field colspan="4" name="context_lang" />
-                        <field colspan="4" name="context_tz" />
-                        <field colspan="4" name="menu_tips" />
+                        <field colspan="4" name="view"/>
+                        <field colspan="4" name="context_lang"/>
+                        <field colspan="4" name="context_tz"/>
+                        <field colspan="4" name="menu_tips"/>
                   </group>
               </group>
             </data>
@@ -263,20 +257,19 @@
               <form position="attributes">
                 <attribute name="string">Specify Your Terminology</attribute>
               </form>
-            <xpath expr='//separator[@string="title"]' position='attributes'>
-                  <attribute name='string'>Specify Your Terminology</attribute>
+            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                  <attribute name="string">Specify Your Terminology</attribute>
             </xpath>
-            <xpath expr="//label[@string='description']"
-               position="attributes">
+            <xpath expr="//label[@string='description']" position="attributes">
               <attribute name="string">Based on the industry needs you can use this wizard to change the terminologies for Partners. </attribute>
             </xpath>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
-                 <attribute name='rowspan'>12</attribute>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                 <attribute name="rowspan">12</attribute>
             </xpath>
              <group string="res_config_contents" position="replace">
                     <group colspan="4">
-                        <field colspan="4" name="partner" />
+                        <field colspan="4" name="partner"/>
                   </group>
               </group>
             </data>
@@ -320,4 +313,4 @@
     </record>
 
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index d10b22ba208..a5df1305c61 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -9,16 +9,16 @@
         <data>
           <xpath expr="//group[@name='crm']" position="replace">
             <newline/>
-            <separator  string="Customer Relationship Management Features" colspan="4" />
-            <field name="crm_claim" groups="base.group_extended" />
-            <field name="crm_helpdesk" groups="base.group_extended" />
-            <field name="crm_fundraising" groups="base.group_extended" />
-            <field name="wiki_sale_faq" groups="base.group_extended" />
-            <field name="sale_crm" invisible="1" groups="base.group_extended" />
-            <field name="crm_caldav" />
-            <field name="fetchmail" />
-            <field name="thunderbird" />
-            <field name="outlook" />
+            <separator string="Customer Relationship Management Features" colspan="4"/>
+            <field name="crm_claim" groups="base.group_extended"/>
+            <field name="crm_helpdesk" groups="base.group_extended"/>
+            <field name="crm_fundraising" groups="base.group_extended"/>
+            <field name="wiki_sale_faq" groups="base.group_extended"/>
+            <field name="sale_crm" invisible="1" groups="base.group_extended"/>
+            <field name="crm_caldav"/>
+            <field name="fetchmail"/>
+            <field name="thunderbird"/>
+            <field name="outlook"/>
           </xpath>
         </data>
       </field>
@@ -59,4 +59,4 @@
     </record>
 
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index f36fb482ba8..b7c5e6a4d1f 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
         <!-- Delivery Carriers -->
@@ -35,7 +34,7 @@
                             <field name="amount" attrs="{'invisible':[('free_if_more_than','=',False)]}"/>
                         </group>
                         <newline/>
-                        <field name="use_detailed_pricelist" />
+                        <field name="use_detailed_pricelist"/>
                     </group>
                         <field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
                          <tree string="Delivery grids">
@@ -145,7 +144,7 @@
                         <field colspan="4" name="name" select="1"/>
                         <newline/>
                         <field name="type" string="Condition"/>
-                        <field name="operator" nolabel="1" />
+                        <field name="operator" nolabel="1"/>
                         <field name="max_value" nolabel="1"/>
                     </group>
                     <newline/>
@@ -340,4 +339,4 @@
        </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 218c93e244c..805795ac3ba 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -16,9 +16,9 @@
           	<xpath expr="//label[@string='description']" position="attributes">
             <attribute name="string">Choose the following Resouces to auto directory configuration.</attribute>
           </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-  				<attribute name='rowspan'>12</attribute>
-      			<attribute name='string'></attribute>
+          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+  				<attribute name="rowspan">12</attribute>
+      			<attribute name="string"/>
 	      	</xpath>
             <group string="res_config_contents" position="replace">
                 <group col="6" colspan="4">
@@ -54,4 +54,4 @@
         <field name="type">special</field>
     </record>
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 2516fd324cb..38340923f0c 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -23,9 +23,9 @@
           	<xpath expr="//label[@string='description']" position="attributes">
             <attribute name="string">Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself..</attribute>
           </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-  				<attribute name='rowspan'>12</attribute>
-      			<attribute name='string'></attribute>
+          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+  				<attribute name="rowspan">12</attribute>
+      			<attribute name="string"/>
 	      	</xpath>
             <group string="res_config_contents" position="replace">
                 <field name="host"/>
@@ -51,4 +51,4 @@
         <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index 7be4c68218e..509a1c2ee84 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
         <record id="view_document_ics_config_directories" model="ir.ui.view">
@@ -12,16 +11,15 @@
                   <attribute name="string">Configure Calendars for CRM Sections</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                <attribute name="string"
-                       >Create Pre-Configured Calendars</attribute>
+                <attribute name="string">Create Pre-Configured Calendars</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">OpenERP can create and pre-configure a series of integrated calendar for you.</attribute>
                     <attribute name="width">200</attribute>
                   </xpath>
-                   <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                          <attribute name='rowspan'>15</attribute>
-                          <attribute name='string'></attribute>
+                   <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                          <attribute name="rowspan">15</attribute>
+                          <attribute name="string"/>
                   </xpath>
                   <xpath expr="//button[@name='action_next']" position="attributes">
                     <attribute name="string">Configure</attribute>
@@ -59,5 +57,4 @@
             <field name="type">special</field>
         </record>
      </data>
-</openerp>
-
+</openerp>
\ No newline at end of file
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
index a90112438a6..0bffdf665a5 100644
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
     <data>
 	 <record model="ir.actions.act_window" id="view_email_server_form_installer">
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 4017181d4bf..9030b7a0409 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
 
@@ -11,16 +10,16 @@
         <data>
            <xpath expr="//group[@name='hr']" position="replace">
             <newline/>
-            <separator  string="Human Resources Features" colspan="4" />
+            <separator string="Human Resources Features" colspan="4"/>
             <field name="hr_holidays"/>
-            <field name="hr_expense" />
-            <field name="hr_recruitment" />
-            <field name="hr_timesheet_sheet" />
-            <field name="hr_contract" />
-            <field name="hr_attendance" />
-            <field name="hr_evaluation" />
-            <field name="hr_payroll" />
-            <field name="hr_payroll_account" groups="base.group_extended" />
+            <field name="hr_expense"/>
+            <field name="hr_recruitment"/>
+            <field name="hr_timesheet_sheet"/>
+            <field name="hr_contract"/>
+            <field name="hr_attendance"/>
+            <field name="hr_evaluation"/>
+            <field name="hr_payroll"/>
+            <field name="hr_payroll_account" groups="base.group_extended"/>
            </xpath>
         </data>
       </field>
@@ -49,4 +48,4 @@
     </record>            
 
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_evaluation/hr_evaluation_installer_view.xml b/addons/hr_evaluation/hr_evaluation_installer_view.xml
index 9d1aa1369f7..20158d76eaa 100644
--- a/addons/hr_evaluation/hr_evaluation_installer_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
  <record model="ir.actions.act_window" id="view_department_form_installer">
@@ -18,4 +17,4 @@
            <field name="type">normal</field>
        </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index ad5970bfc3f..3d18c426780 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
  <record model="ir.actions.act_window" id="product_normal_form_view_installer">
@@ -18,4 +17,4 @@
            <field name="type">normal</field>
        </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 683146e5f58..7b9fea17424 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <openerp>
     <data>
 
@@ -8,24 +7,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
-                    <group col='8' colspan='4'>
+                    <group col="8" colspan="4">
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
-                        <filter string="This Month" icon="terp-go-month" name="This Month"
-                                domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter string="This Month" icon="terp-go-month" name="This Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id">
-                            <filter icon="terp-personal"
-                                name="my_leaves"
-                                domain="[('employee_id.user_id','=', uid)]"
-                                help="My Leaves" />
+                            <filter icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
                         </field>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+" help="My Department Leaves"
-                                domain="[('department_id.manager_id','=',uid)]" />
+                            <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
@@ -34,7 +28,7 @@
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
-                    <newline />
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
@@ -70,10 +64,10 @@
             <field name="arch" type="xml">
                 <form string="Leave Request">
                     <group col="8" colspan="4">
-                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
+                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager"/>
                     <group attrs="{'invisible':[('holiday_type','=','employee')]}">
-                        <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
+                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
@@ -81,8 +75,8 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" />
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/>
                             <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="number_of_days_temp"/>
@@ -114,7 +108,7 @@
             <field name="arch" type="xml">
             <form string="Allocation Request">
                 <group col="8" colspan="4">
-                    <field name="name" />
+                    <field name="name"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Category" groups="base.group_hr_manager"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
@@ -125,14 +119,14 @@
                 </group>
                 <notebook colspan="4">
                     <page string="General">
-                        <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-                        <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" />
+                        <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                        <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/>
                         <field name="number_of_days_temp"/>
                         <newline/>
                         <field name="manager_id"/>
                         <field name="manager_id2"/>
                         <separator string="Reasons" colspan="4"/>
-                        <field name="notes" nolabel="1" colspan="4" />
+                        <field name="notes" nolabel="1" colspan="4"/>
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2" col="6">
@@ -153,14 +147,14 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves" >
+                <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves">
                     <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>
-                    <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
+                    <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
@@ -178,8 +172,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Management">
-                    <field name="name" />
-                    <field name="holiday_status_id" />
+                    <field name="name"/>
+                    <field name="holiday_status_id"/>
                     <field name="type"/>
                     <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
                     <field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
@@ -213,7 +207,7 @@
                     <field name="department_id" invisible="1"/>
                     <field name="type"/>
                     <field name="name"/>
-                    <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
+                    <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="holiday_status_id"/>
@@ -240,7 +234,7 @@
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>
-                    <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
+                    <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="manager_id" invisible="1"/>
@@ -254,11 +248,7 @@
         </record>
 
         <!-- My leave dashboard -->
-        <menuitem
-            name="Leaves"
-            parent="hr.menu_hr_root"
-            id="menu_open_ask_holidays"
-            sequence="5"/>
+        <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="5"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Requests</field>
@@ -292,8 +282,7 @@
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
-        <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new"
-             action="open_ask_holidays"/>
+        <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="open_allocation_holidays">
             <field name="name">Allocation Requests</field>
@@ -319,8 +308,7 @@
             <field name="act_window_id" ref="open_allocation_holidays"/>
         </record>
 
-        <menuitem name="Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays"
-            action="open_allocation_holidays"/>
+        <menuitem name="Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
 
         <record model="ir.actions.act_window" id="open_company_allocation">
             <field name="name">Leaves Summary</field>
@@ -333,12 +321,7 @@
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
-        <menuitem
-            name="Leaves Summary"
-            parent="menu_open_ask_holidays"
-            id="menu_open_company_allocation"
-            action="open_company_allocation"
-            sequence="40"/>
+        <menuitem name="Leaves Summary" parent="menu_open_ask_holidays" id="menu_open_company_allocation" action="open_company_allocation" sequence="40"/>
 
         <!-- holidays status -->
         <record id="view_holidays_status_filter" model="ir.ui.view">
@@ -360,7 +343,7 @@
             <field name="arch" type="xml">
                 <form string="Leave Type">
                     <group colspan="4" col="6">
-                        <field name="name" />
+                        <field name="name"/>
                         <field name="color_name"/>
                         <field name="categ_id" widget="selection" groups="base.group_extended"/>
                     </group>
@@ -373,7 +356,7 @@
                           </group>
                           <group name="second" colspan="2" col="2">
                               <separator string="Misc" colspan="2"/>
-                              <field name="active" />
+                              <field name="active"/>
                           </group>
                       </page>
                     </notebook>
@@ -391,7 +374,7 @@
                     <field name="max_leaves"/>
                     <field name="leaves_taken"/>
                     <field name="remaining_leaves"/>
-                    <field name="limit" />
+                    <field name="limit"/>
                 </tree>
             </field>
         </record>
@@ -403,7 +386,7 @@
             <field name="arch" type="xml">
                 <tree string="Leave Type">
                     <field name="name"/>
-                    <field name="limit" />
+                    <field name="limit"/>
                 </tree>
             </field>
         </record>
@@ -432,10 +415,7 @@
         
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
         
-        <menuitem name="Leave Type"
-            action="open_view_holiday_status"
-            id="menu_open_view_holiday_status"
-            parent="hr.menu_open_view_attendance_reason_config"/>
+        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_open_view_attendance_reason_config"/>
 
     <!-- holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
@@ -451,13 +431,7 @@
         </record>
 
     <!--  Shortcuts -->
-        <act_window name="Leaves"
-            domain="[('type','=','remove')]"
-            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-            res_model="hr.holidays"
-            src_model="hr.employee"
-            view_id ="view_holiday"
-            id="act_hr_employee_holiday_request"/>
+        <act_window name="Leaves" domain="[('type','=','remove')]" context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" res_model="hr.holidays" src_model="hr.employee" view_id="view_holiday" id="act_hr_employee_holiday_request"/>
             
        <!--  Assing leave       -->
         
@@ -503,4 +477,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_recruitment/hr_recruitment_installer_view.xml b/addons/hr_recruitment/hr_recruitment_installer_view.xml
index 45fbe4f0198..ce7430d9fb9 100644
--- a/addons/hr_recruitment/hr_recruitment_installer_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_installer_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
  <record model="ir.actions.act_window" id="hr_recruitment_stage_form_installer">
@@ -18,4 +17,4 @@
            <field name="type">normal</field>
        </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
index 52d554b815c..fa83322db12 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
  
diff --git a/addons/l10n_at/l10n_chart_at_wizard.xml b/addons/l10n_at/l10n_chart_at_wizard.xml
index ce5cf644996..da06b347b97 100644
--- a/addons/l10n_at/l10n_chart_at_wizard.xml
+++ b/addons/l10n_at/l10n_chart_at_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index 5473499d971..a1707bd0708 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
     <data>
 
@@ -9,4 +8,4 @@
     </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
index 819c4a8456a..bb5017d8799 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0"?>
 <openerp>
 	<data>
 
 		<record id="l10n_br_account_chart_template" model="account.chart.template">
 			<field name="name">Planilha de Contas Brasileira</field>
-			<field name="account_root_id" ref="account_template_1" />
+			<field name="account_root_id" ref="account_template_1"/>
 			<field name="tax_code_root_id" ref="tax_code_chart_root"/>
 			<field name="bank_account_view_id" ref="account_template_9"/>
 			<field name="property_account_receivable" ref="account_template_16"/>
-			<field name="property_account_payable" ref="account_template_204" />
-			<field name="property_account_expense_categ" ref="account_template_329" />
-			<field name="property_account_income_categ" ref="account_template_552" />
+			<field name="property_account_payable" ref="account_template_204"/>
+			<field name="property_account_expense_categ" ref="account_template_329"/>
+			<field name="property_account_income_categ" ref="account_template_552"/>
 		</record>
 	
 		<record id="config_call_account_template_brazilian_localization" model="ir.actions.todo">
@@ -25,4 +24,4 @@
 	
 	</data>
 	
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_ca/l10n_ca_wizard.xml b/addons/l10n_ca/l10n_ca_wizard.xml
index ada59135971..7f4b544c7a6 100644
--- a/addons/l10n_ca/l10n_ca_wizard.xml
+++ b/addons/l10n_ca/l10n_ca_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -12,4 +11,4 @@
     	</record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_cn/l10n_chart_cn_wizard.xml b/addons/l10n_cn/l10n_chart_cn_wizard.xml
index 0ddd62716b2..2b9ef49dbe2 100644
--- a/addons/l10n_cn/l10n_chart_cn_wizard.xml
+++ b/addons/l10n_cn/l10n_chart_cn_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -12,4 +11,4 @@
     	</record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml
index 26a82eb22ce..0c67d2356e8 100644
--- a/addons/l10n_cr/l10n_wizard.xml
+++ b/addons/l10n_cr/l10n_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
     <data>
 
@@ -9,4 +8,4 @@
     </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml
index 6512d0ab40d..9e665cbba96 100644
--- a/addons/l10n_de/l10n_de_wizard.xml
+++ b/addons/l10n_de/l10n_de_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -11,4 +10,4 @@
     	</record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_ec/l10n_chart_ec_wizard.xml b/addons/l10n_ec/l10n_chart_ec_wizard.xml
index 06026ba0347..6bec13319b9 100644
--- a/addons/l10n_ec/l10n_chart_ec_wizard.xml
+++ b/addons/l10n_ec/l10n_chart_ec_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -12,4 +11,4 @@
     	</record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml
index d0f89dfc87a..66b7ced79f1 100644
--- a/addons/l10n_es/l10n_es_wizard.xml
+++ b/addons/l10n_es/l10n_es_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 0e97d868a52..cb7b6a2d3a9 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
     <data>
 
@@ -9,4 +8,4 @@
     </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_gr/l10n_gr_wizard.xml b/addons/l10n_gr/l10n_gr_wizard.xml
index 7affcffd719..2197f5f262b 100644
--- a/addons/l10n_gr/l10n_gr_wizard.xml
+++ b/addons/l10n_gr/l10n_gr_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 7cc96ba0d23..941bdd2384b 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
 
@@ -78,4 +77,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml
index ec091ccecb9..d8efbe1cda8 100644
--- a/addons/l10n_in/l10n_in_wizard.xml
+++ b/addons/l10n_in/l10n_in_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
diff --git a/addons/l10n_it/l10n_chart_it_generic.xml b/addons/l10n_it/l10n_chart_it_generic.xml
index f1c96ccee68..2e4abe860e1 100644
--- a/addons/l10n_it/l10n_chart_it_generic.xml
+++ b/addons/l10n_it/l10n_chart_it_generic.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -11,4 +10,4 @@
 	        <field name="state">open</field>
     	</record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index bbe7949af49..766540467b7 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
     <data>
 
@@ -9,4 +8,4 @@
     </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml
index a59a2e9ca83..0f86c95e859 100644
--- a/addons/l10n_ma/l10n_ma_wizard.xml
+++ b/addons/l10n_ma/l10n_ma_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
     <data>
 
@@ -9,4 +8,4 @@
     </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_mx/l10n_chart_mx_wizard.xml b/addons/l10n_mx/l10n_chart_mx_wizard.xml
index e1052a26d68..08fa38419d3 100644
--- a/addons/l10n_mx/l10n_chart_mx_wizard.xml
+++ b/addons/l10n_mx/l10n_chart_mx_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -12,4 +11,4 @@
     	</record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml
index c6cfdf30598..078ed60aacd 100644
--- a/addons/l10n_nl/l10n_nl_wizard.xml
+++ b/addons/l10n_nl/l10n_nl_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
     <data>
 
@@ -8,7 +7,7 @@
 * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het Nederlandse grootboekschema bevind.
 * Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency om Journalen te creeren.
     
-Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen"
+Let op!! -&gt; De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen"
     
 * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
 </field>
@@ -17,4 +16,4 @@ Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 ci
     </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_pl/l10n_chart_pl_wizard.xml b/addons/l10n_pl/l10n_chart_pl_wizard.xml
index f2233cd67c1..0c4f71ea5e6 100644
--- a/addons/l10n_pl/l10n_chart_pl_wizard.xml
+++ b/addons/l10n_pl/l10n_chart_pl_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
diff --git a/addons/l10n_ro/l10n_chart_ro_wizard.xml b/addons/l10n_ro/l10n_chart_ro_wizard.xml
index 02a290522a9..032ae31535e 100644
--- a/addons/l10n_ro/l10n_chart_ro_wizard.xml
+++ b/addons/l10n_ro/l10n_chart_ro_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -12,4 +11,4 @@
     	</record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_syscohada/l10n_syscohada_wizard.xml b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
index 84c0f68e0a4..6266e743245 100644
--- a/addons/l10n_syscohada/l10n_syscohada_wizard.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 	<record id="config_call_account_template_syscohada" model="ir.actions.todo">
@@ -9,4 +8,4 @@
 	        <field name="state">open</field>
     	</record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 0f6f044503f..baa327b7ab5 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
 <data>
 
@@ -656,5 +655,4 @@ This is the same wizard that runs from Financial Management/Configuration/Financ
 </record>
 
 </data>
-</openerp>
-<!-- vim: set fdm=marker : -->
+</openerp><!-- vim: set fdm=marker : -->
\ No newline at end of file
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index e00fbd67add..56ab3fad104 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -13,4 +12,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_ve/l10n_chart_ve_wizard.xml b/addons/l10n_ve/l10n_chart_ve_wizard.xml
index 9b73902c7c9..0f2e981d9fe 100644
--- a/addons/l10n_ve/l10n_chart_ve_wizard.xml
+++ b/addons/l10n_ve/l10n_chart_ve_wizard.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -15,4 +14,4 @@ Esto es el mismo wizard que corre de la Financial Management/Configuration/Finan
     	</record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
index a3fec3777fc..89256d868e5 100644
--- a/addons/lunch/lunch_installer_view.xml
+++ b/addons/lunch/lunch_installer_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
  <record model="ir.actions.act_window" id="view_lunch_product_form_installer">
@@ -17,4 +16,4 @@
            <field name="type">normal</field>
        </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 349938f11d9..6dfd91a8bbc 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
         <record id="view_outlook_installer" model="ir.ui.view">
@@ -19,20 +18,18 @@
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
                         <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                        <button name="action_next" icon="gtk-go-forward"
-                                type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
                     </xpath>
                     <xpath expr="//button[@string='Skip']" position="replace">
-                        <button name="action_skip" icon="gtk-jump-to" special="cancel"
-                                type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+                        <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
                     </xpath>
-                    <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                        <attribute name='string'></attribute>
-                        <attribute name='rowspan'>15</attribute>
+                    <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                        <attribute name="string"/>
+                        <attribute name="rowspan">15</attribute>
                     </xpath>
                     <group colspan="8" position="replace">
                         <group colspan="8" height="450" width="750">
-                            <field name="outlook" invisible="1" />
+                            <field name="outlook" invisible="1"/>
                             <field name="name" invisible="1"/>
                             <field name="doc_name" invisible="1"/>
                                 <newline/>
@@ -76,15 +73,8 @@
             <field name="context">{'menu':True}</field>
         </record>
 
-        <menuitem id="base.menu_base_config_plugins"
-                  name="Plugins"
-                  parent="base.menu_base_config"
-                  sequence="10" />
+        <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
 
-        <menuitem id="menu_base_config_plugins_outlook"
-                  action="action_outlook_wizard"
-                  name="Load Outlook Plug-In"
-                  parent="base.menu_base_config_plugins"
-                  sequence="10" />
+        <menuitem id="menu_base_config_plugins_outlook" action="action_outlook_wizard" name="Load Outlook Plug-In" parent="base.menu_base_config_plugins" sequence="10"/>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
index c1ff05ce32e..71024c8f4a3 100644
--- a/addons/product/wizard/product_installer.xml
+++ b/addons/product/wizard/product_installer.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -22,4 +21,4 @@
         </record>
         
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index b37aba76a4d..10c361e733b 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
         <!-- configartion view -->
@@ -19,9 +18,9 @@
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">Define minimum amount after which puchase is needed to be validated.</attribute>
                   </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                      <attribute name='rowspan'>15</attribute>
-                      <attribute name='string'></attribute>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                      <attribute name="rowspan">15</attribute>
+                      <attribute name="string"/>
                   </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="limit_amount"/>
@@ -54,4 +53,4 @@
         </record>
         
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index fe76f411d29..eb9965c24b7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
-            groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
@@ -16,7 +14,7 @@
                 <form string="Sales Shop">
                     <field name="name" select="1"/>
                     <field name="warehouse_id" required="1" select="1" widget="selection"/>
-                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <separator colspan="4" string="Accounting"/>
                     <field name="payment_default_id"/>
                     <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
@@ -48,8 +46,7 @@
             <field name="help">If you have more than one shop reselling your company products, you can create and manage that from here. Whenever you will record a new quotation or sales order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sales.</field>
         </record>
 
-        <menuitem action="action_shop_form" id="menu_action_shop_form"
-            parent="base.menu_sale_config_sales" sequence="0" />
+        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_sale_config_sales" sequence="0"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -85,7 +82,7 @@
                     <field name="date_order"/>
                     <field name="client_order_ref" groups="base.group_extended"/>
                     <field name="partner_id"/>
-                    <field name="user_id" />
+                    <field name="user_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_untaxed" sum="Total Tax Excluded"/>
@@ -116,34 +113,18 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
-                            <field name="project_id"
-                                context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
-                                groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
+                            <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sales Order Lines">
                                     <notebook>
                                         <page string="Order Line">
-                                            <field colspan="4"
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                name="product_id"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
-                                                />
-                                            <field
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                name="product_uom_qty"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"
-                                                />
-                                            <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
+                                            <field colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                            <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
+                                            <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
                                             <field groups="product.group_uos" name="product_uos"/>
-                                            <field
-                                                name="product_packaging"
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
-                                                domain="[('product_id','=',product_id)]"
-                                                groups="base.group_extended"/>
+                                            <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
 
                                             <field colspan="4" name="name"/>
                                             <field name="price_unit"/>
@@ -158,12 +139,7 @@
                                                 <field name="state"/>
                                                 <field name="invoiced"/>
                                                 <group attrs="{'invisible':[('invoiced','=',True)]}">
-                                                <button colspan="1"
-                                                    name="%(action_view_sale_order_line_make_invoice)d"
-                                                    states="confirmed"
-                                                    string="Make Invoices"
-                                                    type="action"
-                                                    icon="terp-document-new" />
+                                                <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
                                                  </group>
                                             </group>
                                         </page>
@@ -198,8 +174,7 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice"
-                                    type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
+                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>
@@ -266,7 +241,7 @@
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
-                    <field name="date_order" select="1" string="Order date" />
+                    <field name="date_order" select="1" string="Order date"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1">
                         <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
@@ -398,21 +373,9 @@
                     <separator colspan="4"/>
                     <field name="state"/>
                     <group col="3" colspan="2">
-                        <button name="button_cancel"
-                            string="Cancel" type="object"
-                            icon="gtk-cancel"
-                            states="confirmed,exception"/>
-                        <button colspan="1"
-                            name="%(action_view_sale_order_line_make_invoice)d"
-                            string="Create Invoice"
-                            type="action"
-                            states="done"
-                            icon="gtk-go-forward"
-                            attrs="{'invisible': [('invoiced', '=', 1)]}"/>
-                        <button name="button_done"
-                            string="Done" type="object"
-                            states="confirmed,exception"
-                            icon="gtk-go-forward" />
+                        <button name="button_cancel" string="Cancel" type="object" icon="gtk-cancel" states="confirmed,exception"/>
+                        <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}"/>
+                        <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -449,26 +412,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <filter icon="terp-gtk-go-back-rtl" string="To Do"
-                        domain="[('state','=','confirmed')]"
-                        name="sale order"
-                        help="Confirmed sale order lines, not yet delivered"
-                        />
-                    <filter icon="terp-dialog-close" string="Done"
-                        domain="[('state','=','done')]"
-                        name="sale_order_done"
-                        help="Sale order lines done"
-                        />
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-accessories-archiver" string="Shipped"
-                        domain="[('state','=','done')]"
-                        name="unshipped"
-                        help="Sale Order Lines that are in 'done' state"
-                        />
-                    <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced"
-                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
-                        help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"
-                        />
+                    <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
+                    <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
@@ -476,7 +424,7 @@
                     <field name="salesman_id">
                         <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     </field>
-                    <newline />
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="9" col="8">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
@@ -493,7 +441,7 @@
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
+            <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter"/>
             <field name="context">{"search_default_uninvoiced":1}</field>
             <field name="filter" eval="True"/>
             <field name="help">Here is a list of each sales order line to be invoiced. You can invoice sales orders partially, by lines of sales order. You do not need this list if you invoice from the delivery orders or if you invoice sales totally.</field>
@@ -509,24 +457,11 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <act_window
-        context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
-        id="act_res_partner_2_sale_order"
-        name="Quotations and Sales"
-        groups="base.group_sale_salesman"
-        res_model="sale.order"
-        src_model="res.partner"/>
+        <act_window context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}" id="act_res_partner_2_sale_order" name="Quotations and Sales" groups="base.group_sale_salesman" res_model="sale.order" src_model="res.partner"/>
 
-        <act_window
-        context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
-        id="action_order_line_product_tree"
-        name="Sales Order Lines"
-        res_model="sale.order.line"
-        src_model="product.product"
-        groups="base.group_sale_salesman"/>
+        <act_window context="{'search_default_product_id': [active_id], 'default_product_id': active_id}" id="action_order_line_product_tree" name="Sales Order Lines" res_model="sale.order.line" src_model="product.product" groups="base.group_sale_salesman"/>
 
-        <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"
-            groups="-base.group_extended"/>
+        <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5" groups="-base.group_extended"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <!-- configartion view -->
 
@@ -546,16 +481,16 @@
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">Define your invoice method. A services company usually invoices based on sale orders while a retailer usually invoices based on deliveries.</attribute>
                   </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                      <attribute name='rowspan'>15</attribute>
-                      <attribute name='string'></attribute>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                      <attribute name="rowspan">15</attribute>
+                      <attribute name="string"/>
                   </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="order_policy"/>
                   <newline/>
                   <field name="step" groups="base.group_extended"/>
                 </group>
-                <xpath expr='//button[@name="action_skip"]' position='replace'/>
+                <xpath expr="//button[@name=&quot;action_skip&quot;]" position="replace"/>
               </data>
             </field>
         </record>
@@ -579,4 +514,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index b204eefda7c..7ae81547aae 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -19,20 +19,18 @@
               </xpath>
 	          <xpath expr="//button[@string='Install Modules']" position="replace">
                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-                <button name="action_next" icon="gtk-go-forward"
-                        type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
               <xpath expr="//button[@string='Skip']" position="replace">
-                <button name="action_skip" icon="gtk-jump-to" special="cancel"
-                        type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+                <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
               </xpath>
-              <xpath expr='//separator[@string="vsep"]' position='attributes'>
-		  		<attribute name='string'></attribute>
-		  		<attribute name='rowspan'>15</attribute>
+              <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+		  		<attribute name="string"/>
+		  		<attribute name="rowspan">15</attribute>
 		  	  </xpath>
 		  	  <group colspan="8" position="replace">
               <group colspan="8" height="450" width="750">
-                  <field name="thunderbird" invisible="1" />
+                  <field name="thunderbird" invisible="1"/>
                   <field name="name" invisible="1"/>
                   <field name="pdf_name" invisible="1"/>
                   <newline/>
@@ -78,8 +76,8 @@
       <field name="context">{'menu':True}</field>
     </record>
 
-	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
-	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
+	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
+	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10"/>
 
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/users_ldap/user_ldap_installer.xml b/addons/users_ldap/user_ldap_installer.xml
index 301527116cd..a5f473ff5fb 100644
--- a/addons/users_ldap/user_ldap_installer.xml
+++ b/addons/users_ldap/user_ldap_installer.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -50,4 +49,4 @@
             <field name="target">current</field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file