diff --git a/addons/account/account_assert_test.xml b/addons/account/account_assert_test.xml
index a94cf8507d8..9d3e1e45d0f 100644
--- a/addons/account/account_assert_test.xml
+++ b/addons/account/account_assert_test.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <assert model="account.move" search="[]" string="For all account moves, the state is valid implies that the sum of credits equals the sum of debits">
-            <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)" />
+            <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
         </assert>
         
         <!--assert model="account.invoice" search="[]" string="If the invoice is paid, third party accounting lines must be reconciled">
@@ -10,24 +10,24 @@
 		</assert-->
         
         <assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its childs">
-            <test expr="not len(child_id) or (balance - sum([c.balance for c in child_id]) &lt;= 0.00001)" />
+            <test expr="not len(child_id) or (balance - sum([c.balance for c in child_id]) &lt;= 0.00001)"/>
         </assert>
         
         <assert model="account.move.line" search="[('account_id.type', '=', 'view')]" string="Accounts of view type do not contain any move line">
-            <test expr="False" />
+            <test expr="False"/>
         </assert>
         
         <assert model="account.invoice" search="[('state', 'in', ['paid', 'open'])]" string="The total amount of all paid or open invoices is correctly computed">
-            <test expr="sum([l.price_subtotal for l in invoice_line]) - amount_untaxed &lt;= 0.00001" />
+            <test expr="sum([l.price_subtotal for l in invoice_line]) - amount_untaxed &lt;= 0.00001"/>
         </assert>
         
         <assert model="account.move.reconcile" search="[]" string="For each reconciliation, the sum of credits equals the sum of debits">
-            <test expr="sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001" />
+            <test expr="sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001"/>
         </assert>
         
         <assert model="account.account" search="[]" string="Every account must have at least one parent account of type '0'">
-            <test expr="not parent_id or '0' in [p.code for p in parent_id]" />
+            <test expr="not parent_id or '0' in [p.code for p in parent_id]"/>
              
         </assert>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index 6661c12690b..63ff26351f6 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -6,89 +6,89 @@
 	Fiscal year
 	-->	
         
-        <record model="account.fiscalyear" id="data_fiscalyear">
-            <field name="name" eval="'Fiscal Year '+time.strftime('%Y')"/>
-            <field name="code" eval="'FY'+time.strftime('%Y')"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-01-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-12-31'"/>
+        <record id="data_fiscalyear" model="account.fiscalyear">
+            <field eval="'Fiscal Year '+time.strftime('%Y')" name="name"/>
+            <field eval="'FY'+time.strftime('%Y')" name="code"/>
+            <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
         </record>
         
         <!--
 	Fiscal Periods
 	-->	
         
-        <record model="account.period" id="period_1">
-            <field name="name" eval="'Jan.'+time.strftime('%Y')"/>
+        <record id="period_1" model="account.period">
+            <field eval="'Jan.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-01-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-01-31'"/>
+            <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-01-31'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_2">
-            <field name="name" eval="'Feb.'+time.strftime('%Y')"/>
+        <record id="period_2" model="account.period">
+            <field eval="'Feb.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-02-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-02-28'"/>
+            <field eval="time.strftime('%Y')+'-02-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-02-28'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_3">
-            <field name="name" eval="'Mar.'+time.strftime('%Y')"/>
+        <record id="period_3" model="account.period">
+            <field eval="'Mar.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-03-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-03-31'"/>
+            <field eval="time.strftime('%Y')+'-03-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-03-31'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_4">
-            <field name="name" eval="'Apr.'+time.strftime('%Y')"/>
+        <record id="period_4" model="account.period">
+            <field eval="'Apr.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-04-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-04-30'"/>
+            <field eval="time.strftime('%Y')+'-04-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-04-30'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_5">
-            <field name="name" eval="'May.'+time.strftime('%Y')"/>
+        <record id="period_5" model="account.period">
+            <field eval="'May.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-05-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-05-31'"/>
+            <field eval="time.strftime('%Y')+'-05-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-05-31'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_6">
-            <field name="name" eval="'Jun.'+time.strftime('%Y')"/>
+        <record id="period_6" model="account.period">
+            <field eval="'Jun.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-06-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-06-30'"/>
+            <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-06-30'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_7">
-            <field name="name" eval="'Jul.'+time.strftime('%Y')"/>
+        <record id="period_7" model="account.period">
+            <field eval="'Jul.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-07-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-07-31'"/>
+            <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-07-31'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_8">
-            <field name="name" eval="'Aug.'+time.strftime('%Y')"/>
+        <record id="period_8" model="account.period">
+            <field eval="'Aug.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-08-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-08-31'"/>
+            <field eval="time.strftime('%Y')+'-08-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-08-31'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_9">
-            <field name="name" eval="'Sep.'+time.strftime('%Y')"/>
+        <record id="period_9" model="account.period">
+            <field eval="'Sep.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-09-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-09-30'"/>
+            <field eval="time.strftime('%Y')+'-09-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-09-30'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_10">
-            <field name="name" eval="'Oct.'+time.strftime('%Y')"/>
+        <record id="period_10" model="account.period">
+            <field eval="'Oct.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-10-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-10-31'"/>
+            <field eval="time.strftime('%Y')+'-10-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-10-31'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_11">
-            <field name="name" eval="'Nov.'+time.strftime('%Y')"/>
+        <record id="period_11" model="account.period">
+            <field eval="'Nov.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-11-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-11-30'"/>
+            <field eval="time.strftime('%Y')+'-11-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-11-30'" name="date_stop"/>
         </record>
-        <record model="account.period" id="period_12">
-            <field name="name" eval="'Dec.'+time.strftime('%Y')"/>
+        <record id="period_12" model="account.period">
+            <field eval="'Dec.'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
-            <field name="date_start" eval="time.strftime('%Y')+'-12-01'"/>
-            <field name="date_stop" eval="time.strftime('%Y')+'-12-31'"/>
+            <field eval="time.strftime('%Y')+'-12-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index 821628bb121..5f9cdfd3b75 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -1,17 +1,17 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <menuitem name='Financial Management/End of Year Treatments' sequence='20' id='menu_account_end_year_treatments'/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance" sequence="20"/>
         
-        <record id='action_account_period_tree' model='ir.actions.act_window'>
-            <field name='name'>Close Period</field>
-            <field name='res_model'>account.period</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','draft')]</field>
-            <field name='view_id' ref='view_account_period_tree'/>
+        <record id="action_account_period_tree" model="ir.actions.act_window">
+            <field name="name">Close Period</field>
+            <field name="res_model">account.period</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','draft')]</field>
+            <field name="view_id" ref="view_account_period_tree"/>
         </record>
-        <menuitem name='Financial Management/End of Year Treatments/Close Period' action='action_account_period_tree' id='menu_action_account_period_close_tree'/>
+        <menuitem action="action_account_period_tree" id="menu_action_account_period_close_tree" parent="account.menu_account_end_year_treatments"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 9dffcf12fdc..50458fa4b72 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
@@ -6,183 +6,183 @@
 		Invoices
 		-->
         
-        <record id='view_invoice_line_tree' model='ir.ui.view'>
-            <field name='name'>account.invoice.line.tree</field>
-            <field name='model'>account.invoice.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Invoice Line'>
-                    <field name='name'/>
-                    <field name='account_id'/>
-                    <field name='quantity'/>
-                    <field name='uos_id'/>
-                    <field name='price_unit'/>
-                    <field name='discount'/>
-                    <field name='price_subtotal'/>
+        <record id="view_invoice_line_tree" model="ir.ui.view">
+            <field name="name">account.invoice.line.tree</field>
+            <field name="model">account.invoice.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Invoice Line">
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="quantity"/>
+                    <field name="uos_id"/>
+                    <field name="price_unit"/>
+                    <field name="discount"/>
+                    <field name="price_subtotal"/>
                 </tree>
             </field>
         </record>
-        <record id='view_invoice_line_form' model='ir.ui.view'>
-            <field name='name'>account.invoice.line.form</field>
-            <field name='model'>account.invoice.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Invoice Line'>
+        <record id="view_invoice_line_form" model="ir.ui.view">
+            <field name="name">account.invoice.line.form</field>
+            <field name="model">account.invoice.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Invoice Line">
                     <notebook>
-                        <page string='Line'>
-                            <field name='product_id' on_change='product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id)' select='1'/>
-                            <field name='uos_id'/>
-                            <field name='quantity' select='1'/>
-                            <field name='price_unit' select='1'/>
-                            <field name='discount'/>
-                            <field name='name' select='1' colspan='4'/>
-                            <field name='account_id' domain='[(&apos;company_id&apos;, &apos;=&apos;, parent.company_id), (&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id), (&apos;type&apos;, &apos;&lt;&gt;&apos;, &apos;view&apos;)]' on_change='onchange_account_id(parent.partner_id,account_id)'/>
-                            <field name='account_analytic_id' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;view&apos;), (&apos;company_id&apos;, &apos;=&apos;, parent.company_id)]'/>
+                        <page string="Line">
+                            <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id)" select="1"/>
+                            <field name="uos_id"/>
+                            <field name="quantity" select="1"/>
+                            <field name="price_unit" select="1"/>
+                            <field name="discount"/>
+                            <field colspan="4" name="name" select="1"/>
+                            <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.partner_id,account_id)"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
                             <newline/>
-                            <field name='price_subtotal'/>
-                            <field name='invoice_line_tax_id' colspan='4'/>
+                            <field name="price_subtotal"/>
+                            <field colspan="4" name="invoice_line_tax_id"/>
                              
                         </page>
-                        <page string='Notes'>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='view_invoice_tax_tree' model='ir.ui.view'>
-            <field name='name'>account.invoice.tax.tree</field>
-            <field name='model'>account.invoice.tax</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Manual Invoice Taxes'>
-                    <field name='sequence'/>
-                    <field name='manual'/>
-                    <field name='name'/>
-                    <field name='account_id'/>
-                    <field name='base'/>
-                    <field name='amount'/>
+        <record id="view_invoice_tax_tree" model="ir.ui.view">
+            <field name="name">account.invoice.tax.tree</field>
+            <field name="model">account.invoice.tax</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Manual Invoice Taxes">
+                    <field name="sequence"/>
+                    <field name="manual"/>
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="base"/>
+                    <field name="amount"/>
                 </tree>
             </field>
         </record>
-        <record id='view_invoice_tax_form' model='ir.ui.view'>
-            <field name='name'>account.invoice.tax.form</field>
-            <field name='model'>account.invoice.tax</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Manual Invoice Taxes'>
-                    <field name='name' select='1'/>
-                    <field name='sequence'/>
-                    <field name='account_id' select='1'/>
-                    <field name='manual' select='1'/>
-                    <field name='amount' select='1'/>
-                    <field name='base' readonly='0'/>
-                    <separator string='Tax codes' colspan='4'/>
-                    <field name='base_code_id'/>
-                    <field name='base_amount'/>
-                    <field name='tax_code_id'/>
-                    <field name='tax_amount'/>
+        <record id="view_invoice_tax_form" model="ir.ui.view">
+            <field name="name">account.invoice.tax.form</field>
+            <field name="model">account.invoice.tax</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Manual Invoice Taxes">
+                    <field name="name" select="1"/>
+                    <field name="sequence"/>
+                    <field name="account_id" select="1"/>
+                    <field name="manual" select="1"/>
+                    <field name="amount" select="1"/>
+                    <field name="base" readonly="0"/>
+                    <separator colspan="4" string="Tax codes"/>
+                    <field name="base_code_id"/>
+                    <field name="base_amount"/>
+                    <field name="tax_code_id"/>
+                    <field name="tax_amount"/>
                 </form>
             </field>
         </record>
         
-        <record id='invoice_tree' model='ir.ui.view'>
-            <field name='name'>account.invoice.tree</field>
-            <field name='model'>account.invoice</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree colors='blue:state==&apos;draft&apos;' string='Invoice'>
-                    <field name='name'/>
-                    <field name='type'/>
-                    <field name='number'/>
-                    <field name='partner_id'/>
-                    <field name='amount_untaxed' sum='Untaxed amount'/>
-                    <field name='amount_total' sum='Total amount'/>
-                    <field name='currency_id'/>
-                    <field name='date_invoice'/>
-                    <field name='date_due' select='1'/>
-                    <field name='state'/>
+        <record id="invoice_tree" model="ir.ui.view">
+            <field name="name">account.invoice.tree</field>
+            <field name="model">account.invoice</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="blue:state=='draft'" string="Invoice">
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="number"/>
+                    <field name="partner_id"/>
+                    <field name="amount_untaxed" sum="Untaxed amount"/>
+                    <field name="amount_total" sum="Total amount"/>
+                    <field name="currency_id"/>
+                    <field name="date_invoice"/>
+                    <field name="date_due" select="1"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='invoice_supplier_form' model='ir.ui.view'>
-            <field name='name'>account.invoice.supplier.form</field>
-            <field name='model'>account.invoice</field>
-            <field name='type'>form</field>
-            <field name='priority'>2</field>
-            <field name='arch' type='xml'>
-                <form string='Supplier invoice'>
+        <record id="invoice_supplier_form" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="priority">2</field>
+            <field name="arch" type="xml">
+                <form string="Supplier invoice">
                     <notebook>
-                        <page string='Invoice'>
-                            <field name='journal_id' domain='[(&apos;type&apos;, &apos;=&apos;, &apos;purchase&apos;)]' select='2'/>
-                            <field name='type' readonly='1' select='2'/>
-                            <field name='partner_id' on_change='onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)' select='1'/>
-                            <field name='address_invoice_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]'/>
-                            <field name='account_id' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;view&apos;), (&apos;company_id&apos;, &apos;=&apos;, company_id),(&apos;journal_id&apos;,&apos;=&apos;,journal_id)]'/>
-                            <field name='date_due' select='1'/>
-                            <field name='partner_bank' domain='[(&apos;partner_id&apos;, &apos;=&apos;, partner_id)]' on_change='onchange_partner_bank(partner_bank)' select='2'/>
-                            <field name='reference_type' size='0' nolabel='1' select='2'/>
-                            <field name='reference' nolabel='1' select='1'/>
-                            <field name='check_total' required='2'/>
-                            <field name='currency_id' on_change='onchange_currency_id(currency_id)' select='2'/>
-                            <field name='invoice_line' default_get='{&apos;check_total&apos;: check_total, &apos;invoice_line&apos;: invoice_line, &apos;address_invoice_id&apos;: address_invoice_id, &apos;partner_id&apos;: partner_id, &apos;price_type&apos;: &apos;price_type&apos; in dir() and price_type or False}' nolabel='1' colspan='4'>
-                                <tree editable='bottom' string='Invoice lines'>
-                                    <field name='product_id' on_change='product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, price_unit, parent.address_invoice_id)'/>
-                                    <field name='account_id' domain='[(&apos;company_id&apos;, &apos;=&apos;, parent.company_id), (&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id), (&apos;type&apos;, &apos;&lt;&gt;&apos;, &apos;view&apos;)]' on_change='onchange_account_id(parent.partner_id,account_id)'/>
-                                    <field name='invoice_line_tax_id' view_mode='2'/>
-                                    <field name='account_analytic_id' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;view&apos;), (&apos;company_id&apos;, &apos;=&apos;, parent.company_id)]'/>
-                                    <field name='quantity'/>
-                                    <field name='price_unit'/>
+                        <page string="Invoice">
+                            <field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
+                            <field name="type" readonly="1" select="2"/>
+                            <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)" select="1"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
+                            <field name="date_due" select="1"/>
+                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)" select="2"/>
+                            <field name="reference_type" nolabel="1" select="2" size="0"/>
+                            <field name="reference" nolabel="1" select="1"/>
+                            <field name="check_total" required="2"/>
+                            <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
+                            <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
+                                <tree editable="bottom" string="Invoice lines">
+                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, price_unit, parent.address_invoice_id)"/>
+                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.partner_id,account_id)"/>
+                                    <field name="invoice_line_tax_id" view_mode="2"/>
+                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
+                                    <field name="quantity"/>
+                                    <field name="price_unit"/>
                                      <!-- Removed if subtotal is set -->
-                                    <field name='price_subtotal'/>
-                                    <field name='name'/>
-                                    <field name='uos_id' invisible='True'/>
+                                    <field name="price_subtotal"/>
+                                    <field name="name"/>
+                                    <field invisible="True" name="uos_id"/>
                                 </tree>
                             </field>
-                            <group col='1' colspan='2'>
-                                <field name='tax_line' nolabel='1'>
-                                    <tree editable='bottom' string='Taxes'>
-                                        <field name='name'/>
-                                        <field name='base' readonly='1' on_change='base_change(base)'/>
-                                        <field name='amount' on_change='amount_change(amount)'/>
+                            <group col="1" colspan="2">
+                                <field name="tax_line" nolabel="1">
+                                    <tree editable="bottom" string="Taxes">
+                                        <field name="name"/>
+                                        <field name="base" on_change="base_change(base)" readonly="1"/>
+                                        <field name="amount" on_change="amount_change(amount)"/>
                                         
-                                        <field name='base_amount' invisible='True'/>
-                                        <field name='tax_amount' invisible='True'/>
+                                        <field invisible="True" name="base_amount"/>
+                                        <field invisible="True" name="tax_amount"/>
                                     </tree>
                                 </field>
                             </group>
-                            <group col='4' colspan='2'>
-                                <label colspan='2'/>
-                                <field name='amount_untaxed'/>
-                                <button name='button_reset_taxes' type='object' states='draft' string='Reset taxes' colspan='2'/>
-                                <field name='amount_tax'/>
-                                <button name='button_compute' type='object' states='draft' string='Compute' colspan='2'/>
-                                <field name='amount_total'/>
-                                <field name='reconciled'/>
-                                <field name='state' select='2'/>
-                                <group col='3' colspan='4'>
-                                    <button name='invoice_open' states='draft,proforma' string='Validate'/>
-                                    <button name='invoice_cancel' states='draft,proforma,sale,open' string='Cancel'/>
-                                    <button name='action_cancel_draft' type='object' states='cancel' string='Set to Draft'/>
+                            <group col="4" colspan="2">
+                                <label colspan="2"/>
+                                <field name="amount_untaxed"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Reset taxes" type="object"/>
+                                <field name="amount_tax"/>
+                                <button colspan="2" name="button_compute" states="draft" string="Compute" type="object"/>
+                                <field name="amount_total"/>
+                                <field name="reconciled"/>
+                                <field name="state" select="2"/>
+                                <group col="3" colspan="4">
+                                    <button name="invoice_open" states="draft,proforma" string="Validate"/>
+                                    <button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                                 </group>
                             </group>
                         </page>
-                        <page string='Other Info'>
-                            <field name='company_id'/>
+                        <page string="Other Info">
+                            <field name="company_id"/>
                             <newline/>
-                            <field name='payment_term' on_change='onchange_payment_term_date_invoice(payment_term, date_invoice)'/>
-                            <field name='name' select='2'/>
+                            <field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)"/>
+                            <field name="name" select="2"/>
                             <newline/>
-                            <field name='number' select='2'/>
-                            <field name='origin'/>
-                            <field name='address_contact_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]' colspan='4'/>
-                            <field name='move_id'/>
-                            <field name='date_invoice' on_change='onchange_payment_term_date_invoice(payment_term, date_invoice)' select='1'/>
-                            <field name='period_id'/>
-                            <label align='0.0' string='(keep empty to use the current period)' colspan='2'/>
-                            <separator string='Additionnal Information' colspan='4'/>
-                            <field name='comment' nolabel='1' colspan='4'/>
+                            <field name="number" select="2"/>
+                            <field name="origin"/>
+                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
+                            <field name="move_id"/>
+                            <field name="date_invoice" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" select="1"/>
+                            <field name="period_id"/>
+                            <label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
+                            <separator colspan="4" string="Additionnal Information"/>
+                            <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -190,333 +190,333 @@
         </record>
         
         
-        <record id='invoice_form' model='ir.ui.view'>
-            <field name='name'>account.invoice.form</field>
-            <field name='model'>account.invoice</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Invoice'>
+        <record id="invoice_form" model="ir.ui.view">
+            <field name="name">account.invoice.form</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Invoice">
                     <notebook>
-                        <page string='Invoice'>
-                            <field name='journal_id' select='2'/>
-                            <field name='type' readonly='1' select='2'/>
-                            <field name='partner_id' on_change='onchange_partner_id(type,partner_id,date_invoice,payment_term)' select='1'/>
-                            <field name='address_invoice_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]'/>
-                            <field name='account_id' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;view&apos;), (&apos;company_id&apos;, &apos;=&apos;, company_id),(&apos;journal_id&apos;,&apos;=&apos;,journal_id)]'/>
-                            <field name='payment_term' on_change='onchange_payment_term_date_invoice(payment_term, date_invoice)'/>
-                            <field name='name' select='2'/>
-                            <field name='number' select='1'/>
-                            <field name='currency_id' on_change='onchange_currency_id(currency_id)' select='2'/>
-                            <field name='invoice_line' nolabel='1' widget='one2many_list' colspan='4'/>
-                            <group col='1' colspan='2'>
-                                <field name='tax_line' nolabel='1'>
-                                    <tree editable='bottom' string='Taxes'>
-                                        <field name='name'/>
-                                        <field name='base' readonly='1' on_change='base_change(base)'/>
-                                        <field name='amount' on_change='amount_change(amount)'/>
-                                        <field name='base_amount' invisible='True'/>
-                                        <field name='tax_amount' invisible='True'/>
+                        <page string="Invoice">
+                            <field name="journal_id" select="2"/>
+                            <field name="type" readonly="1" select="2"/>
+                            <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
+                            <field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)"/>
+                            <field name="name" select="2"/>
+                            <field name="number" select="1"/>
+                            <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
+                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
+                            <group col="1" colspan="2">
+                                <field name="tax_line" nolabel="1">
+                                    <tree editable="bottom" string="Taxes">
+                                        <field name="name"/>
+                                        <field name="base" on_change="base_change(base)" readonly="1"/>
+                                        <field name="amount" on_change="amount_change(amount)"/>
+                                        <field invisible="True" name="base_amount"/>
+                                        <field invisible="True" name="tax_amount"/>
                                     </tree>
                                 </field>
                             </group>
-                            <group col='4' colspan='2'>
-                                <label colspan='2'/>
-                                <field name='amount_untaxed'/>
-                                <button name='button_reset_taxes' type='object' states='draft' string='Reset taxes' colspan='2'/>
-                                <field name='amount_tax'/>
-                                <button name='button_compute' type='object' states='draft' string='Compute' colspan='2'/>
-                                <field name='amount_total'/>
-                                <field name='reconciled'/>
-                                <field name='state' select='2'/>
-                                <group col='3' colspan='4'>
-                                    <button name='invoice_proforma' states='draft' string='PRO-FORMA'/>
-                                    <button name='invoice_open' states='draft,proforma' string='Create'/>
-                                    <button name='invoice_cancel' states='draft,proforma,sale,open' string='Cancel'/>
-                                    <button name='action_cancel_draft' type='object' states='cancel' string='Set to Draft'/>
+                            <group col="4" colspan="2">
+                                <label colspan="2"/>
+                                <field name="amount_untaxed"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Reset taxes" type="object"/>
+                                <field name="amount_tax"/>
+                                <button colspan="2" name="button_compute" states="draft" string="Compute" type="object"/>
+                                <field name="amount_total"/>
+                                <field name="reconciled"/>
+                                <field name="state" select="2"/>
+                                <group col="3" colspan="4">
+                                    <button name="invoice_proforma" states="draft" string="PRO-FORMA"/>
+                                    <button name="invoice_open" states="draft,proforma" string="Create"/>
+                                    <button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                                 </group>
                             </group>
                         </page>
-                        <page string='Other Info'>
-                            <field name='company_id'/>
+                        <page string="Other Info">
+                            <field name="company_id"/>
                             <newline/>
-                            <field name='date_due' select='1'/>
+                            <field name="date_due" select="1"/>
                             <newline/>
-                            <field name='partner_bank' domain='[(&apos;partner_id.ref_companies&apos;, &apos;in&apos;, [company_id])]' select='2'/>
-                            <field name='origin'/>
-                            <field name='address_contact_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]' colspan='4'/>
-                            <field name='move_id'/>
-                            <field name='date_invoice' on_change='onchange_payment_term_date_invoice(payment_term, date_invoice)' select='1'/>
-                            <field name='period_id'/>
-                            <label align='0.0' string='(keep empty to use the current period)' colspan='2'/>
-                            <separator string='Additionnal Information' colspan='4'/>
-                            <field name='comment' nolabel='1' colspan='4'/>
+                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank" select="2"/>
+                            <field name="origin"/>
+                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
+                            <field name="move_id"/>
+                            <field name="date_invoice" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" select="1"/>
+                            <field name="period_id"/>
+                            <label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
+                            <separator colspan="4" string="Additionnal Information"/>
+                            <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
         
-        <menuitem name='Financial Management/Invoices' sequence='6' id='menu_finance_invoice'/>
+        <menuitem id="menu_finance_invoice" name="Invoices" parent="account.menu_finance" sequence="6"/>
         
-        <record id='action_invoice_tree1' model='ir.actions.act_window'>
-            <field name='name'>Customer Invoice</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
-            <field name='view_id' eval='invoice_form'/>
-            <field name='domain'>[('type','=','out_invoice')]</field>
-            <field name='context'>{'type':'out_invoice'}</field>
+        <record id="action_invoice_tree1" model="ir.actions.act_window">
+            <field name="name">Customer Invoice</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field eval="invoice_form" name="view_id"/>
+            <field name="domain">[('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice'}</field>
         </record>
-        <menuitem name='Financial Management/Invoices/' action='action_invoice_tree1' id='menu_action_invoice_tree1'/>
+        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="account.menu_finance_invoice"/>
         
-        <record id='action_invoice_tree2' model='ir.actions.act_window'>
-            <field name='name'>Supplier Invoice</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
-            <field name='view_id' eval='invoice_supplier_form'/>
-            <field name='domain'>[('type','=','in_invoice')]</field>
-            <field name='context'>{'type':'in_invoice'}</field>
+        <record id="action_invoice_tree2" model="ir.actions.act_window">
+            <field name="name">Supplier Invoice</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field eval="invoice_supplier_form" name="view_id"/>
+            <field name="domain">[('type','=','in_invoice')]</field>
+            <field name="context">{'type':'in_invoice'}</field>
         </record>
-        <menuitem name='Financial Management/Invoices/' action='action_invoice_tree2' id='menu_action_invoice_tree2'/>
+        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/>
         
-        <record id='action_invoice_tree3' model='ir.actions.act_window'>
-            <field name='name'>Customer Refund</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
-            <field name='view_id' eval='invoice_form'/>
-            <field name='domain'>[('type','=','out_refund')]</field>
-            <field name='context'>{'type':'out_refund'}</field>
+        <record id="action_invoice_tree3" model="ir.actions.act_window">
+            <field name="name">Customer Refund</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field eval="invoice_form" name="view_id"/>
+            <field name="domain">[('type','=','out_refund')]</field>
+            <field name="context">{'type':'out_refund'}</field>
         </record>
-        <menuitem name='Financial Management/Invoices/' action='action_invoice_tree3' id='menu_action_invoice_tree3'/>
+        <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
         
-        <record id='action_invoice_tree4' model='ir.actions.act_window'>
-            <field name='name'>Supplier Refund</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
-            <field name='view_id' eval='invoice_supplier_form'/>
-            <field name='domain'>[('type','=','in_refund')]</field>
-            <field name='context'>{'type':'in_refund'}</field>
+        <record id="action_invoice_tree4" model="ir.actions.act_window">
+            <field name="name">Supplier Refund</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field eval="invoice_supplier_form" name="view_id"/>
+            <field name="domain">[('type','=','in_refund')]</field>
+            <field name="context">{'type':'in_refund'}</field>
         </record>
-        <menuitem name='Financial Management/Invoices/' action='action_invoice_tree4' id='menu_action_invoice_tree4'/>
+        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/>
         
-        <record id='action_invoice_tree5' model='ir.actions.act_window'>
-            <field name='name'>Draft Customer Invoices</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','draft'),('type','=','out_invoice')]</field>
-            <field name='context'>{'type':'out_invoice'}</field>
+        <record id="action_invoice_tree5" model="ir.actions.act_window">
+            <field name="name">Draft Customer Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice'}</field>
         </record>
-        <record id='action_invoice_tree5_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree5'/>
+        <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree5"/>
         </record>
-        <record id='action_invoice_tree5_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_form'/>
-            <field name='act_window_id' ref='action_invoice_tree5'/>
+        <record id="action_invoice_tree5_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree5"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Customer Invoice/' action='action_invoice_tree5' id='menu_invoice_draft'/>
+        <menuitem id="next_id_35" name="Customer Invoice" parent="account.menu_finance_invoice"/><menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="next_id_35"/>
         
-        <record id='action_invoice_tree6' model='ir.actions.act_window'>
-            <field name='name'>PRO-FORMA Customer Invoices</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','proforma'),('type','=','out_invoice')]</field>
-            <field name='context'>{'type':'out_invoice'}</field>
+        <record id="action_invoice_tree6" model="ir.actions.act_window">
+            <field name="name">PRO-FORMA Customer Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','proforma'),('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice'}</field>
         </record>
-        <record id='action_invoice_tree6_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree6'/>
+        <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree6"/>
         </record>
-        <record id='action_invoice_tree6_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_form'/>
-            <field name='act_window_id' ref='action_invoice_tree6'/>
+        <record id="action_invoice_tree6_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree6"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Customer Invoice/' action='action_invoice_tree6' id='menu_action_invoice_tree6'/>
+        <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="account.next_id_35"/>
         
-        <record id='action_invoice_tree7' model='ir.actions.act_window'>
-            <field name='name'>Open Customer Invoices</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','open'),('type','=','out_invoice')]</field>
-            <field name='context'>{'type':'out_invoice'}</field>
+        <record id="action_invoice_tree7" model="ir.actions.act_window">
+            <field name="name">Open Customer Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','open'),('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice'}</field>
         </record>
-        <record id='action_invoice_tree7_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree7'/>
+        <record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree7"/>
         </record>
-        <record id='action_invoice_tree7_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_form'/>
-            <field name='act_window_id' ref='action_invoice_tree7'/>
+        <record id="action_invoice_tree7_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree7"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Customer Invoice/' action='action_invoice_tree7' id='menu_action_invoice_tree7'/>
+        <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="account.next_id_35"/>
         
-        <record id='action_invoice_tree8' model='ir.actions.act_window'>
-            <field name='name'>Draft Supplier Invoices</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','draft'),('type','=','in_invoice')]</field>
-            <field name='context'>{'type':'in_invoice'}</field>
+        <record id="action_invoice_tree8" model="ir.actions.act_window">
+            <field name="name">Draft Supplier Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','draft'),('type','=','in_invoice')]</field>
+            <field name="context">{'type':'in_invoice'}</field>
         </record>
-        <record id='action_invoice_tree8_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree8'/>
+        <record id="action_invoice_tree8_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree8"/>
         </record>
-        <record id='action_invoice_tree8_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_supplier_form'/>
-            <field name='act_window_id' ref='action_invoice_tree8'/>
+        <record id="action_invoice_tree8_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_invoice_tree8"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Supplier Invoice/' action='action_invoice_tree8' id='menu_action_invoice_tree8'/>
+        <menuitem id="next_id_36" name="Supplier Invoice" parent="account.menu_finance_invoice"/><menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="next_id_36"/>
         
-        <record id='action_invoice_tree9' model='ir.actions.act_window'>
-            <field name='name'>Open Supplier Invoices</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','open'),('type','=','in_invoice')]</field>
-            <field name='context'>{'type':'in_invoice'}</field>
+        <record id="action_invoice_tree9" model="ir.actions.act_window">
+            <field name="name">Open Supplier Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','open'),('type','=','in_invoice')]</field>
+            <field name="context">{'type':'in_invoice'}</field>
         </record>
-        <record id='action_invoice_tree9_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree9'/>
+        <record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree9"/>
         </record>
-        <record id='action_invoice_tree9_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_supplier_form'/>
-            <field name='act_window_id' ref='action_invoice_tree9'/>
+        <record id="action_invoice_tree9_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_invoice_tree9"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Supplier Invoice/' action='action_invoice_tree9' id='menu_action_invoice_tree9'/>
+        <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="account.next_id_36"/>
         
-        <record id='action_invoice_tree10' model='ir.actions.act_window'>
-            <field name='name'>Draft Customer Refunds</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','draft'),('type','=','out_refund')]</field>
-            <field name='context'>{'type':'out_refund'}</field>
+        <record id="action_invoice_tree10" model="ir.actions.act_window">
+            <field name="name">Draft Customer Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','draft'),('type','=','out_refund')]</field>
+            <field name="context">{'type':'out_refund'}</field>
         </record>
-        <record id='action_invoice_tree10_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree10'/>
+        <record id="action_invoice_tree10_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree10"/>
         </record>
-        <record id='action_invoice_tree10_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_form'/>
-            <field name='act_window_id' ref='action_invoice_tree10'/>
+        <record id="action_invoice_tree10_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree10"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Customer Refund/' action='action_invoice_tree10' id='menu_action_invoice_tree10'/>
+        <menuitem id="next_id_37" name="Customer Refund" parent="account.menu_finance_invoice"/><menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="next_id_37"/>
         
-        <record id='action_invoice_tree11' model='ir.actions.act_window'>
-            <field name='name'>Open Customer Refunds</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','open'),('type','=','out_refund')]</field>
-            <field name='context'>{'type':'out_refund'}</field>
+        <record id="action_invoice_tree11" model="ir.actions.act_window">
+            <field name="name">Open Customer Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','open'),('type','=','out_refund')]</field>
+            <field name="context">{'type':'out_refund'}</field>
         </record>
-        <record id='action_invoice_tree11_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree11'/>
+        <record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree11"/>
         </record>
-        <record id='action_invoice_tree11_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_form'/>
-            <field name='act_window_id' ref='action_invoice_tree11'/>
+        <record id="action_invoice_tree11_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree11"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Customer Refund/' action='action_invoice_tree11' id='menu_action_invoice_tree11'/>
+        <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="account.next_id_37"/>
         
-        <record id='action_invoice_tree12' model='ir.actions.act_window'>
-            <field name='name'>Draft Supplier Refunds</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','draft'),('type','=','in_refund')]</field>
-            <field name='context'>{'type':'in_refund'}</field>
+        <record id="action_invoice_tree12" model="ir.actions.act_window">
+            <field name="name">Draft Supplier Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','draft'),('type','=','in_refund')]</field>
+            <field name="context">{'type':'in_refund'}</field>
         </record>
-        <record id='action_invoice_tree12_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree12'/>
+        <record id="action_invoice_tree12_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree12"/>
         </record>
-        <record id='action_invoice_tree12_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_supplier_form'/>
-            <field name='act_window_id' ref='action_invoice_tree12'/>
+        <record id="action_invoice_tree12_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_invoice_tree12"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Supplier Refund/' action='action_invoice_tree12' id='menu_action_invoice_tree12'/>
+        <menuitem id="next_id_38" name="Supplier Refund" parent="account.menu_finance_invoice"/><menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="next_id_38"/>
         
-        <record id='action_invoice_tree13' model='ir.actions.act_window'>
-            <field name='name'>Open Supplier Refunds</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','open'),('type','=','in_refund')]</field>
-            <field name='context'>{'type':'in_refund'}</field>
+        <record id="action_invoice_tree13" model="ir.actions.act_window">
+            <field name="name">Open Supplier Refunds</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','open'),('type','=','in_refund')]</field>
+            <field name="context">{'type':'in_refund'}</field>
         </record>
-        <record id='action_invoice_tree13_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree13'/>
+        <record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree13"/>
         </record>
-        <record id='action_invoice_tree13_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_supplier_form'/>
-            <field name='act_window_id' ref='action_invoice_tree13'/>
+        <record id="action_invoice_tree13_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_supplier_form"/>
+            <field name="act_window_id" ref="action_invoice_tree13"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/Supplier Refund/' action='action_invoice_tree13' id='menu_action_invoice_tree13'/>
+        <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="account.next_id_38"/>
         
-        <record id='action_invoice_tree' model='ir.actions.act_window'>
-            <field name='name'>All Invoices</field>
-            <field name='res_model'>account.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='invoice_tree'/>
-            <field name='context'>{'type':'out_invoice'}</field>
+        <record id="action_invoice_tree" model="ir.actions.act_window">
+            <field name="name">All Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="invoice_tree"/>
+            <field name="context">{'type':'out_invoice'}</field>
         </record>
-        <record id='action_invoice_tree_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='act_window_id' ref='action_invoice_tree'/>
+        <record id="action_invoice_tree_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
-        <record id='action_invoice_tree_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='invoice_form'/>
-            <field name='act_window_id' ref='action_invoice_tree'/>
+        <record id="action_invoice_tree_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="invoice_form"/>
+            <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
         
-        <menuitem name='Financial Management/Invoices/All Invoices' action='action_invoice_tree' id='menu_action_invoice_tree'/>
+        <menuitem action="action_invoice_tree" id="menu_action_invoice_tree" parent="account.menu_finance_invoice"/>
         
-        <act_window name='Open invoices' domain='[(&apos;partner_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;, &apos;=&apos;, &apos;open&apos;)]' id='act_res_partner_2_account_invoice_opened' src_model='res.partner' res_model='account.invoice'/>
+        <act_window domain="[('partner_id', '=', active_id),('state', '=', 'open')]" id="act_res_partner_2_account_invoice_opened" name="Open invoices" res_model="account.invoice" src_model="res.partner"/>
         
-        <act_window name='Open invoices' domain='[(&apos;journal_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;, &apos;=&apos;, &apos;open&apos;)]' id='act_account_journal_2_account_invoice_opened' src_model='account.journal' res_model='account.invoice'/>
+        <act_window domain="[('journal_id', '=', active_id),('state', '=', 'open')]" id="act_account_journal_2_account_invoice_opened" name="Open invoices" res_model="account.invoice" src_model="account.journal"/>
         
-        <act_window name='Invoice lines' domain='[(&apos;account_analytic_id&apos;, &apos;=&apos;, active_id)]' id='act_account_analytic_account_2_account_invoice_line' src_model='account.analytic.account' res_model='account.invoice.line'/>
+        <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 13e02fd6d58..3e1e8afd8b1 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="workflow" id="wkf">
+        <record id="wkf" model="workflow">
             <field name="name">account.invoice.basic</field>
             <field name="osv">account.invoice</field>
             <field name="on_create">True</field>
         </record>
         
-        <record model="workflow.activity" id="act_draft">
+        <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
@@ -16,30 +16,34 @@
 			<field name="wkf_id" ref="wkf"/>
 			<field name="name">confirm</field>
 		</record> -->
-        <record model="workflow.activity" id="act_proforma">
+        <record id="act_proforma" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">proforma</field>
-            <field name="action">action_move_create()&#10;write({'state':'proforma'})</field>
+            <field name="action">action_move_create()
+write({'state':'proforma'})</field>
             <field name="kind">function</field>
         </record>
-        <record model="workflow.activity" id="act_open">
+        <record id="act_open" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">open</field>
-            <field name="action">action_move_create()&#10;action_number()&#10;write({'state':'open'})</field>
+            <field name="action">action_move_create()
+action_number()
+write({'state':'open'})</field>
             <field name="kind">function</field>
         </record>
-        <record model="workflow.activity" id="act_paid">
+        <record id="act_paid" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">paid</field>
             <field name="flow_stop">True</field>
             <field name="action">write({'state':'paid'})</field>
             <field name="kind">function</field>
         </record>
-        <record model="workflow.activity" id="act_cancel">
+        <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">cancel</field>
             <field name="flow_stop">True</field>
-            <field name="action">action_cancel()&#10;write({'state':'cancel'})</field>
+            <field name="action">action_cancel()
+write({'state':'cancel'})</field>
             <field name="kind">function</field>
         </record>
         
@@ -50,49 +54,49 @@
 		</record>
 		-->
         
-        <record model="workflow.transition" id="t3">
+        <record id="t3" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_proforma"/>
             <field name="signal">invoice_proforma</field>
         </record>
-        <record model="workflow.transition" id="t4">
+        <record id="t4" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_open"/>
             <field name="signal">invoice_open</field>
         </record>
-        <record model="workflow.transition" id="t5">
+        <record id="t5" model="workflow.transition">
             <field name="act_from" ref="act_proforma"/>
             <field name="act_to" ref="act_open"/>
             <field name="signal">invoice_open</field>
         </record>
-        <record model="workflow.transition" id="t7">
+        <record id="t7" model="workflow.transition">
             <field name="act_from" ref="act_proforma"/>
             <field name="act_to" ref="act_paid"/>
             <field name="trigger_model">account.move.line</field>
             <field name="trigger_expr_id">move_line_id_payment_get()</field>
             <field name="condition">test_paid()</field>
         </record>
-        <record model="workflow.transition" id="t8">
+        <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_paid"/>
             <field name="trigger_model">account.move.line</field>
             <field name="trigger_expr_id">move_line_id_payment_get()</field>
             <field name="condition">test_paid()</field>
         </record>
-        <record model="workflow.transition" id="t9">
+        <record id="t9" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-        <record model="workflow.transition" id="t11">
+        <record id="t11" model="workflow.transition">
             <field name="act_from" ref="act_proforma"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-        <record model="workflow.transition" id="t12">
+        <record id="t12" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 74dfd1cf7d2..5b0f2821198 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -1,27 +1,27 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report name='account.general.ledger' id='account_general_ledger' rml='account/report/general_ledger.rml' auto='False' model='account.account' menu='False' string='General Ledger'/>
-        <report name='account.third_party_ledger' id='account_3rdparty_ledger' rml='account/report/third_party_ledger.rml' auto='False' model='res.partner' menu='False' string='Partner ledger'/>
-        <report name='account.account.balance' id='account_account_balance' rml='account/report/account_balance.rml' auto='False' model='account.account' menu='False' string='Account balance'/>
-        <report name='account.partner.balance' id='account_3rdparty_account_balance' rml='account/report/partner_balance.rml' auto='False' model='account.account' menu='False' string='Partner balance'/>
-        <report name='account.budget' id='account_budget' rml='account/report/budget_report.rml' auto='False' model='account.budget.post' menu='False' string='Print Budget'/>
-        <report name='account.central.journal' id='account_central_journal' rml='account/report/central_journal.rml' auto='False' model='account.journal.period' string='Print Central Journal'/>
-        <report name='account.general.journal' id='account_general_journal' rml='account/report/general_journal.rml' auto='False' model='account.journal.period' string='Print General Journal'/>
-        <report name='account.journal.period.print' id='account_journal' rml='account/report/account_journal.rml' auto='False' model='account.journal.period' string='Print Journal'/>
-        <report name='account.overdue' id='account_overdue' rml='account/report/overdue.rml' auto='False' model='res.partner' string='Overdue payments'/>
-        <report name='account.invoice' id='account_invoices' rml='account/report/invoice.rml' auto='False' model='account.invoice' string='Invoices'/>
-        <report name='account.transfer' xml='account/report/transfer.xml' id='account_transfers' xsl='account/report/transfer.xsl' model='account.transfer' string='Transfers'/>
-        <report name='account.intracom' id='account_intracom' auto='False' model='account.move.line' menu='False' string='IntraCom'/>
+        <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/general_ledger.rml" string="General Ledger"/>
+        <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/third_party_ledger.rml" string="Partner ledger"/>
+        <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account balance"/>
+        <report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/partner_balance.rml" string="Partner balance"/>
+        <report auto="False" id="account_budget" menu="False" model="account.budget.post" name="account.budget" rml="account/report/budget_report.rml" string="Print Budget"/>
+        <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/central_journal.rml" string="Print Central Journal"/>
+        <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/general_journal.rml" string="Print General Journal"/>
+        <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Print Journal"/>
+        <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue payments"/>
+        <report auto="False" id="account_invoices" model="account.invoice" name="account.invoice" rml="account/report/invoice.rml" string="Invoices"/>
+        <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
+        <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
         
-        <report name='account.tax.code.entries' id='account_move_line_list' rml='account/report/account_tax_code.rml' model='account.tax.code' string='All Entries'/>
+        <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
         
         
-        <report name='account.vat.declaration' id='account_vat_declaration' rml='account/report/tax_report.rml' auto='False' model='account.tax.code' menu='False' string='Taxes report'/>
+        <report auto="False" id="account_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" rml="account/report/tax_report.rml" string="Taxes report"/>
         
-        <wizard name='account.vat.declaration' id='wizard_vat_declaration' model='account.tax.code' menu='False' string='Wizard taxes report'/>
+        <wizard id="wizard_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" string="Wizard taxes report"/>
         
-        <menuitem name='Financial Management/Reporting/Taxes Report' action='wizard_vat_declaration' type='wizard' id='menu_wizard_vat_declaration'/>
+        <menuitem action="wizard_vat_declaration" id="menu_wizard_vat_declaration" parent="account.menu_finance_reporting" type="wizard"/>
         
         
         <!--
@@ -34,4 +34,4 @@
 			auto="False" />
 		-->
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_security.xml b/addons/account/account_security.xml
index 3a38fd31405..33fda7ff04e 100644
--- a/addons/account/account_security.xml
+++ b/addons/account/account_security.xml
@@ -1,41 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="res.groups" id="group_account_invoice">
+        <record id="group_account_invoice" model="res.groups">
             <field name="name">Financial Invoice</field>
         </record>
         
-        <record model="res.groups" id="group_account_user">
+        <record id="group_account_user" model="res.groups">
             <field name="name">Financial User</field>
         </record>
         
-        <record model="res.groups" id="group_account_admin">
+        <record id="group_account_admin" model="res.groups">
             <field name="name">Financial Admin</field>
         </record>
         
-        <record model="res.users" id="base.user_admin">
-            <field name="groups_id" eval="[(4, ref('base.group_admin')), (4, ref('group_account_invoice')), (4, ref('group_account_user')), (4, ref('group_account_admin'))]"/>
+        <record id="base.user_admin" model="res.users">
+            <field eval="[(4, ref('base.group_admin')), (4, ref('group_account_invoice')), (4, ref('group_account_user')), (4, ref('group_account_admin'))]" name="groups_id"/>
         </record>
         
-        <record model="ir.model.access" id="access_payment_term">
+        <record id="access_payment_term" model="ir.model.access">
             <field name="name">Payment Term</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.payment.term')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.payment.term')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_payment_term_account_admin">
+        <record id="access_payment_term_account_admin" model="ir.model.access">
             <field name="name">Payment Term</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.payment.term')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.payment.term')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--		<record model="ir.model.access" id="access_payment_term_admin">
@@ -49,25 +47,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_payment_term_line">
+        <record id="access_payment_term_line" model="ir.model.access">
             <field name="name">Payment Term Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.payment.term.line')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.payment.term.line')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_payment_term_line_account_admin">
+        <record id="access_payment_term_line_account_admin" model="ir.model.access">
             <field name="name">Payment Term Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.payment.term.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.payment.term.line')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         <!--
 
@@ -82,25 +78,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_account_type">
+        <record id="access_account_type" model="ir.model.access">
             <field name="name">Account Type</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.account.type')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.account.type')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_account_type_account_admin">
+        <record id="access_account_type_account_admin" model="ir.model.access">
             <field name="name">Account Type</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.account.type')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.account.type')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         <!--
 
@@ -115,25 +109,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_account">
+        <record id="access_account" model="ir.model.access">
             <field name="name">Account</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.account')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.account')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_account_account_admin">
+        <record id="access_account_account_admin" model="ir.model.access">
             <field name="name">Account</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.account')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.account')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         <!--
 
@@ -148,25 +140,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_journal_view">
+        <record id="access_journal_view" model="ir.model.access">
             <field name="name">Journal View</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.view')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.view')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_journal_view_account_admin">
+        <record id="access_journal_view_account_admin" model="ir.model.access">
             <field name="name">Journal View</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.view')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.view')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_journal_view_admin">
@@ -180,25 +170,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_journal_column">
+        <record id="access_journal_column" model="ir.model.access">
             <field name="name">Journal Column</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.column')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.column')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_journal_column_account_admin">
+        <record id="access_journal_column_account_admin" model="ir.model.access">
             <field name="name">Journal Column</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.column')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.column')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_journal_column_admin">
@@ -212,25 +200,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_journal">
+        <record id="access_journal" model="ir.model.access">
             <field name="name">Journal</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_journal_account_admin">
+        <record id="access_journal_account_admin" model="ir.model.access">
             <field name="name">Journal</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_journal_admin">
@@ -244,25 +230,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_fiscalyear">
+        <record id="access_fiscalyear" model="ir.model.access">
             <field name="name">Fiscal Year</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.fiscalyear')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.fiscalyear')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_fiscalyear_account_admin">
+        <record id="access_fiscalyear_account_admin" model="ir.model.access">
             <field name="name">Fiscal Year</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.fiscalyear')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.fiscalyear')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_fiscalyear_admin">
@@ -276,25 +260,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_period">
+        <record id="access_period" model="ir.model.access">
             <field name="name">Period</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.period')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.period')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_period_account_admin">
+        <record id="access_period_account_admin" model="ir.model.access">
             <field name="name">Period</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.period')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.period')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_period_admin">
@@ -308,25 +290,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_journal_period">
+        <record id="access_journal_period" model="ir.model.access">
             <field name="name">Journal Period</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.period')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.period')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_journal_period_account_admin">
+        <record id="access_journal_period_account_admin" model="ir.model.access">
             <field name="name">Journal Period</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.period')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.period')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_journal_period_admin">
@@ -340,14 +320,13 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_move">
+        <record id="access_move" model="ir.model.access">
             <field name="name">Entry</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_move_account_invoice">
@@ -361,15 +340,14 @@
 			<field name="perm_unlink" eval="False"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_move_account_user">
+        <record id="access_move_account_user" model="ir.model.access">
             <field name="name">Entry</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_move_account_admin">
@@ -394,14 +372,13 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_move_reconcile">
+        <record id="access_move_reconcile" model="ir.model.access">
             <field name="name">Reconciliation</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.reconcile')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move.reconcile')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_move_reconcile_account_invoice">
@@ -415,15 +392,14 @@
 			<field name="perm_unlink" eval="False"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_move_reconcile_account_user">
+        <record id="access_move_reconcile_account_user" model="ir.model.access">
             <field name="name">Reconciliation</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.reconcile')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move.reconcile')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_move_reconcile_account_admin">
@@ -448,25 +424,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_tax_code">
+        <record id="access_tax_code" model="ir.model.access">
             <field name="name">Tax Code</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.tax.code')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.tax.code')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_tax_code_account_admin">
+        <record id="access_tax_code_account_admin" model="ir.model.access">
             <field name="name">Tax Code</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.tax.code')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.tax.code')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_tax_code_admin">
@@ -480,25 +454,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_tax">
+        <record id="access_tax" model="ir.model.access">
             <field name="name">Tax</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.tax')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.tax')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_tax_account_admin">
+        <record id="access_tax_account_admin" model="ir.model.access">
             <field name="name">Tax</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.tax')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.tax')]"/>
             <field name="group_id" ref="group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_tax_admin">
@@ -512,193 +484,175 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_budget_post">
+        <record id="access_budget_post" model="ir.model.access">
             <field name="name">Budget Item</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.budget.post')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.budget.post')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_budget_post_account_user">
+        <record id="access_budget_post_account_user" model="ir.model.access">
             <field name="name">Budget Item</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.budget.post')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.budget.post')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_budget_post_dotation">
+        <record id="access_budget_post_dotation" model="ir.model.access">
             <field name="name">Budget Item Endowment</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.budget.post.dotation')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.budget.post.dotation')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_budget_post_dotation_account_user">
+        <record id="access_budget_post_dotation_account_user" model="ir.model.access">
             <field name="name">Budget Item Endowment</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.budget.post.dotation')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.budget.post.dotation')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_model">
+        <record id="access_model" model="ir.model.access">
             <field name="name">Model</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.model')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.model')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_model_account_user">
+        <record id="access_model_account_user" model="ir.model.access">
             <field name="name">Model</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.model')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.model')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_model_line">
+        <record id="access_model_line" model="ir.model.access">
             <field name="name">Model Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.model.line')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.model.line')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_model_line_account_user">
+        <record id="access_model_line_account_user" model="ir.model.access">
             <field name="name">Model Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.model.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.model.line')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_subscription">
+        <record id="access_subscription" model="ir.model.access">
             <field name="name">Subscription</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.subscription')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.subscription')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_subscription_account_user">
+        <record id="access_subscription_account_user" model="ir.model.access">
             <field name="name">Subscription</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.subscription')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.subscription')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_subscription_line">
+        <record id="access_subscription_line" model="ir.model.access">
             <field name="name">Subscription Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.subscription.line')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.subscription.line')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_subscription_line_account_user">
+        <record id="access_subscription_line_account_user" model="ir.model.access">
             <field name="name">Subscription Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.subscription.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.subscription.line')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_bank_statement">
+        <record id="access_bank_statement" model="ir.model.access">
             <field name="name">Bank Statement</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_bank_statement_account_user">
+        <record id="access_bank_statement_account_user" model="ir.model.access">
             <field name="name">Bank Statement</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_bank_statement_reconcile">
+        <record id="access_bank_statement_reconcile" model="ir.model.access">
             <field name="name">Statement Reconcile</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.reconcile')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.reconcile')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_bank_statement_reconcile_account_user">
+        <record id="access_bank_statement_reconcile_account_user" model="ir.model.access">
             <field name="name">Statement Reconcile</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.reconcile')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.reconcile')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_bank_statement_reconcile_line">
+        <record id="access_bank_statement_reconcile_line" model="ir.model.access">
             <field name="name">Statement Reconcile Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.reconcile.line')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.reconcile.line')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_bank_statement_reconcile_line_account_user">
+        <record id="access_bank_statement_reconcile_line_account_user" model="ir.model.access">
             <field name="name">Statement Reconcile Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.reconcile.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.reconcile.line')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_bank_statement_reconcile_line_account_admin">
@@ -723,25 +677,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_bank_statement_line">
+        <record id="access_bank_statement_line" model="ir.model.access">
             <field name="name">Bank Statement Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.line')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.line')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_bank_statement_line_account_user">
+        <record id="access_bank_statement_line_account_user" model="ir.model.access">
             <field name="name">Bank Statement Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.line')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_bank_statement_line_account_admin">
@@ -766,25 +718,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_move_line">
+        <record id="access_move_line" model="ir.model.access">
             <field name="name">Entry Lines</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.line')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move.line')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_move_line_account_user">
+        <record id="access_move_line_account_user" model="ir.model.access">
             <field name="name">Entry Lines</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move.line')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_move_line_account_admin">
@@ -820,25 +770,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_invoice">
+        <record id="access_invoice" model="ir.model.access">
             <field name="name">Invoice</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_invoice_account_invoice">
+        <record id="access_invoice_account_invoice" model="ir.model.access">
             <field name="name">Invoice</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice')]"/>
             <field name="group_id" ref="group_account_invoice"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_invoice_account_user">
@@ -874,25 +822,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_invoice_line">
+        <record id="access_invoice_line" model="ir.model.access">
             <field name="name">Invoice Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.line')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice.line')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_invoice_line_account_invoice">
+        <record id="access_invoice_line_account_invoice" model="ir.model.access">
             <field name="name">Invoice Line</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice.line')]"/>
             <field name="group_id" ref="group_account_invoice"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_invoice_line_account_user">
@@ -928,25 +874,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_invoice_tax">
+        <record id="access_invoice_tax" model="ir.model.access">
             <field name="name">Invoice Tax</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.tax')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice.tax')]"/>
+            <field eval="False" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_invoice_tax_account_invoice">
+        <record id="access_invoice_tax_account_invoice" model="ir.model.access">
             <field name="name">Invoice Tax</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.tax')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice.tax')]"/>
             <field name="group_id" ref="group_account_invoice"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_invoice_tax_account_user">
@@ -983,4 +927,4 @@
 		</record>-->
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index 4179fbdf30f..0a3ebc10d7d 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!-- This file must be loaded  _after_  account_demo.xml ! --> 
-        <record model="account.invoice" id="test_invoice_1">
+        <record id="test_invoice_1" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="address_invoice_id" ref="base.res_partner_address_tang"/>
@@ -14,14 +14,14 @@
             <field name="name">Test invoice 1</field>
             <field name="address_contact_id" ref="base.res_partner_address_tang"/>
         </record>
-        <record model="account.invoice.line" id="test_invoice_1_line_1">
+        <record id="test_invoice_1_line_1" model="account.invoice.line">
             <field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
             <field name="invoice_id" ref="test_invoice_1"/>
             <field name="price_unit">250</field>
             <field name="quantity">1</field>
             <field name="account_id" ref="account.a_sale"/>
         </record>
-        <record model="account.invoice.line" id="test_invoice_1_line_2">
+        <record id="test_invoice_1_line_2" model="account.invoice.line">
             <field name="name">Little server with raid 1 and 512ECC ram</field>
             <field name="invoice_id" ref="test_invoice_1"/>
             <field name="price_unit">800</field>
@@ -29,18 +29,18 @@
             <field name="account_id" ref="account.a_sale"/>
         </record>
         
-        <assert model="account.invoice" id="test_invoice_1" string="The currency unit of Test invoice 1 is EUR">
+        <assert id="test_invoice_1" model="account.invoice" string="The currency unit of Test invoice 1 is EUR">
             <test expr="currency_id.code">EUR</test>
         </assert>
         
-        <assert model="account.invoice" id="test_invoice_1" string="The amount of Test invoice 1 is correct" severity="error">
-            <test expr="sum([l.price_subtotal for l in invoice_line]) == 1850" />
-            <test expr="sum([l.price_subtotal for l in invoice_line]) == amount_untaxed" />
+        <assert id="test_invoice_1" model="account.invoice" severity="error" string="The amount of Test invoice 1 is correct">
+            <test expr="sum([l.price_subtotal for l in invoice_line]) == 1850"/>
+            <test expr="sum([l.price_subtotal for l in invoice_line]) == amount_untaxed"/>
         </assert>
         
-        <workflow model="account.invoice" ref="test_invoice_1" action="invoice_open" />
+        <workflow action="invoice_open" model="account.invoice" ref="test_invoice_1"/>
         
-        <assert model="account.invoice" id="test_invoice_1" string="Test invoice 1 is now open">
+        <assert id="test_invoice_1" model="account.invoice" string="Test invoice 1 is now open">
             <test expr="state">open</test>
         </assert>
         
@@ -61,19 +61,18 @@
 			context={}):
 		-->
         <function model="account.invoice" name="pay_and_reconcile">
-            <value eval="[ref('test_invoice_1')]" />
-            <value eval="1850" />
-            <value eval="ref('cash')" />
-            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
-            <value eval="ref('bank_journal')" />
-            <value eval="ref('cash')" />
-            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
-            <value eval="ref('bank_journal')" />
+            <value eval="[ref('test_invoice_1')]"/>
+            <value eval="1850"/>
+            <value eval="ref('cash')"/>
+            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <value eval="ref('bank_journal')"/>
+            <value eval="ref('cash')"/>
+            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <value eval="ref('bank_journal')"/>
         </function>
         
-        <assert model="account.invoice" id="test_invoice_1" string="Test invoice 1 is now paid">
+        <assert id="test_invoice_1" model="account.invoice" string="Test invoice 1 is now paid">
             <test expr="state">paid</test>
         </assert>
     </data>
-</terp>
- 
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 0f5ad9f45da..5f47a368ab0 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
@@ -6,190 +6,190 @@
 	 Fiscal Year
 	-->
         
-        <menuitem name='Financial Management' icon='terp-account' id='menu_finance'/>
-        <menuitem name='Configuration' sequence='1' groups='base.group_admin' id='menu_finance_configuration' parent='menu_finance'/>
-        <menuitem sequence='20' id='base.menu_action_currency_form' parent='menu_finance_configuration'/>
+        <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
+        <menuitem groups="base.group_admin" id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
+        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
         
-        <record id='view_account_fiscalyear_form' model='ir.ui.view'>
-            <field name='name'>account.fiscalyear.form</field>
-            <field name='model'>account.fiscalyear</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Fiscalyear'>
-                    <field name='name' select='1'/>
-                    <field name='code' select='1'/>
-                    <field name='date_start'/>
-                    <field name='date_stop'/>
-                    <field name='start_journal_period_id'/>
-                    <field name='end_journal_period_id'/>
-                    <separator string='Periods' colspan='4'/>
-                    <field name='period_ids' nolabel='1' widget='one2many_list' colspan='4'>
-                        <form string='Period'>
-                            <field name='name' select='1'/>
-                            <field name='code' select='1'/>
-                            <field name='date_start'/>
-                            <field name='date_stop'/>
+        <record id="view_account_fiscalyear_form" model="ir.ui.view">
+            <field name="name">account.fiscalyear.form</field>
+            <field name="model">account.fiscalyear</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Fiscalyear">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="start_journal_period_id"/>
+                    <field name="end_journal_period_id"/>
+                    <separator colspan="4" string="Periods"/>
+                    <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
+                        <form string="Period">
+                            <field name="name" select="1"/>
+                            <field name="code" select="1"/>
+                            <field name="date_start"/>
+                            <field name="date_stop"/>
                         </form>
                     </field>
-                    <separator string='States' colspan='4'/>
-                    <field name='state' select='1'/>
-                    <group col='2' colspan='2'>
-                        <button name='create_period' type='object' states='draft' string='Create Monthly Periods'/>
-                        <button name='create_period3' type='object' states='draft' string='Create 3 Months Periods'/>
+                    <separator colspan="4" string="States"/>
+                    <field name="state" select="1"/>
+                    <group col="2" colspan="2">
+                        <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
+                        <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
-        <record id='view_account_fiscalyear_tree' model='ir.ui.view'>
-            <field name='name'>account.fiscalyear.tree</field>
-            <field name='model'>account.fiscalyear</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Fiscalyear'>
-                    <field name='code'/>
-                    <field name='name'/>
-                    <field name='state'/>
+        <record id="view_account_fiscalyear_tree" model="ir.ui.view">
+            <field name="name">account.fiscalyear.tree</field>
+            <field name="model">account.fiscalyear</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Fiscalyear">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='action_account_fiscalyear_form' model='ir.actions.act_window'>
-            <field name='name'>Fiscal Years</field>
-            <field name='res_model'>account.fiscalyear</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_account_fiscalyear_form" model="ir.actions.act_window">
+            <field name="name">Fiscal Years</field>
+            <field name="res_model">account.fiscalyear</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/Periods/' action='action_account_fiscalyear_form' id='menu_action_account_fiscalyear_form'/>
+        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration"/><menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
         
         <!--
 	Period
 	-->
         
-        <record id='view_account_period_form' model='ir.ui.view'>
-            <field name='name'>account.period.form</field>
-            <field name='model'>account.period</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Period'>
-                    <field name='name' select='1'/>
-                    <field name='code' select='1'/>
-                    <field name='date_start'/>
-                    <field name='date_stop'/>
-                    <field name='fiscalyear_id'/>
-                    <separator string='States' colspan='4'/>
-                    <field name='state' select='1'/>
+        <record id="view_account_period_form" model="ir.ui.view">
+            <field name="name">account.period.form</field>
+            <field name="model">account.period</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Period">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="fiscalyear_id"/>
+                    <separator colspan="4" string="States"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='view_account_period_tree' model='ir.ui.view'>
-            <field name='name'>account.period.tree</field>
-            <field name='model'>account.period</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Period'>
-                    <field name='code'/>
-                    <field name='name'/>
-                    <field name='date_start'/>
-                    <field name='date_stop'/>
-                    <field name='state'/>
+        <record id="view_account_period_tree" model="ir.ui.view">
+            <field name="name">account.period.tree</field>
+            <field name="model">account.period</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Period">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='action_account_period_form' model='ir.actions.act_window'>
-            <field name='name'>Periods</field>
-            <field name='res_model'>account.period</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_account_period_form" model="ir.actions.act_window">
+            <field name="name">Periods</field>
+            <field name="res_model">account.period</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/Periods/' action='action_account_period_form' id='menu_action_account_period_form'/>
+        <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23"/>
         
         
         <!--
 	Accounts
 	-->
         
-        <record id='view_account_form' model='ir.ui.view'>
-            <field name='name'>account.account.form</field>
-            <field name='model'>account.account</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Account'>
+        <record id="view_account_form" model="ir.ui.view">
+            <field name="name">account.account.form</field>
+            <field name="model">account.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account">
                     <notebook>
-                        <page string='General Information'>
-                            <field name='name' select='1' colspan='4'/>
-                            <field name='company_id' select='2'/>
-                            <field name='active'/>
+                        <page string="General Information">
+                            <field colspan="4" name="name" select="1"/>
+                            <field name="company_id" select="2"/>
+                            <field name="active"/>
                             <newline/>
-                            <field name='type' select='1'/>
-                            <field name='code' select='1'/>
-                            <field name='shortcut'/>
-                            <field name='sign'/>
+                            <field name="type" select="1"/>
+                            <field name="code" select="1"/>
+                            <field name="shortcut"/>
+                            <field name="sign"/>
                             
-                            <field name='currency_id' select='2'/>
-                            <field name='close_method'/>
-                            <field name='reconcile'/>
+                            <field name="currency_id" select="2"/>
+                            <field name="close_method"/>
+                            <field name="reconcile"/>
                             <newline/>
-                            <field name='parent_id' colspan='4'/>
-                            <field name='tax_ids' colspan='4'/>
+                            <field colspan="4" name="parent_id"/>
+                            <field colspan="4" name="tax_ids"/>
                         </page>
-                        <page string='Notes'>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_account_form' model='ir.actions.act_window'>
-            <field name='name'>Accounts</field>
-            <field name='res_model'>account.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_account_form" model="ir.actions.act_window">
+            <field name="name">Accounts</field>
+            <field name="res_model">account.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/General Accounts/Accounts Definition' action='action_account_form' id='menu_action_account_form'/>
+        <menuitem id="next_id_24" name="General Accounts" parent="account.menu_finance_configuration"/><menuitem action="action_account_form" id="menu_action_account_form" parent="next_id_24"/>
         
-        <record id='view_account_tree' model='ir.ui.view'>
-            <field name='name'>account.account.tree</field>
-            <field name='model'>account.account</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_id</field>
-            <field name='arch' type='xml'>
-                <tree string='Chart of accounts'>
-                    <field name='name'/>
-                    <field name='code'/>
-                    <field name='debit'/>
-                    <field name='credit'/>
-                    <field name='balance'/>
-                    <field name='company_currency_id'/>
+        <record id="view_account_tree" model="ir.ui.view">
+            <field name="name">account.account.tree</field>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree string="Chart of accounts">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
+                    <field name="balance"/>
+                    <field name="company_currency_id"/>
                 </tree>
             </field>
         </record>
-        <record id='action_account_tree' model='ir.actions.act_window'>
-            <field name='name'>Chart of Accounts</field>
-            <field name='res_model'>account.account</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_account_tree'/>
-            <field name='domain'>[('code','=','0')]</field>
+        <record id="action_account_tree" model="ir.actions.act_window">
+            <field name="name">Chart of Accounts</field>
+            <field name="res_model">account.account</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_tree"/>
+            <field name="domain">[('code','=','0')]</field>
         </record>
-        <menuitem name='Financial Management/Configuration/General Accounts/' action='action_account_tree' id='menu_action_account_tree'/>
+        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.next_id_24"/>
         
-        <record id='view_account_list' model='ir.ui.view'>
-            <field name='name'>account.account.list</field>
-            <field name='model'>account.account</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_id</field>
-            <field name='priority' eval='6'/>
-            <field name='arch' type='xml'>
-                <tree string='Chart of Accounts'>
-                    <field name='code'/>
-                    <field name='name'/>
+        <record id="view_account_list" model="ir.ui.view">
+            <field name="name">account.account.list</field>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field eval="6" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Chart of Accounts">
+                    <field name="code"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='action_account_tree2' model='ir.actions.act_window'>
-            <field name='name'>Fast Chart of Accounts</field>
-            <field name='res_model'>account.account</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_account_list'/>
-            <field name='domain'>[('code','=','0')]</field>
+        <record id="action_account_tree2" model="ir.actions.act_window">
+            <field name="name">Fast Chart of Accounts</field>
+            <field name="res_model">account.account</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_list"/>
+            <field name="domain">[('code','=','0')]</field>
         </record>
         
         <!--
@@ -198,43 +198,43 @@
 	Account Journal Columns
 	-->
         
-        <record id='view_journal_column_form' model='ir.ui.view'>
-            <field name='name'>account.journal.column.form</field>
-            <field name='model'>account.journal.column</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Journal Column'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='field' select='1'/>
-                    <field name='sequence'/>
+        <record id="view_journal_column_form" model="ir.ui.view">
+            <field name="name">account.journal.column.form</field>
+            <field name="model">account.journal.column</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Journal Column">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="field" select="1"/>
+                    <field name="sequence"/>
                     <newline/>
-                    <field name='readonly'/>
-                    <field name='required'/>
+                    <field name="readonly"/>
+                    <field name="required"/>
                 </form>
             </field>
         </record>
-        <record id='view_journal_column_tree' model='ir.ui.view'>
-            <field name='name'>account.journal.column.tree</field>
-            <field name='model'>account.journal.column</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Journal Column'>
-                    <field name='sequence'/>
-                    <field name='name'/>
-                    <field name='required'/>
-                    <field name='readonly'/>
+        <record id="view_journal_column_tree" model="ir.ui.view">
+            <field name="name">account.journal.column.tree</field>
+            <field name="model">account.journal.column</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Journal Column">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="required"/>
+                    <field name="readonly"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_account_journal_view_form' model='ir.ui.view'>
-            <field name='name'>account.journal.view.form</field>
-            <field name='model'>account.journal.view</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Journal View'>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='columns_id' widget='one2many_list' colspan='4'/>
+        <record id="view_account_journal_view_form" model="ir.ui.view">
+            <field name="name">account.journal.view.form</field>
+            <field name="model">account.journal.view</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Journal View">
+                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="columns_id" widget="one2many_list"/>
                 </form>
             </field>
         </record>
@@ -243,179 +243,179 @@
 	# Account Journal
 	-->
         
-        <record id='view_account_journal_tree' model='ir.ui.view'>
-            <field name='name'>account.journal.tree</field>
-            <field name='model'>account.journal</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Account Journal'>
-                    <field name='code'/>
-                    <field name='name'/>
+        <record id="view_account_journal_tree" model="ir.ui.view">
+            <field name="name">account.journal.tree</field>
+            <field name="model">account.journal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Account Journal">
+                    <field name="code"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_account_journal_form' model='ir.ui.view'>
-            <field name='name'>account.journal.form</field>
-            <field name='model'>account.journal</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Account Journal'>
+        <record id="view_account_journal_form" model="ir.ui.view">
+            <field name="name">account.journal.form</field>
+            <field name="model">account.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Journal">
                     <notebook>
-                        <page string='General Information'>
-                            <field name='name' select='1'/>
-                            <field name='active' select='1'/>
-                            <field name='code' select='1'/>
-                            <field name='type'/>
-                            <field name='view_id'/>
-                            <field name='sequence_id'/>
-                            <field name='default_debit_account_id'/>
-                            <field name='default_credit_account_id'/>
-                            <field name='currency'/>
-                            <field name='user_id'/>
+                        <page string="General Information">
+                            <field name="name" select="1"/>
+                            <field name="active" select="1"/>
+                            <field name="code" select="1"/>
+                            <field name="type"/>
+                            <field name="view_id"/>
+                            <field name="sequence_id"/>
+                            <field name="default_debit_account_id"/>
+                            <field name="default_credit_account_id"/>
+                            <field name="currency"/>
+                            <field name="user_id"/>
                             <newline/>
-                            <field name='centralisation'/>
-                            <field name='update_posted'/>
+                            <field name="centralisation"/>
+                            <field name="update_posted"/>
                         </page>
-                        <page string='Entry Controls'>
-                            <separator string='Accounts Type Allowed (empty for no control)' colspan='4'/>
-                            <field name='type_control_ids' nolabel='1' colspan='4'/>
-                            <separator string='Accounts Allowed (empty for no control)' colspan='4'/>
-                            <field name='account_control_ids' nolabel='1' colspan='4'/>
+                        <page string="Entry Controls">
+                            <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
+                            <field colspan="4" name="type_control_ids" nolabel="1"/>
+                            <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
+                            <field colspan="4" name="account_control_ids" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_account_journal_form' model='ir.actions.act_window'>
-            <field name='name'>Account journal</field>
-            <field name='res_model'>account.journal</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_account_journal_form" model="ir.actions.act_window">
+            <field name="name">Account journal</field>
+            <field name="res_model">account.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/Journal/Journal Definition' action='action_account_journal_form' id='menu_action_account_journal_form'/>
+        <menuitem id="next_id_25" name="Journal" parent="account.menu_finance_configuration"/><menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="next_id_25"/>
         
-        <record id='view_bank_statement_tree' model='ir.ui.view'>
-            <field name='name'>account.bank.statement.tree</field>
-            <field name='model'>account.bank.statement</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree colors='red:balance_end_real!=balance_end;blue:state==&apos;draft&apos; and (balance_end_real==balance_end)' string='Statement'>
-                    <field name='date'/>
-                    <field name='name'/>
-                    <field name='journal_id'/>
-                    <field name='period_id'/>
-                    <field name='balance_start'/>
-                    <field name='balance_end_real'/>
-                    <field name='balance_end'/>
-                    <field name='state'/>
+        <record id="view_bank_statement_tree" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="Statement">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <field name="balance_end"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_bank_statement_form' model='ir.ui.view'>
-            <field name='name'>account.bank.statement.form</field>
-            <field name='model'>account.bank.statement</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Statement'>
-                    <field name='name' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='journal_id' on_change='onchange_journal_id(journal_id)' select='1'/>
-                    <field name='currency'/>
-                    <field name='period_id' select='2'/>
+        <record id="view_bank_statement_form" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <field name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+                    <field name="currency"/>
+                    <field name="period_id" select="2"/>
                     <newline/>
-                    <field name='balance_start'/>
-                    <field name='balance_end_real'/>
-                    <notebook colspan='4'>
-                        <page string='Entry encoding'>
-                            <field name='line_ids' nolabel='1' colspan='4'>
-                                <tree editable='bottom' colors='red:amount!=reconcile_amount and reconcile_id' string='Statement lines'>
-                                    <field name='date'/>
-                                    <field name='ref'/>
-                                    <field name='name'/>
-                                    <field name='type'/>
-                                    <field name='partner_id' on_change='onchange_partner_id(partner_id, type, parent.currency)'/>
-                                    <field name='account_id' domain='[(&apos;journal_id&apos;,&apos;=&apos;,parent.journal_id)]'/>
-                                    <field name='amount'/>
-                                    <field name='reconcile_id' context='{&apos;partner_id&apos;: partner_id, &apos;amount&apos;: amount, &apos;account_id&apos;: account_id, &apos;currency_id&apos;: parent.currency}'/>
-                                    <field name='reconcile_amount' invisible='1'/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <notebook colspan="4">
+                        <page string="Entry encoding">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree colors="red:amount!=reconcile_amount and reconcile_id" editable="bottom" string="Statement lines">
+                                    <field name="date"/>
+                                    <field name="ref"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
+                                    <field name="amount"/>
+                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency}" name="reconcile_id"/>
+                                    <field invisible="1" name="reconcile_amount"/>
                                 </tree>
-                                <form string='Statement lines'>
-                                    <field name='date'/>
-                                    <field name='name'/>
-                                    <field name='type'/>
-                                    <field name='partner_id' on_change='onchange_partner_id(partner_id, type, parent.currency)'/>
-                                    <field name='account_id' domain='[(&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id), (&apos;type&apos;, &apos;&lt;&gt;&apos;, &apos;view&apos;)]'/>
-                                    <field name='amount'/>
-                                    <field name='reconcile_id' context='{&apos;partner_id&apos;:partner_id,&apos;amount&apos;:amount,&apos;account_id&apos;:account_id}'/>
-                                    <field name='ref'/>
-                                    <separator string='Notes' colspan='4'/>
-                                    <field name='note' nolabel='1' colspan='4'/>
+                                <form string="Statement lines">
+                                    <field name="date"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field name="amount"/>
+                                    <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id}" name="reconcile_id"/>
+                                    <field name="ref"/>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="note" nolabel="1"/>
                                 </form>
                             </field>
                         </page>
-                        <page string='Real Entries'>
-                            <field name='move_line_ids' nolabel='1' colspan='4'/>
+                        <page string="Real Entries">
+                            <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col='7' colspan='4'>
-                        <field name='state' select='2'/>
-                        <field name='balance_end'/>
-                        <button name='button_dummy' states='draft' string='Compute'/>
-                        <button name='button_confirm' type='object' states='draft' string='Confirm'/>
-                        <button name='button_cancel' type='object' states='confirm' string='Cancel'/>
+                    <group col="7" colspan="4">
+                        <field name="state" select="2"/>
+                        <field name="balance_end"/>
+                        <button name="button_dummy" states="draft" string="Compute"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
-        <record id='action_bank_statement_tree' model='ir.actions.act_window'>
-            <field name='name'>Statements</field>
-            <field name='res_model'>account.bank.statement</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="action_bank_statement_tree" model="ir.actions.act_window">
+            <field name="name">Statements</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
         </record>
-        <menuitem name='Financial Management/Entries/Statements' action='action_bank_statement_tree' id='menu_bank_statement_tree'/>
+        <menuitem id="next_id_26" name="Entries" parent="account.menu_finance"/><menuitem action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="next_id_26"/>
         
-        <record id='action_bank_statement_draft_tree' model='ir.actions.act_window'>
-            <field name='name'>Draft statements</field>
-            <field name='res_model'>account.bank.statement</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft')]</field>
+        <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
+            <field name="name">Draft statements</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
         </record>
-        <menuitem name='Financial Management/Entries/Statements/Draft Statements' action='action_bank_statement_draft_tree' id='menu_bank_statement_draft_tree'/>
+        <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree"/>
         
         
         
-        <record id='view_bank_statement_reconcile' model='ir.ui.view'>
-            <field name='name'>account.bank.statement.reconcile.form</field>
-            <field name='model'>account.bank.statement.reconcile</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Reconcile'>
-                    <field name='name' select='1'/>
+        <record id="view_bank_statement_reconcile" model="ir.ui.view">
+            <field name="name">account.bank.statement.reconcile.form</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reconcile">
+                    <field name="name" select="1"/>
                     <newline/>
-                    <field name='total_second_amount'/>
-                    <field name='total_second_currency'/>
+                    <field name="total_second_amount"/>
+                    <field name="total_second_currency"/>
                     <newline/>
-                    <field name='total_amount'/>
-                    <field name='total_currency'/>
+                    <field name="total_amount"/>
+                    <field name="total_currency"/>
                     <newline/>
-                    <separator colspan='4' string='Entries'/>
-                    <field name='line_ids' domain='[(&apos;partner_id&apos;,&apos;=&apos;,context.get(&apos;partner_id&apos;, False)),(&apos;state&apos;,&apos;=&apos;,&apos;valid&apos;),(&apos;account_id&apos;,&apos;=&apos;,context.get(&apos;account_id&apos;, False)),(&apos;reconcile_id&apos;, &apos;=&apos;, False)]' view_mode='tree' nolabel='1' colspan='4'/>
-                    <field name='line_new_ids' nolabel='1' colspan='4'>
-                        <tree editable='bottom' string='Write-Off'>
-                            <field name='account_id'/>
-                            <field name='amount'/>
-                            <field name='name'/>
+                    <separator colspan="4" string="Entries"/>
+                    <field colspan="4" domain="[('partner_id','=',context.get('partner_id', False)),('state','=','valid'),('account_id','=',context.get('account_id', False)),('reconcile_id', '=', False)]" name="line_ids" nolabel="1" view_mode="tree"/>
+                    <field colspan="4" name="line_new_ids" nolabel="1">
+                        <tree editable="bottom" string="Write-Off">
+                            <field name="account_id"/>
+                            <field name="amount"/>
+                            <field name="name"/>
                         </tree>
                     </field>
-                    <group col='5' colspan='4'>
-                        <field name='total_entry'/>
-                        <field name='total_new'/>
-                        <field name='total_balance'/>
-                        <button name='dummy' string='Compute' colspan='2'/>
+                    <group col="5" colspan="4">
+                        <field name="total_entry"/>
+                        <field name="total_new"/>
+                        <field name="total_balance"/>
+                        <button colspan="2" name="dummy" string="Compute"/>
                     </group>
                 </form>
             </field>
@@ -423,56 +423,56 @@
         <!--
 	Account Types
 	-->
-        <record id='view_account_type_tree' model='ir.ui.view'>
-            <field name='name'>account.account.type.tree</field>
-            <field name='model'>account.account.type</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Account Type'>
-                    <field name='code'/>
-                    <field name='name'/>
-                    <field name='code_from'/>
-                    <field name='code_to'/>
+        <record id="view_account_type_tree" model="ir.ui.view">
+            <field name="name">account.account.type.tree</field>
+            <field name="model">account.account.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Account Type">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="code_from"/>
+                    <field name="code_to"/>
                 </tree>
             </field>
         </record>
-        <record id='view_account_type_form' model='ir.ui.view'>
-            <field name='name'>account.account.type.form</field>
-            <field name='model'>account.account.type</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Account Type'>
-                    <field name='name' select='1'/>
-                    <field name='code' select='1'/>
-                    <field name='sequence'/>
-                    <field name='close_method'/>
-                    <field name='code_from' select='1'/>
-                    <field name='code_to' select='1'/>
-                    <field name='partner_account'/>
+        <record id="view_account_type_form" model="ir.ui.view">
+            <field name="name">account.account.type.form</field>
+            <field name="model">account.account.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Type">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="sequence"/>
+                    <field name="close_method"/>
+                    <field name="code_from" select="1"/>
+                    <field name="code_to" select="1"/>
+                    <field name="partner_account"/>
                 </form>
             </field>
         </record>
-        <record id='action_account_type_form' model='ir.actions.act_window'>
-            <field name='name'>Account Types</field>
-            <field name='res_model'>account.account.type</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_account_type_form" model="ir.actions.act_window">
+            <field name="name">Account Types</field>
+            <field name="res_model">account.account.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/General Accounts/' groups='base.group_extended' action='action_account_type_form' id='menu_action_account_type_form'/>
+        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="account.next_id_24"/>
         <!--
 	Entries
 	-->
-        <record id='view_account_move_tree' model='ir.ui.view'>
-            <field name='name'>account.move.tree</field>
-            <field name='model'>account.move</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Account entry'>
-                    <field name='ref'/>
-                    <field name='name'/>
-                    <field name='period_id'/>
-                    <field name='journal_id'/>
-                    <field name='state'/>
+        <record id="view_account_move_tree" model="ir.ui.view">
+            <field name="name">account.move.tree</field>
+            <field name="model">account.move</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Account entry">
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="period_id"/>
+                    <field name="journal_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -481,18 +481,18 @@
 	Reconcile
 	-->
         
-        <record id='view_move_reconcile_form' model='ir.ui.view'>
-            <field name='name'>account.move.reconcile.form</field>
-            <field name='model'>account.move.reconcile</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Account Entry Reconcile'>
-                    <group col='6' colspan='4'>
-                        <field name='name' select='1'/>
-                        <field name='create_date' select='1'/>
-                        <field name='type' select='1'/>
+        <record id="view_move_reconcile_form" model="ir.ui.view">
+            <field name="name">account.move.reconcile.form</field>
+            <field name="model">account.move.reconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Entry Reconcile">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="create_date" select="1"/>
+                        <field name="type" select="1"/>
                     </group>
-                    <field name='line_id' nolabel='1' colspan='4'/>
+                    <field colspan="4" name="line_id" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -500,240 +500,240 @@
         <!--
 	Tax Codes
 	-->
-        <record id='view_tax_code_tree' model='ir.ui.view'>
-            <field name='name'>account.tax.code.tree</field>
-            <field name='model'>account.tax.code</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree string='Account Tax Code'>
-                    <field name='name'/>
-                    <field name='code'/>
-                    <field name='sum'/>
-                    <field name='sum_period'/>
+        <record id="view_tax_code_tree" model="ir.ui.view">
+            <field name="name">account.tax.code.tree</field>
+            <field name="model">account.tax.code</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Account Tax Code">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="sum"/>
+                    <field name="sum_period"/>
                 </tree>
             </field>
         </record>
-        <record id='view_tax_code_form' model='ir.ui.view'>
-            <field name='name'>account.tax.code.form</field>
-            <field name='model'>account.tax.code</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Account Tax Code'>
-                    <field name='name' select='1'/>
-                    <field name='company_id'/>
-                    <field name='code' select='1'/>
-                    <field name='parent_id' select='1'/>
-                    <field name='sign'/>
+        <record id="view_tax_code_form" model="ir.ui.view">
+            <field name="name">account.tax.code.form</field>
+            <field name="model">account.tax.code</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Tax Code">
+                    <field name="name" select="1"/>
+                    <field name="company_id"/>
+                    <field name="code" select="1"/>
+                    <field name="parent_id" select="1"/>
+                    <field name="sign"/>
                     <newline/>
-                    <field name='sum'/>
-                    <field name='sum_period'/>
+                    <field name="sum"/>
+                    <field name="sum_period"/>
                     <newline/>
-                    <field name='info' colspan='4'/>
+                    <field colspan="4" name="info"/>
                 </form>
             </field>
         </record>
-        <record id='action_tax_code_list' model='ir.actions.act_window'>
-            <field name='name'>Tax codes</field>
-            <field name='res_model'>account.tax.code</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='view_tax_code_tree'/>
+        <record id="action_tax_code_list" model="ir.actions.act_window">
+            <field name="name">Tax codes</field>
+            <field name="res_model">account.tax.code</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_tax_code_tree"/>
         </record>
-        <record id='action_tax_code_tree' model='ir.actions.act_window'>
-            <field name='name'>Tax Report</field>
-            <field name='res_model'>account.tax.code</field>
-            <field name='domain'>[('parent_id','=',False)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_tax_code_tree'/>
+        <record id="action_tax_code_tree" model="ir.actions.act_window">
+            <field name="name">Tax Report</field>
+            <field name="res_model">account.tax.code</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_tax_code_tree"/>
         </record>
-        <menuitem name='Financial Management/Configuration/Taxes/' sequence='12' action='action_tax_code_list' id='menu_action_tax_code_list'/>
-        <menuitem name='Financial Management/Periodical Processing/Taxes/' sequence='12' action='action_tax_code_tree' id='menu_action_tax_code_tree'/>
+        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration"/><menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/>
+        <menuitem id="next_id_28" name="Taxes" parent="account.next_id_19"/><menuitem action="action_tax_code_tree" id="menu_action_tax_code_tree" parent="next_id_28" sequence="12"/>
         
         
         <!--
 	Tax
 	-->
-        <record id='view_tax_tree' model='ir.ui.view'>
-            <field name='name'>account.tax.tree</field>
-            <field name='model'>account.tax</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree string='Account Tax'>
-                    <field name='name'/>
+        <record id="view_tax_tree" model="ir.ui.view">
+            <field name="name">account.tax.tree</field>
+            <field name="model">account.tax</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Account Tax">
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='view_tax_form' model='ir.ui.view'>
-            <field name='name'>account.tax.form</field>
-            <field name='model'>account.tax</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Account Tax'>
+        <record id="view_tax_form" model="ir.ui.view">
+            <field name="name">account.tax.form</field>
+            <field name="model">account.tax</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Tax">
                     <notebook>
-                        <page string='Tax Definition'>
-                            <field name='name' select='1'/>
-                            <field name='company_id'/>
-                            <field name='tax_group' select='1'/>
-                            <field name='active' select='2'/>
-                            <field name='type'/>
-                            <field name='applicable_type'/>
-                            <field name='amount' select='2'/>
-                            <field name='include_base_amount' groups='base.group_extended'/>
-                            <field name='domain' groups='base.group_extended'/>
+                        <page string="Tax Definition">
+                            <field name="name" select="1"/>
+                            <field name="company_id"/>
+                            <field name="tax_group" select="1"/>
+                            <field name="active" select="2"/>
+                            <field name="type"/>
+                            <field name="applicable_type"/>
+                            <field name="amount" select="2"/>
+                            <field groups="base.group_extended" name="include_base_amount"/>
+                            <field groups="base.group_extended" name="domain"/>
                             <newline/>
-                            <field name='account_collected_id'/>
-                            <label nolabel='1' string='Keep empty to use the income account' colspan='2'/>
-                            <field name='account_paid_id'/>
-                            <label nolabel='1' string='Keep empty to use the expense account' colspan='2'/>
-                            <field name='child_depend' groups='base.group_extended'/>
-                            <field name='sequence' groups='base.group_extended'/>
+                            <field name="account_collected_id"/>
+                            <label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
+                            <field name="account_paid_id"/>
+                            <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
+                            <field groups="base.group_extended" name="child_depend"/>
+                            <field groups="base.group_extended" name="sequence"/>
                             <newline/>
-                            <field name='child_ids' groups='base.group_extended' colspan='4'/>
+                            <field colspan="4" groups="base.group_extended" name="child_ids"/>
                         </page>
-                        <page string='Tax Declaration'>
-                            <separator colspan='4' string='Invoices'/>
-                            <field name='base_code_id'/>
-                            <field name='base_sign'/>
-                            <field name='tax_code_id'/>
-                            <field name='tax_sign'/>
+                        <page string="Tax Declaration">
+                            <separator colspan="4" string="Invoices"/>
+                            <field name="base_code_id"/>
+                            <field name="base_sign"/>
+                            <field name="tax_code_id"/>
+                            <field name="tax_sign"/>
                             
-                            <separator colspan='4' string='Refund Invoices'/>
-                            <field name='ref_base_code_id'/>
-                            <field name='ref_base_sign'/>
-                            <field name='ref_tax_code_id'/>
-                            <field name='ref_tax_sign'/>
+                            <separator colspan="4" string="Refund Invoices"/>
+                            <field name="ref_base_code_id"/>
+                            <field name="ref_base_sign"/>
+                            <field name="ref_tax_code_id"/>
+                            <field name="ref_tax_sign"/>
                         </page>
-                        <page groups='base.group_extended' string='Special Computation'>
-                            <separator string='Compute Code (if type=code)' colspan='4'/>
-                            <field name='python_compute' nolabel='1' colspan='4'/>
-                            <separator string='Applicable Code (if type=code)' colspan='4'/>
-                            <field name='python_applicable' nolabel='1' colspan='4'/>
+                        <page groups="base.group_extended" string="Special Computation">
+                            <separator colspan="4" string="Compute Code (if type=code)"/>
+                            <field colspan="4" name="python_compute" nolabel="1"/>
+                            <separator colspan="4" string="Applicable Code (if type=code)"/>
+                            <field colspan="4" name="python_applicable" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_tax_tree' model='ir.actions.act_window'>
-            <field name='name'>Taxes Structure</field>
-            <field name='res_model'>account.tax</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('parent_id','=',False)]</field>
-            <field name='view_id' ref='view_tax_tree'/>
+        <record id="action_tax_tree" model="ir.actions.act_window">
+            <field name="name">Taxes Structure</field>
+            <field name="res_model">account.tax</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_id" ref="view_tax_tree"/>
         </record>
-        <menuitem name='Financial Management/Configuration/Taxes/' sequence='12' action='action_tax_tree' id='menu_action_tax_tree'/>
+        <menuitem action="action_tax_tree" id="menu_action_tax_tree" parent="account.next_id_27" sequence="12"/>
         
-        <record id='action_tax_form' model='ir.actions.act_window'>
-            <field name='name'>Taxes</field>
-            <field name='res_model'>account.tax</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_tax_tree'/>
+        <record id="action_tax_form" model="ir.actions.act_window">
+            <field name="name">Taxes</field>
+            <field name="res_model">account.tax</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_tax_tree"/>
         </record>
-        <menuitem name='Financial Management/Configuration/Taxes/' action='action_tax_form' id='menu_action_tax_form'/>
+        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="account.next_id_27"/>
         
         
-        <menuitem name='Financial Management/Entries' sequence='2' id='menu_finance_entries'/>
+        <menuitem id="menu_finance_entries" name="Entries" parent="account.menu_finance" sequence="2"/>
         
         <!--
 	Entries Journal lines
 	-->
         
-        <wizard name='account.move.journal.select' id='action_move_journal_line_form_select' menu='False' model='account.move.line' string='Standard entry'/>
+        <wizard id="action_move_journal_line_form_select" menu="False" model="account.move.line" name="account.move.journal.select" string="Standard entry"/>
         
-        <record id='ir_open_journal_period' model='ir.values'>
-            <field name='key2'>tree_but_open</field>
-            <field name='model'>account.journal.period</field>
-            <field name='name'>Open Journal</field>
-            <field name='value' eval='&apos;ir.actions.wizard,%d&apos;%action_move_journal_line_form_select'/>
-            <field name='object' eval='True'/>
+        <record id="ir_open_journal_period" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">account.journal.period</field>
+            <field name="name">Open Journal</field>
+            <field eval="'ir.actions.wizard,%d'%action_move_journal_line_form_select" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
-        <wizard name='account.move.journal' id='action_move_journal_line_form' model='account.move.line' menu='False' string='Standard entry'/>
-        <menuitem name='Financial Management/Entries/Entries by Journal' action='action_move_journal_line_form' type='wizard' id='menu_action_move_journal_line_form'/>
+        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Standard entry"/>
+        <menuitem action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard"/>
         
-        <record id='action_move_journal_period_line_form' model='ir.actions.act_window'>
-            <field name='name'>Open Journals</field>
-            <field name='res_model'>account.journal.period</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('state','&lt;&gt;','done')]</field>
+        <record id="action_move_journal_period_line_form" model="ir.actions.act_window">
+            <field name="name">Open Journals</field>
+            <field name="res_model">account.journal.period</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('state','&lt;&gt;','done')]</field>
         </record>
-        <menuitem name='Financial Management/Entries/Entries by Journal/' action='action_move_journal_period_line_form' id='menu_action_move_journal_period_line_form'/>
+        <menuitem action="action_move_journal_period_line_form" id="menu_action_move_journal_period_line_form" parent="account.menu_action_move_journal_line_form"/>
         
         <!--
 	Entries lines
 	-->
         
-        <record id='view_move_line_tree' model='ir.ui.view'>
-            <field name='name'>account.move.line.tree</field>
-            <field name='model'>account.move.line</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='4'/>
-            <field name='arch' type='xml'>
-                <tree string='Account Entry Line'>
-                    <field name='date'/>
-                    <field name='move_id'/>
-                    <field name='ref'/>
-                    <field name='invoice'/>
-                    <field name='name'/>
-                    <field name='partner_id'/>
-                    <field name='account_id'/>
-                    <field name='journal_id'/>
-                    <field name='debit' sum='Total debit'/>
-                    <field name='credit' sum='Total credit'/>
-                    <field name='amount_currency'/>
-                    <field name='currency_id'/>
-                    <field name='state'/>
-                    <field name='reconcile_id'/>
-                    <field name='reconcile_partial_id'/>
+        <record id="view_move_line_tree" model="ir.ui.view">
+            <field name="name">account.move.line.tree</field>
+            <field name="model">account.move.line</field>
+            <field name="type">tree</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Account Entry Line">
+                    <field name="date"/>
+                    <field name="move_id"/>
+                    <field name="ref"/>
+                    <field name="invoice"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="account_id"/>
+                    <field name="journal_id"/>
+                    <field name="debit" sum="Total debit"/>
+                    <field name="credit" sum="Total credit"/>
+                    <field name="amount_currency"/>
+                    <field name="currency_id"/>
+                    <field name="state"/>
+                    <field name="reconcile_id"/>
+                    <field name="reconcile_partial_id"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_move_line_form' model='ir.ui.view'>
-            <field name='name'>account.move.line.form</field>
-            <field name='model'>account.move.line</field>
-            <field name='type'>form</field>
-            <field name='priority' eval='2'/>
-            <field name='arch' type='xml'>
-                <form string='Account Entry Line'>
+        <record id="view_move_line_form" model="ir.ui.view">
+            <field name="name">account.move.line.form</field>
+            <field name="model">account.move.line</field>
+            <field name="type">form</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <form string="Account Entry Line">
                     <notebook>
-                        <page string='Information'>
-                            <separator string='General Information' colspan='4'/>
-                            <field name='name' select='1'/>
-                            <field name='date' select='1'/>
-                            <field name='ref' select='2'/>
-                            <field name='invoice' select='2'/>
-                            <field name='account_id' select='1'/>
-                            <field name='partner_id' select='1'/>
+                        <page string="Information">
+                            <separator colspan="4" string="General Information"/>
+                            <field name="name" select="1"/>
+                            <field name="date" select="1"/>
+                            <field name="ref" select="2"/>
+                            <field name="invoice" select="2"/>
+                            <field name="account_id" select="1"/>
+                            <field name="partner_id" select="1"/>
                             
-                            <field name='debit' select='2'/>
-                            <field name='credit' select='2'/>
+                            <field name="debit" select="2"/>
+                            <field name="credit" select="2"/>
                             
-                            <separator string='Optional Information' colspan='4'/>
-                            <field name='currency_id'/>
-                            <field name='amount_currency'/>
-                            <field name='quantity' select='2'/>
-                            <field name='move_id' required='False'/>
+                            <separator colspan="4" string="Optional Information"/>
+                            <field name="currency_id"/>
+                            <field name="amount_currency"/>
+                            <field name="quantity" select="2"/>
+                            <field name="move_id" required="False"/>
                             <newline/>
-                            <field name='statement_id' select='2'/>
-                            <field name='blocked' select='2'/>
-                            <field name='date_maturity'/>
-                            <field name='date_created'/>
+                            <field name="statement_id" select="2"/>
+                            <field name="blocked" select="2"/>
+                            <field name="date_maturity"/>
+                            <field name="date_created"/>
                             <newline/>
-                            <field name='tax_code_id'/>
-                            <field name='tax_amount'/>
+                            <field name="tax_code_id"/>
+                            <field name="tax_amount"/>
                             
-                            <separator string='State' colspan='4'/>
-                            <field name='journal_id' select='2'/>
-                            <field name='period_id'/>
-                            <field name='reconcile_id'/>
-                            <field name='reconcile_partial_id'/>
-                            <field name='active' select='2'/>
-                            <field name='state' select='2'/>
+                            <separator colspan="4" string="State"/>
+                            <field name="journal_id" select="2"/>
+                            <field name="period_id"/>
+                            <field name="reconcile_id"/>
+                            <field name="reconcile_partial_id"/>
+                            <field name="active" select="2"/>
+                            <field name="state" select="2"/>
                         </page>
-                        <page string='Analytic Lines'>
-                            <field name='analytic_lines' nolabel='1' colspan='4'/>
+                        <page string="Analytic Lines">
+                            <field colspan="4" name="analytic_lines" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -741,250 +741,250 @@
         </record>
         
         
-        <record id='view_move_line_form2' model='ir.ui.view'>
-            <field name='name'>account.move.line.form2</field>
-            <field name='model'>account.move.line</field>
-            <field name='type'>form</field>
-            <field name='priority' eval='9'/>
-            <field name='arch' type='xml'>
-                <form string='Account Entry Line'>
+        <record id="view_move_line_form2" model="ir.ui.view">
+            <field name="name">account.move.line.form2</field>
+            <field name="model">account.move.line</field>
+            <field name="type">form</field>
+            <field eval="9" name="priority"/>
+            <field name="arch" type="xml">
+                <form string="Account Entry Line">
                     <notebook>
-                        <page string='Information'>
-                            <separator string='General Information' colspan='4'/>
-                            <field name='name' select='1'/>
-                            <field name='date' select='2'/>
-                            <field name='journal_id' readonly='False' select='1'/>
-                            <field name='period_id' readonly='False' select='2'/>
-                            <field name='account_id' select='1'/>
-                            <field name='partner_id' select='2'/>
+                        <page string="Information">
+                            <separator colspan="4" string="General Information"/>
+                            <field name="name" select="1"/>
+                            <field name="date" select="2"/>
+                            <field name="journal_id" readonly="False" select="1"/>
+                            <field name="period_id" readonly="False" select="2"/>
+                            <field name="account_id" select="1"/>
+                            <field name="partner_id" select="2"/>
                             <newline/>
-                            <field name='debit' select='2'/>
-                            <field name='credit' select='2'/>
+                            <field name="debit" select="2"/>
+                            <field name="credit" select="2"/>
                             
-                            <separator string='Optional Information' colspan='4'/>
-                            <field name='currency_id'/>
-                            <field name='amount_currency'/>
-                            <field name='quantity' select='3'/>
-                            <field name='move_id' required='False'/>
+                            <separator colspan="4" string="Optional Information"/>
+                            <field name="currency_id"/>
+                            <field name="amount_currency"/>
+                            <field name="quantity" select="3"/>
+                            <field name="move_id" required="False"/>
                             <newline/>
-                            <field name='date_maturity'/>
-                            <field name='date_created'/>
-                            <field name='date_created'/>
-                            <field name='blocked' select='3'/>
+                            <field name="date_maturity"/>
+                            <field name="date_created"/>
+                            <field name="date_created"/>
+                            <field name="blocked" select="3"/>
                             
-                            <separator string='State' colspan='4'/>
+                            <separator colspan="4" string="State"/>
                             <newline/>
-                            <field name='reconcile_id'/>
-                            <field name='reconcile_partial_id'/>
-                            <field name='state' select='2'/>
+                            <field name="reconcile_id"/>
+                            <field name="reconcile_partial_id"/>
+                            <field name="state" select="2"/>
                         </page>
-                        <page string='Analytic Lines'>
-                            <field name='analytic_lines' nolabel='1' colspan='4'/>
+                        <page string="Analytic Lines">
+                            <field colspan="4" name="analytic_lines" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
         
-        <record id='action_move_line_select' model='ir.actions.act_window'>
-            <field name='name'>account.move.line.select</field>
-            <field name='res_model'>account.move.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='view_move_line_tree'/>
+        <record id="action_move_line_select" model="ir.actions.act_window">
+            <field name="name">account.move.line.select</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
         </record>
         
         <!--
 	Account.Entry Edition
 	-->
         
-        <record id='view_move_tree' model='ir.ui.view'>
-            <field name='name'>account.move.tree</field>
-            <field name='model'>account.move</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Account Entry'>
-                    <field name='ref'/>
-                    <field name='name'/>
-                    <field name='period_id'/>
-                    <field name='journal_id'/>
+        <record id="view_move_tree" model="ir.ui.view">
+            <field name="name">account.move.tree</field>
+            <field name="model">account.move</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Account Entry">
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="period_id"/>
+                    <field name="journal_id"/>
                     
-                    <field name='line_id'/>
-                    <field name='state'/>
+                    <field name="line_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_move_form' model='ir.ui.view'>
-            <field name='name'>account.move.form</field>
-            <field name='model'>account.move</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Account Entry'>
-                    <separator string='General Information' colspan='4'/>
-                    <field name='name' select='1'/>
-                    <field name='ref' select='1'/>
-                    <field name='period_id' select='2'/>
-                    <field name='journal_id' select='1'/>
+        <record id="view_move_form" model="ir.ui.view">
+            <field name="name">account.move.form</field>
+            <field name="model">account.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Entry">
+                    <separator colspan="4" string="General Information"/>
+                    <field name="name" select="1"/>
+                    <field name="ref" select="1"/>
+                    <field name="period_id" select="2"/>
+                    <field name="journal_id" select="1"/>
                     
-                    <separator string='Entry Lines' colspan='4'/>
-                    <field name='line_id' readonly='1' widget='one2many_list' nolabel='1' colspan='4'>
-                        <form string='Account Entry Line'>
-                            <separator string='General Information' colspan='4'/>
-                            <field name='name' select='1'/>
-                            <field name='date'/>
-                            <field name='account_id'/>
-                            <field name='partner_id' on_change='onchange_partner_id(False,partner_id,account_id,debit,credit)'/>
+                    <separator colspan="4" string="Entry Lines"/>
+                    <field colspan="4" name="line_id" nolabel="1" readonly="1" widget="one2many_list">
+                        <form string="Account Entry Line">
+                            <separator colspan="4" string="General Information"/>
+                            <field name="name" select="1"/>
+                            <field name="date"/>
+                            <field name="account_id"/>
+                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit)"/>
                             
-                            <field name='debit' select='1'/>
-                            <field name='credit' select='1'/>
+                            <field name="debit" select="1"/>
+                            <field name="credit" select="1"/>
                             
-                            <separator string='Optional Information' colspan='4'/>
-                            <field name='currency_id'/>
-                            <field name='amount_currency'/>
-                            <field name='quantity' select='1'/>
+                            <separator colspan="4" string="Optional Information"/>
+                            <field name="currency_id"/>
+                            <field name="amount_currency"/>
+                            <field name="quantity" select="1"/>
                             <newline/>
-                            <field name='date_maturity'/>
-                            <field name='date_created'/>
+                            <field name="date_maturity"/>
+                            <field name="date_created"/>
                             
-                            <separator string='State' colspan='4'/>
-                            <field name='reconcile_id'/>
-                            <field name='reconcile_partial_id'/>
-                            <field name='statement_id'/>
-                            <field name='state'/>
+                            <separator colspan="4" string="State"/>
+                            <field name="reconcile_id"/>
+                            <field name="reconcile_partial_id"/>
+                            <field name="statement_id"/>
+                            <field name="state"/>
                         </form>
-                        <tree editable='top' string='Account Entry Line'>
-                            <field name='date'/>
-                            <field name='name'/>
-                            <field name='partner_id' on_change='onchange_partner_id(False,partner_id,account_id,debit,credit)'/>
-                            <field name='account_id'/>
-                            <field name='date_maturity'/>
-                            <field name='ref'/>
-                            <field name='debit'/>
-                            <field name='credit'/>
-                            <field name='state'/>
+                        <tree editable="top" string="Account Entry Line">
+                            <field name="date"/>
+                            <field name="name"/>
+                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit)"/>
+                            <field name="account_id"/>
+                            <field name="date_maturity"/>
+                            <field name="ref"/>
+                            <field name="debit"/>
+                            <field name="credit"/>
+                            <field name="state"/>
                         </tree>
                     </field>
                     
-                    <field name='state' select='1'/>
-                    <group col='2' colspan='2'>
-                        <button name='button_validate' type='object' states='draft' string='Validate'/>
-                        <button name='button_cancel' type='object' states='posted' string='Cancel'/>
+                    <field name="state" select="1"/>
+                    <group col="2" colspan="2">
+                        <button name="button_validate" states="draft" string="Validate" type="object"/>
+                        <button name="button_cancel" states="posted" string="Cancel" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
         
-        <record id='action_move_line_form' model='ir.actions.act_window'>
-            <field name='name'>Entries</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account.move</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_move_tree'/>
+        <record id="action_move_line_form" model="ir.actions.act_window">
+            <field name="name">Entries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_move_tree"/>
         </record>
-        <menuitem name='Financial Management/Entries/Search Entries/' action='action_move_line_form' id='menu_action_move_line_form'/>
+        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries"/><menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
         
-        <record id='action_move_line_search' model='ir.actions.act_window'>
-            <field name='name'>Entry lines</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account.move.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_move_line_tree'/>
+        <record id="action_move_line_search" model="ir.actions.act_window">
+            <field name="name">Entry lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
         </record>
-        <record id='action_move_line_search_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='10'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_move_line_tree'/>
-            <field name='act_window_id' ref='action_move_line_search'/>
+        <record id="action_move_line_search_view1" model="ir.actions.act_window.view">
+            <field eval="10" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        <record id='action_move_line_search_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='20'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_move_line_form'/>
-            <field name='act_window_id' ref='action_move_line_search'/>
+        <record id="action_move_line_search_view2" model="ir.actions.act_window.view">
+            <field eval="20" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_move_line_form"/>
+            <field name="act_window_id" ref="action_move_line_search"/>
         </record>
         
-        <menuitem name='Financial Management/Entries/Search Entries/' action='action_move_line_search' id='menu_action_move_line_search'/>
+        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
         
-        <menuitem name='Financial Management/Charts' sequence='7' id='menu_finance_charts'/>
-        <wizard name='account.chart' id='wizard_account_chart' menu='False' model='account.account' string='Accounts Charts'/>
-        <menuitem name='Financial Management/Charts/Charts of Accounts' action='wizard_account_chart' type='wizard' id='menu_action_account_tree2'/>
-        <menuitem name='Financial Management/Charts/Charts of Accounts/Fast Charts of Accounts' action='action_account_tree2' id='menu_action_account_tree3'/>
+        <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="7"/>
+        <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Accounts Charts"/>
+        <menuitem action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
+        <menuitem action="action_account_tree2" id="menu_action_account_tree3" parent="account.menu_action_account_tree2"/>
         
-        <menuitem name='Financial Management/Periodical Processing' sequence='3' id='menu_finance_periodical_processing'/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
         
         
-        <record id='view_bank_statement_reconcile_form' model='ir.ui.view'>
-            <field name='name'>account.bank.statement.reconcile.form</field>
-            <field name='model'>account.bank.statement</field>
-            <field name='priority' eval='30'/>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Statement'>
-                    <field name='name' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='journal_id' on_change='onchange_journal_id(journal_id)' select='1'/>
-                    <field name='currency'/>
+        <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
+            <field name="name">account.bank.statement.reconcile.form</field>
+            <field name="model">account.bank.statement</field>
+            <field eval="30" name="priority"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <field name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+                    <field name="currency"/>
                     <newline/>
-                    <field name='balance_start'/>
-                    <field name='balance_end_real'/>
-                    <notebook colspan='4'>
-                        <page string='Select entries'>
-                            <field name='move_line_ids' domain='[(&apos;statement_id&apos;, &apos;=&apos;, False), (&apos;journal_id&apos;, &apos;=&apos;, journal_id)]' nolabel='1' widget='many2many' colspan='4'/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <notebook colspan="4">
+                        <page string="Select entries">
+                            <field colspan="4" domain="[('statement_id', '=', False), ('journal_id', '=', journal_id)]" name="move_line_ids" nolabel="1" widget="many2many"/>
                         </page>
-                        <page string='Entry encoding'>
-                            <separator string='Entry Lines' colspan='4'/>
-                            <field name='period_id'/>
-                            <field name='line_ids' nolabel='1' colspan='4'>
-                                <tree editable='bottom' string='Statement lines'>
-                                    <field name='date'/>
-                                    <field name='name'/>
-                                    <field name='type'/>
-                                    <field name='partner_id' on_change='onchange_partner_id(partner_id, type, parent.currency)'/>
-                                    <field name='account_id' domain='[(&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id)]'/>
-                                    <field name='amount'/>
-                                    <field name='reconcile_id' context='{&apos;partner_id&apos;: partner_id, &apos;amount&apos;: amount, &apos;account_id&apos;: account_id}'/>
+                        <page string="Entry encoding">
+                            <separator colspan="4" string="Entry Lines"/>
+                            <field name="period_id"/>
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="date"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
+                                    <field name="amount"/>
+                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id}" name="reconcile_id"/>
                                 </tree>
-                                <form string='Statement lines'>
-                                    <field name='date'/>
-                                    <field name='name'/>
-                                    <field name='type'/>
-                                    <field name='partner_id' on_change='onchange_partner_id(partner_id, type, parent.currency)'/>
-                                    <field name='account_id' domain='[(&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id)]'/>
-                                    <field name='amount'/>
-                                    <field name='reconcile_id' context='{&apos;partner_id&apos;: partner_id, &apos;amount&apos;: amount, &apos;account_id&apos;: account_id}'/>
+                                <form string="Statement lines">
+                                    <field name="date"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
+                                    <field name="amount"/>
+                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id}" name="reconcile_id"/>
                                 </form>
                             </field>
                         </page>
                     </notebook>
-                    <group col='7' colspan='4'>
-                        <field name='state' select='2'/>
-                        <field name='balance_end'/>
-                        <button name='button_dummy' states='draft' string='Compute'/>
-                        <button name='button_confirm' type='object' states='draft' string='Confirm'/>
-                        <button name='button_cancel' type='object' states='confirm' string='Cancel'/>
+                    <group col="7" colspan="4">
+                        <field name="state" select="2"/>
+                        <field name="balance_end"/>
+                        <button name="button_dummy" states="draft" string="Compute"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
-        <record id='action_bank_statement_reconciliation_form' model='ir.actions.act_window'>
-            <field name='name'>Statements reconciliation</field>
-            <field name='res_model'>account.bank.statement</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
-            <field name='view_id' ref='view_bank_statement_reconcile_form'/>
+        <record id="action_bank_statement_reconciliation_form" model="ir.actions.act_window">
+            <field name="name">Statements reconciliation</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_bank_statement_reconcile_form"/>
         </record>
-        <menuitem name='Financial Management/Periodical Processing/Bank Reconciliation/Statement by Importing Entries' action='action_bank_statement_reconciliation_form' id='menu_action_account_bank_reconcile_tree'/>
-        <wizard name='account.move.bank.reconcile' id='action_account_bank_reconcile_tree' model='account.move.line' menu='False' string='Bank reconciliation'/>
-        <menuitem name='Financial Management/Periodical Processing/Bank Reconciliation/Check in Bank Journal' action='action_account_bank_reconcile_tree' type='wizard' id='menu_action_account_bank_reconcile_check_tree'/>
+        <menuitem id="next_id_30" name="Bank Reconciliation" parent="account.menu_finance_periodical_processing"/><menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
+        <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/>
+        <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>
         
-        <act_window name='Entries' domain='[(&apos;account_id&apos;, &apos;=&apos;, active_id)]' id='act_account_acount_move_line_open' src_model='account.account' res_model='account.move.line'/>
+        <act_window domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/>
         
-        <act_window name='Unreconciled entries' domain='[(&apos;account_id&apos;, &apos;=&apos;, active_id),(&apos;reconcile_id&apos;,&apos;=&apos;,False)]' id='act_account_acount_move_line_open_unreconciled' src_model='account.account' res_model='account.move.line'/>
+        <act_window domain="[('account_id', '=', active_id),('reconcile_id','=',False)]" id="act_account_acount_move_line_open_unreconciled" name="Unreconciled entries" res_model="account.move.line" src_model="account.account"/>
         
-        <act_window name='Reconciled entries' domain='[(&apos;reconcile_id&apos;, &apos;=&apos;, active_id)]' id='act_account_acount_move_line_reconcile_open' src_model='account.move.reconcile' res_model='account.move.line'/>
+        <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
         
-        <menuitem name='Financial Management/Reporting' sequence='8' id='menu_finance_reporting'/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
         
         <!--
 	TODO:
@@ -992,405 +992,405 @@
 		Close Journal (and verify that there is no draft move lines)
 -->
         
-        <record id='view_journal_period_tree' model='ir.ui.view'>
-            <field name='name'>account.journal.period.tree</field>
-            <field name='model'>account.journal.period</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Journals'>
-                    <field name='period_id' icon='icon'/>
-                    <field name='journal_id'/>
-                    <field name='state'/>
+        <record id="view_journal_period_tree" model="ir.ui.view">
+            <field name="name">account.journal.period.tree</field>
+            <field name="model">account.journal.period</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Journals">
+                    <field icon="icon" name="period_id"/>
+                    <field name="journal_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='action_account_journal_period_tree' model='ir.actions.act_window'>
-            <field name='name'>Journals</field>
-            <field name='res_model'>account.journal.period</field>
-            <field name='view_type'>tree</field>
+        <record id="action_account_journal_period_tree" model="ir.actions.act_window">
+            <field name="name">Journals</field>
+            <field name="res_model">account.journal.period</field>
+            <field name="view_type">tree</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Print Journals' action='action_account_journal_period_tree' id='menu_action_account_journal_period_tree'/>
+        <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_reporting"/>
         
-        <record id='action_account_budget_post_tree' model='ir.actions.act_window'>
-            <field name='name'>Budgets</field>
-            <field name='res_model'>account.budget.post</field>
-            <field name='view_type'>tree</field>
+        <record id="action_account_budget_post_tree" model="ir.actions.act_window">
+            <field name="name">Budgets</field>
+            <field name="res_model">account.budget.post</field>
+            <field name="view_type">tree</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Print Budgets' action='action_account_budget_post_tree' id='menu_action_account_budget_post_tree'/>
+        <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_reporting"/>
         
         <!--
 	Budgets
 	-->
-        <record id='view_budget_post_form' model='ir.ui.view'>
-            <field name='name'>account.budget.post.form</field>
-            <field name='model'>account.budget.post</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Master Budget'>
+        <record id="view_budget_post_form" model="ir.ui.view">
+            <field name="name">account.budget.post.form</field>
+            <field name="model">account.budget.post</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Master Budget">
                     <notebook>
-                        <page string='Definition'>
-                            <field name='code' select='1'/>
-                            <field name='name' select='1'/>
+                        <page string="Definition">
+                            <field name="code" select="1"/>
+                            <field name="name" select="1"/>
                         </page>
-                        <page string='Dotations'>
-                            <button name='%(wizard_budget_spread)d' type='action' string='Spread'/>
-                            <field name='dotation_ids' nolabel='1' colspan='4'/>
+                        <page string="Dotations">
+                            <button name="%(wizard_budget_spread)d" string="Spread" type="action"/>
+                            <field colspan="4" name="dotation_ids" nolabel="1"/>
                         </page>
-                        <page string='Accounts'>
-                            <field name='account_ids' nolabel='1' colspan='4'/>
+                        <page string="Accounts">
+                            <field colspan="4" name="account_ids" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='view_budget_post_tree' model='ir.ui.view'>
-            <field name='name'>account.budget.post.tree</field>
-            <field name='model'>account.budget.post</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Master Budget'>
-                    <field name='code'/>
-                    <field name='name'/>
+        <record id="view_budget_post_tree" model="ir.ui.view">
+            <field name="name">account.budget.post.tree</field>
+            <field name="model">account.budget.post</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Master Budget">
+                    <field name="code"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='view_budget_post_dotation_form' model='ir.ui.view'>
-            <field name='name'>account.budget.post.dotation.form</field>
-            <field name='model'>account.budget.post.dotation</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Master Budget Expenses'>
-                    <field name='period_id'/>
-                    <field name='amount'/>
+        <record id="view_budget_post_dotation_form" model="ir.ui.view">
+            <field name="name">account.budget.post.dotation.form</field>
+            <field name="model">account.budget.post.dotation</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Master Budget Expenses">
+                    <field name="period_id"/>
+                    <field name="amount"/>
                 </form>
             </field>
         </record>
-        <record id='view_budget_post_dotation_tree' model='ir.ui.view'>
-            <field name='name'>account.budget.post.dotation.tree</field>
-            <field name='model'>account.budget.post.dotation</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Master Budget Expenses'>
-                    <field name='period_id'/>
-                    <field name='amount'/>
+        <record id="view_budget_post_dotation_tree" model="ir.ui.view">
+            <field name="name">account.budget.post.dotation.tree</field>
+            <field name="model">account.budget.post.dotation</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Master Budget Expenses">
+                    <field name="period_id"/>
+                    <field name="amount"/>
                 </tree>
             </field>
         </record>
         
-        <record id='open_budget_post_form' model='ir.actions.act_window'>
-            <field name='name'>Master Budgets</field>
-            <field name='res_model'>account.budget.post</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_budget_post_tree'/>
+        <record id="open_budget_post_form" model="ir.actions.act_window">
+            <field name="name">Master Budgets</field>
+            <field name="res_model">account.budget.post</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_budget_post_tree"/>
         </record>
-        <menuitem name='Financial Management/Configuration/Budgets/Master Budgets' action='open_budget_post_form' id='menu_budget_post_form'/>
+        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance_configuration"/><menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/>
         
         
         <!--
 	# Account Models
 -->
         
-        <record id='view_model_line_tree' model='ir.ui.view'>
-            <field name='name'>account.model.line.tree</field>
-            <field name='model'>account.model.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Entry Model Line'>
-                    <field name='sequence'/>
-                    <field name='ref'/>
-                    <field name='name'/>
-                    <field name='account_id'/>
-                    <field name='partner_id'/>
-                    <field name='debit'/>
-                    <field name='credit'/>
+        <record id="view_model_line_tree" model="ir.ui.view">
+            <field name="name">account.model.line.tree</field>
+            <field name="model">account.model.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Entry Model Line">
+                    <field name="sequence"/>
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
                 </tree>
             </field>
         </record>
         
         
-        <record id='view_model_line_form' model='ir.ui.view'>
-            <field name='name'>account.model.line.form</field>
-            <field name='model'>account.model.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Entry Model Line'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='sequence'/>
-                    <field name='ref' select='1'/>
-                    <field name='account_id'/>
-                    <field name='partner_id'/>
-                    <field name='debit' select='1'/>
-                    <field name='credit' select='1'/>
-                    <field name='quantity'/>
+        <record id="view_model_line_form" model="ir.ui.view">
+            <field name="name">account.model.line.form</field>
+            <field name="model">account.model.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Entry Model Line">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="sequence"/>
+                    <field name="ref" select="1"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="debit" select="1"/>
+                    <field name="credit" select="1"/>
+                    <field name="quantity"/>
                     <newline/>
-                    <field name='date'/>
-                    <field name='date_maturity'/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_model_form' model='ir.ui.view'>
-            <field name='name'>account.model.form</field>
-            <field name='model'>account.model</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Entry Model'>
-                    <field name='name' select='1'/>
-                    <field name='ref' select='1'/>
-                    <field name='journal_id' select='1'/>
-                    <field name='lines_id' widget='one2many_list' colspan='4'/>
-                    <group col='1' colspan='4'>
-                        <button name='generate' type='object' string='Create entries'/>
+        <record id="view_model_form" model="ir.ui.view">
+            <field name="name">account.model.form</field>
+            <field name="model">account.model</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Entry Model">
+                    <field name="name" select="1"/>
+                    <field name="ref" select="1"/>
+                    <field name="journal_id" select="1"/>
+                    <field colspan="4" name="lines_id" widget="one2many_list"/>
+                    <group col="1" colspan="4">
+                        <button name="generate" string="Create entries" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
-        <record id='view_model_tree' model='ir.ui.view'>
-            <field name='name'>account.model.tree</field>
-            <field name='model'>account.model</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Entry Model'>
-                    <field name='name'/>
-                    <field name='journal_id'/>
+        <record id="view_model_tree" model="ir.ui.view">
+            <field name="name">account.model.tree</field>
+            <field name="model">account.model</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Entry Model">
+                    <field name="name"/>
+                    <field name="journal_id"/>
                 </tree>
             </field>
         </record>
-        <record id='action_model_form' model='ir.actions.act_window'>
-            <field name='name'>Models Definition</field>
-            <field name='res_model'>account.model</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_model_form" model="ir.actions.act_window">
+            <field name="name">Models Definition</field>
+            <field name="res_model">account.model</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/Models/Models Definition' action='action_model_form' id='menu_action_model_form'/>
+        <menuitem id="next_id_32" name="Models" parent="account.menu_finance_configuration"/><menuitem action="action_model_form" id="menu_action_model_form" parent="next_id_32"/>
         
         
         <!--
 	# Payment Terms
 -->
         
-        <record id='view_payment_term_line_tree' model='ir.ui.view'>
-            <field name='name'>account.payment.term.line.tree</field>
-            <field name='model'>account.payment.term.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Payment Term'>
-                    <field name='sequence'/>
-                    <field name='name'/>
-                    <field name='value'/>
-                    <field name='days'/>
-                    <field name='condition'/>
+        <record id="view_payment_term_line_tree" model="ir.ui.view">
+            <field name="name">account.payment.term.line.tree</field>
+            <field name="model">account.payment.term.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Payment Term">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="value"/>
+                    <field name="days"/>
+                    <field name="condition"/>
                 </tree>
             </field>
         </record>
         
         
-        <record id='view_payment_term_line_form' model='ir.ui.view'>
-            <field name='name'>account.payment.term.line.form</field>
-            <field name='model'>account.payment.term.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Payment Term'>
-                    <field name='name' select='1'/>
-                    <field name='sequence'/>
-                    <field name='value'/>
-                    <field name='value_amount'/>
+        <record id="view_payment_term_line_form" model="ir.ui.view">
+            <field name="name">account.payment.term.line.form</field>
+            <field name="model">account.payment.term.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment Term">
+                    <field name="name" select="1"/>
+                    <field name="sequence"/>
+                    <field name="value"/>
+                    <field name="value_amount"/>
                     <newline/>
-                    <field name='days'/>
-                    <field name='condition'/>
+                    <field name="days"/>
+                    <field name="condition"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_payment_term_form' model='ir.ui.view'>
-            <field name='name'>account.payment.term.form</field>
-            <field name='model'>account.payment.term</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Payment Term'>
-                    <separator string='Information' colspan='4'/>
-                    <field name='name' select='1'/>
-                    <field name='active' select='1'/>
-                    <separator string='Description on invoices' colspan='4'/>
-                    <field name='note' colspan='4'/>
-                    <separator string='Computation' colspan='4'/>
-                    <field name='line_ids' colspan='4'/>
+        <record id="view_payment_term_form" model="ir.ui.view">
+            <field name="name">account.payment.term.form</field>
+            <field name="model">account.payment.term</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment Term">
+                    <separator colspan="4" string="Information"/>
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <separator colspan="4" string="Description on invoices"/>
+                    <field colspan="4" name="note"/>
+                    <separator colspan="4" string="Computation"/>
+                    <field colspan="4" name="line_ids"/>
                 </form>
             </field>
         </record>
-        <record id='action_payment_term_form' model='ir.actions.act_window'>
-            <field name='name'>Payment Terms</field>
-            <field name='res_model'>account.payment.term</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_payment_term_form" model="ir.actions.act_window">
+            <field name="name">Payment Terms</field>
+            <field name="res_model">account.payment.term</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/Payment Terms/Payment Terms' action='action_payment_term_form' id='menu_action_payment_term_form'/>
+        <menuitem id="next_id_33" name="Payment Terms" parent="account.menu_finance_configuration"/><menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="next_id_33"/>
         
         <!--
 	# Account Subscriptions
 -->
         
-        <record id='view_subscription_line_form' model='ir.ui.view'>
-            <field name='name'>account.subscription.line.form</field>
-            <field name='model'>account.subscription.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Subscription lines'>
-                    <field name='date'/>
-                    <field name='move_id'/>
+        <record id="view_subscription_line_form" model="ir.ui.view">
+            <field name="name">account.subscription.line.form</field>
+            <field name="model">account.subscription.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscription lines">
+                    <field name="date"/>
+                    <field name="move_id"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_subscription_line_tree' model='ir.ui.view'>
-            <field name='name'>account.subscription.line.tree</field>
-            <field name='model'>account.subscription.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Subscription lines'>
-                    <field name='date'/>
-                    <field name='move_id'/>
+        <record id="view_subscription_line_tree" model="ir.ui.view">
+            <field name="name">account.subscription.line.tree</field>
+            <field name="model">account.subscription.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Subscription lines">
+                    <field name="date"/>
+                    <field name="move_id"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_subscription_tree' model='ir.ui.view'>
-            <field name='name'>account.subscription.tree</field>
-            <field name='model'>account.subscription</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Entry Subscription'>
-                    <field name='ref'/>
-                    <field name='name'/>
-                    <field name='date_start'/>
-                    <field name='state'/>
+        <record id="view_subscription_tree" model="ir.ui.view">
+            <field name="name">account.subscription.tree</field>
+            <field name="model">account.subscription</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Entry Subscription">
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='view_subscription_form' model='ir.ui.view'>
-            <field name='name'>account.subscription.form</field>
-            <field name='model'>account.subscription</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Entry Subscription'>
-                    <field name='name' select='1'/>
-                    <field name='ref' select='1'/>
+        <record id="view_subscription_form" model="ir.ui.view">
+            <field name="name">account.subscription.form</field>
+            <field name="model">account.subscription</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Entry Subscription">
+                    <field name="name" select="1"/>
+                    <field name="ref" select="1"/>
                     
-                    <separator string='Subscription Periods' colspan='4'/>
-                    <field name='date_start' select='1'/>
-                    <field name='period_total' select='2'/>
+                    <separator colspan="4" string="Subscription Periods"/>
+                    <field name="date_start" select="1"/>
+                    <field name="period_total" select="2"/>
                     
-                    <field name='period_nbr'/>
-                    <field name='period_type'/>
-                    <field name='model_id'/>
-                    <group col='2' colspan='2'>
-                        <button name='compute' type='object' states='draft,running' string='Compute'/>
-                        <button name='remove_line' type='object' states='running' string='Remove Lines'/>
+                    <field name="period_nbr"/>
+                    <field name="period_type"/>
+                    <field name="model_id"/>
+                    <group col="2" colspan="2">
+                        <button name="compute" states="draft,running" string="Compute" type="object"/>
+                        <button name="remove_line" states="running" string="Remove Lines" type="object"/>
                     </group>
-                    <separator string='Subscription Lines' colspan='4'/>
-                    <field name='lines_id' widget='one2many_list' colspan='4'/>
+                    <separator colspan="4" string="Subscription Lines"/>
+                    <field colspan="4" name="lines_id" widget="one2many_list"/>
                     
-                    <separator string='State' colspan='4'/>
-                    <field name='state' select='2'/>
-                    <group col='1' colspan='2'>
-                        <button name='state_draft' type='object' states='done' string='Set to Draft'/>
+                    <separator colspan="4" string="State"/>
+                    <field name="state" select="2"/>
+                    <group col="1" colspan="2">
+                        <button name="state_draft" states="done" string="Set to Draft" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
-        <record id='action_subscription_form' model='ir.actions.act_window'>
-            <field name='name'>Subscription Entries</field>
-            <field name='res_model'>account.subscription</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_subscription_form'/>
+        <record id="action_subscription_form" model="ir.actions.act_window">
+            <field name="name">Subscription Entries</field>
+            <field name="res_model">account.subscription</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_subscription_form"/>
         </record>
-        <menuitem name='Financial Management/Entries/' action='action_subscription_form' id='menu_action_subscription_form'/>
+        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_entries"/>
         
-        <record id='action_subscription_form_running' model='ir.actions.act_window'>
-            <field name='name'>Running Subscriptions</field>
-            <field name='res_model'>account.subscription</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','running')]</field>
+        <record id="action_subscription_form_running" model="ir.actions.act_window">
+            <field name="name">Running Subscriptions</field>
+            <field name="res_model">account.subscription</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','running')]</field>
         </record>
-        <menuitem name='Financial Management/Entries/Subscription Entries/' action='action_subscription_form_running' id='menu_action_subscription_form_running'/>
+        <menuitem id="next_id_34" name="Subscription Entries" parent="account.menu_finance_entries"/><menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="next_id_34"/>
         
-        <record id='view_subscription_line_form_complete' model='ir.ui.view'>
-            <field name='name'>account.subscription.line.form</field>
-            <field name='model'>account.subscription.line</field>
-            <field name='type'>form</field>
-            <field name='priority' eval='20'/>
-            <field name='arch' type='xml'>
-                <form string='Subscription lines'>
-                    <field name='subscription_id'/>
-                    <field name='date'/>
-                    <field name='move_id'/>
+        <record id="view_subscription_line_form_complete" model="ir.ui.view">
+            <field name="name">account.subscription.line.form</field>
+            <field name="model">account.subscription.line</field>
+            <field name="type">form</field>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <form string="Subscription lines">
+                    <field name="subscription_id"/>
+                    <field name="date"/>
+                    <field name="move_id"/>
                 </form>
             </field>
         </record>
-        <record id='action_subscription_line_form_running' model='ir.actions.act_window'>
-            <field name='name'>Next Entries</field>
-            <field name='res_model'>account.subscription.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('move_id','=',False)]</field>
+        <record id="action_subscription_line_form_running" model="ir.actions.act_window">
+            <field name="name">Next Entries</field>
+            <field name="res_model">account.subscription.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('move_id','=',False)]</field>
         </record>
-        <menuitem name='Financial Management/Entries/Subscription Entries/' action='action_subscription_line_form_running' id='menu_action_subscription_line_form_running'/>
+        <menuitem action="action_subscription_line_form_running" id="menu_action_subscription_line_form_running" parent="account.next_id_34"/>
         
         
-        <record id='action_move_line_tree1' model='ir.actions.act_window'>
-            <field name='name'>Move line select</field>
-            <field name='res_model'>account.move.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('account_id','child_of', [active_id]),('state','&lt;&gt;','draft')]</field>
+        <record id="action_move_line_tree1" model="ir.actions.act_window">
+            <field name="name">Move line select</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('account_id','child_of', [active_id]),('state','&lt;&gt;','draft')]</field>
         </record>
-        <wizard name='account.move.line.select' id='wizard_move_line_select' menu='False' model='account.move.line' string='Move line select'/>
-        <record id='ir_open_account_account' model='ir.values'>
-            <field name='key2' eval='&apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;account.account&apos;'/>
-            <field name='name'>Open all entries lines</field>
-            <field name='value' eval='&apos;ir.actions.wizard,%d&apos;%wizard_move_line_select'/>
-            <field name='object' eval='True'/>
+        <wizard id="wizard_move_line_select" menu="False" model="account.move.line" name="account.move.line.select" string="Move line select"/>
+        <record id="ir_open_account_account" model="ir.values">
+            <field eval="'tree_but_open'" name="key2"/>
+            <field eval="'account.account'" name="model"/>
+            <field name="name">Open all entries lines</field>
+            <field eval="'ir.actions.wizard,%d'%wizard_move_line_select" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         
-        <record id='view_move_line_tax_tree' model='ir.ui.view'>
-            <field name='name'>account.move.line.tax.tree</field>
-            <field name='model'>account.move.line</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='4'/>
-            <field name='arch' type='xml'>
-                <tree string='Account Entry Line'>
-                    <field name='date'/>
-                    <field name='move_id'/>
-                    <field name='statement_id' string='St.'/>
-                    <field name='name'/>
-                    <field name='partner_id'/>
-                    <field name='account_id'/>
-                    <field name='tax_code_id'/>
-                    <field name='tax_amount'/>
-                    <field name='debit' sum='Total debit'/>
-                    <field name='credit' sum='Total credit'/>
-                    <field name='state'/>
+        <record id="view_move_line_tax_tree" model="ir.ui.view">
+            <field name="name">account.move.line.tax.tree</field>
+            <field name="model">account.move.line</field>
+            <field name="type">tree</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Account Entry Line">
+                    <field name="date"/>
+                    <field name="move_id"/>
+                    <field name="statement_id" string="St."/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="account_id"/>
+                    <field name="tax_code_id"/>
+                    <field name="tax_amount"/>
+                    <field name="debit" sum="Total debit"/>
+                    <field name="credit" sum="Total credit"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_tax_code_line_open' model='ir.actions.act_window'>
-            <field name='name'>account.move.line</field>
-            <field name='res_model'>account.move.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='view_move_line_tax_tree'/>
-            <field name='domain'>[('tax_code_id','=',active_id),('state','&lt;&gt;','draft')]</field>
+        <record id="action_tax_code_line_open" model="ir.actions.act_window">
+            <field name="name">account.move.line</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tax_tree"/>
+            <field name="domain">[('tax_code_id','=',active_id),('state','&lt;&gt;','draft')]</field>
         </record>
-        <record id='ir_open_tax_move_line' model='ir.values'>
-            <field name='key2'>tree_but_open</field>
-            <field name='model'>account.tax.code</field>
-            <field name='name'>Tax Details</field>
-            <field name='value' eval='&apos;ir.actions.act_window,%d&apos;%action_tax_code_line_open'/>
-            <field name='object' eval='True'/>
+        <record id="ir_open_tax_move_line" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">account.tax.code</field>
+            <field name="name">Tax Details</field>
+            <field eval="'ir.actions.act_window,%d'%action_tax_code_line_open" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         
@@ -1398,103 +1398,103 @@
 	# Admin config
 	-->
         
-        <act_window name='Bank statements' domain='[(&apos;journal_id&apos;, &apos;=&apos;, active_id)]' id='act_account_journal_2_account_bank_statement' src_model='account.journal' res_model='account.bank.statement'/>
+        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_bank_statement" name="Bank statements" res_model="account.bank.statement" src_model="account.journal"/>
         
-        <act_window name='Entry lines' domain='[(&apos;journal_id&apos;, &apos;=&apos;, active_id)]' id='act_account_journal_2_account_move_line' src_model='account.journal' res_model='account.move.line'/>
+        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
         
-        <act_window name='Receivables &amp; Payables' domain='[(&apos;partner_id&apos;, &apos;=&apos;, active_id), (&apos;account_id.type&apos;, &apos;in&apos;, [&apos;receivable&apos;, &apos;payable&apos;]), (&apos;reconcile_id&apos;,&apos;=&apos;,False)]' id='act_account_partner_account_move_unreconciled' src_model='res.partner' res_model='account.move.line'/>
+        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
         
-        <act_window name='All account entries' domain='[(&apos;partner_id&apos;, &apos;=&apos;, active_id)]' id='act_account_partner_account_move' src_model='res.partner' res_model='account.move.line'/>
+        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All account entries" res_model="account.move.line" src_model="res.partner"/>
         
         
         
         <!-- configuration wizard view -->
         
-        <record id='view_config_fiscalyear_form' model='ir.ui.view'>
-            <field name='name'>Configure Fiscal Year</field>
-            <field name='model'>account.config.fiscalyear</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Configure Fiscal Year'>
-                    <separator col='4' string='Configure Fiscal Year' colspan='4'/>
+        <record id="view_config_fiscalyear_form" model="ir.ui.view">
+            <field name="name">Configure Fiscal Year</field>
+            <field name="model">account.config.fiscalyear</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure Fiscal Year">
+                    <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                     <newline/>
-                    <field name='name'/>
-                    <field name='code'/>
-                    <field name='date1'/>
-                    <field name='date2'/>
-                    <group col='4' colspan='4'>
-                        <button icon='gtk-cancel' special='cancel' string='Cancel'/>
-                        <button name='action_create' icon='gtk-ok' type='object' string='Create'/>
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="date1"/>
+                    <field name="date2"/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
         
-        <record id='action_config_fiscalyear_form' model='ir.actions.act_window'>
-            <field name='name'>Configure Fiscal Year</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account.config.fiscalyear</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form</field>
-            <field name='target'>new</field>
+        <record id="action_config_fiscalyear_form" model="ir.actions.act_window">
+            <field name="name">Configure Fiscal Year</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.config.fiscalyear</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
         </record>
         
         
         
-        <record id='view_config_journal_bank_account' model='ir.ui.view'>
-            <field name='name'>Configure Journal of Bank account</field>
-            <field name='model'>account.config.journal.bank.account</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Configure Journal of Bank account'>
-                    <separator col='4' string='Configure Journal of Bank account' colspan='4'/>
+        <record id="view_config_journal_bank_account" model="ir.ui.view">
+            <field name="name">Configure Journal of Bank account</field>
+            <field name="model">account.config.journal.bank.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure Journal of Bank account">
+                    <separator col="4" colspan="4" string="Configure Journal of Bank account"/>
                     <newline/>
-                    <field name='lines_id' mode='tree' widget='one2many_list' nolabel='1' colspan='4'>
-                        <form string='Journal Lines'>
-                            <field name='name'/>
-                            <field name='bank_account_id'/>
-                            <field name='view_id'/>
-                            <field name='sequence_id'/>
+                    <field colspan="4" mode="tree" name="lines_id" nolabel="1" widget="one2many_list">
+                        <form string="Journal Lines">
+                            <field name="name"/>
+                            <field name="bank_account_id"/>
+                            <field name="view_id"/>
+                            <field name="sequence_id"/>
                         </form>
-                        <tree editable='bottom' string='Account Journals'>
-                            <field name='name'/>
-                            <field name='bank_account_id'/>
-                            <field name='view_id'/>
-                            <field name='sequence_id'/>
+                        <tree editable="bottom" string="Account Journals">
+                            <field name="name"/>
+                            <field name="bank_account_id"/>
+                            <field name="view_id"/>
+                            <field name="sequence_id"/>
                         </tree>
                     </field>
-                    <group col='4' colspan='4'>
-                        <button icon='gtk-cancel' special='cancel' string='Cancel'/>
-                        <button name='action_create' icon='gtk-ok' type='object' string='Create'/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
         
-        <record id='action_config_journal_bank_account' model='ir.actions.act_window'>
-            <field name='name'>Configure Journal of Bank account</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account.config.journal.bank.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form</field>
-            <field name='target'>new</field>
+        <record id="action_config_journal_bank_account" model="ir.actions.act_window">
+            <field name="name">Configure Journal of Bank account</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.config.journal.bank.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
         </record>
         
         <!-- register configuration wizard -->
         
-        <record id='config_fiscalyear' model='ir.module.module.configuration.step'>
-            <field name='name'>Define fiscal years</field>
-            <field name='note'>Define fiscal years</field>
-            <field name='action_id' ref='action_config_fiscalyear_form'/>
-            <field name='state'>open</field>
+        <record id="config_fiscalyear" model="ir.module.module.configuration.step">
+            <field name="name">Define fiscal years</field>
+            <field name="note">Define fiscal years</field>
+            <field name="action_id" ref="action_config_fiscalyear_form"/>
+            <field name="state">open</field>
         </record>
         
-        <record id='config_journal_bank_account' model='ir.module.module.configuration.step'>
-            <field name='name'>Define journal for bank accounts</field>
-            <field name='note'>Define journal for bank accounts</field>
-            <field name='action_id' ref='action_config_journal_bank_account'/>
-            <field name='state'>open</field>
+        <record id="config_journal_bank_account" model="ir.module.module.configuration.step">
+            <field name="name">Define journal for bank accounts</field>
+            <field name="note">Define journal for bank accounts</field>
+            <field name="action_id" ref="action_config_journal_bank_account"/>
+            <field name="state">open</field>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 0ed99212080..29e626720c7 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,70 +1,70 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard name='account.invoice.refund' id='wizard_invoice_refund' model='account.invoice' string='Refund invoice'/>
+        <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Refund invoice"/>
         
-        <wizard name='account.invoice.pay' id='wizard_invoice_pay' model='account.invoice' string='Pay invoice'/>
+        <wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice"/>
         
-        <wizard name='account.budget.spread' id='wizard_budget_spread' model='account.budget.post' menu='False' string='Spread amount'/>
+        <wizard id="wizard_budget_spread" menu="False" model="account.budget.post" name="account.budget.spread" string="Spread amount"/>
         
         <!-- close year, period, journal -->
-        <wizard name='account.fiscalyear.close' id='wizard_fiscalyear_close' model='account.fiscalyear' menu='False' string='Close a Fiscal Year'/>
-        <menuitem name='Financial Management/End of Year Treatments/Close a Fiscal Year' sequence='11' action='wizard_fiscalyear_close' type='wizard' id='menu_wizard_fy_close'/>
+        <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Close a Fiscal Year"/>
+        <menuitem id="next_id_17" name="Financial Management"/><menuitem id="next_id_18" name="End of Year Treatments" parent="next_id_17"/><menuitem action="wizard_fiscalyear_close" id="menu_wizard_fy_close" parent="next_id_18" sequence="11" type="wizard"/>
         
-        <wizard name='account.open_closed_fiscalyear' id='wizard_open_closed_fiscalyear' model='account.fiscalyear' menu='False' string='Open a Closed Fiscal Year'/>
-        <menuitem name='Financial Management/End of Year Treatments/Open a Closed Fiscal Year' sequence='12' action='wizard_open_closed_fiscalyear' type='wizard' id='menu_wizard_open_closed_fy'/>
+        <wizard id="wizard_open_closed_fiscalyear" menu="False" model="account.fiscalyear" name="account.open_closed_fiscalyear" string="Open a Closed Fiscal Year"/>
+        <menuitem action="wizard_open_closed_fiscalyear" id="menu_wizard_open_closed_fy" parent="account.next_id_18" sequence="12" type="wizard"/>
         
-        <wizard name='account.period.close' id='wizard_period_close' model='account.period' string='Close Period'/>
+        <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close Period"/>
         
         <!-- automatic reconcile -->
-        <wizard name='account.automatic.reconcile' id='wizard_automatic_reconcile' model='account.account' menu='False' string='Automatic reconciliation'/>
-        <menuitem name='Financial Management/Periodical Processing/Reconciliation/Automatic Reconciliation' action='wizard_automatic_reconcile' type='wizard' id='menu_automatic_reconcile'/>
+        <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
+        <menuitem id="next_id_19" name="Periodical Processing" parent="account.next_id_17"/><menuitem id="next_id_20" name="Reconciliation" parent="next_id_19"/><menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>
         
         <!-- manual reconcile -->
-        <wizard name='account.move.line.reconcile' id='wizard_reconcile' model='account.move.line' string='Reconcile Entries'/>
+        <wizard id="wizard_reconcile" model="account.move.line" name="account.move.line.reconcile" string="Reconcile Entries"/>
         
-        <wizard name='account.reconcile.unreconcile' id='wizard_reconcile_unreconcile' model='account.move.reconcile' string='Unreconcile Entries'/>
+        <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>
         
         
-        <wizard name='account.move.line.reconcile.select' id='wizard_reconcile_select' model='account.move.line' menu='False' string='Reconcile entries'/>
-        <menuitem name='Financial Management/Periodical Processing/Reconciliation/Manual Reconciliation' action='wizard_reconcile_select' type='wizard' id='menu_reconcile_select'/>
+        <wizard id="wizard_reconcile_select" menu="False" model="account.move.line" name="account.move.line.reconcile.select" string="Reconcile entries"/>
+        <menuitem action="wizard_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" type="wizard"/>
         
         <!-- unreconcile -->
-        <wizard name='account.move.line.unreconcile' id='wizard_unreconcile' model='account.move.line' string='Unreconcile Entries'/>
+        <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>
         
-        <wizard name='account.move.line.unreconcile.select' id='wizard_unreconcile_select' model='account.move.line' menu='False' string='Unreconcile entries'/>
-        <menuitem name='Financial Management/Periodical Processing/Reconciliation/Manual Unreconciliation' action='wizard_unreconcile_select' type='wizard' id='menu_unreconcile_select'/>
+        <wizard id="wizard_unreconcile_select" menu="False" model="account.move.line" name="account.move.line.unreconcile.select" string="Unreconcile entries"/>
+        <menuitem action="wizard_unreconcile_select" id="menu_unreconcile_select" parent="account.next_id_20" type="wizard"/>
         
         <!-- subscriptions -->
-        <wizard name='account.subscription.generate' id='wizard_generate_subscription' model='account.subscription' menu='False' string='Create subscription entries'/>
-        <menuitem name='Financial Management/Periodical Processing/Create Subscription Entries' action='wizard_generate_subscription' type='wizard' id='menu_generate_subscription'/>
+        <wizard id="wizard_generate_subscription" menu="False" model="account.subscription" name="account.subscription.generate" string="Create subscription entries"/>
+        <menuitem action="wizard_generate_subscription" id="menu_generate_subscription" parent="account.next_id_19" type="wizard"/>
         
         <!-- Aged partner balance -->
-        <wizard name='account.aged.trial.balance' id='wizard_aged_trial_balance' model='res.partner' menu='False' string='Aged partner balance'/>
-        <menuitem name='Financial Management/Reporting/Partner Accounts/Aged Partner Balance' action='wizard_aged_trial_balance' type='wizard' id='menu_aged_trial_balance'/>
+        <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged partner balance"/>
+        <menuitem id="next_id_21" name="Reporting" parent="account.next_id_17"/><menuitem id="next_id_22" name="Partner Accounts" parent="next_id_21"/><menuitem action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>
         
         <!-- report-related wizards -->
-        <wizard name='account.partner.balance.report' id='wizard_partner_balance_report' model='res.partner' menu='False' string='Partner balance'/>
-        <menuitem name='Financial Management/Reporting/Partner Accounts/Partner Balance' action='wizard_partner_balance_report' type='wizard' id='menu_partner_balance'/>
+        <wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner balance"/>
+        <menuitem action="wizard_partner_balance_report" id="menu_partner_balance" parent="account.next_id_22" type="wizard"/>
         
-        <wizard name='account.third_party_ledger.report' id='wizard_third_party_ledger' model='res.partner' menu='False' string='Partner ledger'/>
-        <menuitem name='Financial Management/Reporting/Partner Accounts/Partner Ledger' action='wizard_third_party_ledger' type='wizard' id='menu_third_party_ledger'/>
+        <wizard id="wizard_third_party_ledger" menu="False" model="res.partner" name="account.third_party_ledger.report" string="Partner ledger"/>
+        <menuitem action="wizard_third_party_ledger" id="menu_third_party_ledger" parent="account.next_id_22" type="wizard"/>
         
-        <wizard name='account.budget.report' id='wizard_budget_report' model='account.budget.post' keyword='client_print_multi' string='Budget'/>
-        <wizard name='account.account.balance.report' id='wizard_balance_report' model='account.account' keyword='client_print_multi' string='Account balance'/>
-        <wizard name='account.general.ledger.report' id='wizard_general_ledger_report' model='account.account' keyword='client_print_multi' string='General ledger'/>
+        <wizard id="wizard_budget_report" keyword="client_print_multi" model="account.budget.post" name="account.budget.report" string="Budget"/>
+        <wizard id="wizard_balance_report" keyword="client_print_multi" model="account.account" name="account.account.balance.report" string="Account balance"/>
+        <wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General ledger"/>
         
-        <wizard name='account.invoice.state.confirm' multi='True' id='wizard_invoice_state_confirm' model='account.invoice' keyword='client_action_multi' string='Confirm draft invoices'/>
-        <wizard name='account.invoice.state.cancel' multi='True' id='wizard_invoice_state_cancel' model='account.invoice' keyword='client_action_multi' string='Cancel selected invoices'/>
+        <wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices"/>
+        <wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices"/>
         
         
-        <wizard name='account.wizard.account.duplicate' id='wizard_account_duplicate' model='account.account' keyword='tree_but_action' string='Duplicate'/>
+        <wizard id="wizard_account_duplicate" keyword="tree_but_action" model="account.account" name="account.wizard.account.duplicate" string="Duplicate"/>
         
         <!-- account.move validate -->
-        <wizard name='account.move.validate' id='wizard_validate_account_moves' model='account.move' menu='False' string='Validate Account Moves'/>
-        <menuitem name='Financial Management/Periodical Processing/Validate Account Moves' action='wizard_validate_account_moves' type='wizard' id='menu_validate_account_moves'/>
+        <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Account Moves"/>
+        <menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.next_id_19" type="wizard"/>
         
-        <wizard name='account.move_line.validate' id='wizard_validate_account_moves_line' model='account.move.line' menu='True' string='Validate Account Moves'/>
+        <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Account Moves"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/data/account_data1.xml b/addons/account/data/account_data1.xml
index 6b20eb25f0f..afb3fc14503 100644
--- a/addons/account/data/account_data1.xml
+++ b/addons/account/data/account_data1.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!--
 	Account Type
 	-->
         
-        <record model="account.account.type" id="account_type_receivable" >
+        <record id="account_type_receivable" model="account.account.type">
             <field name="name">Receivable</field>
             <field name="code">receivable</field>
             <field name="partner_account">True</field>
         </record>
-        <record model="account.account.type" id="account_type_payable" >
+        <record id="account_type_payable" model="account.account.type">
             <field name="name">Payable</field>
             <field name="code">payable</field>
             <field name="partner_account">True</field>
         </record>
-        <record model="account.account.type" id="account_type_view">
+        <record id="account_type_view" model="account.account.type">
             <field name="name">View</field>
             <field name="code">view</field>
         </record>
-        <record model="account.account.type" id="account_type_income" >
+        <record id="account_type_income" model="account.account.type">
             <field name="name">Income</field>
             <field name="code">income</field>
         </record>
-        <record model="account.account.type" id="account_type_expense">
+        <record id="account_type_expense" model="account.account.type">
             <field name="name">Expense</field>
             <field name="code">expense</field>
         </record>
         
-        <record model="account.account.type" id="account_type_tax">
+        <record id="account_type_tax" model="account.account.type">
             <field name="name">Tax</field>
             <field name="code">tax</field>
         </record>
-        <record model="account.account.type" id="account_type_cash">
+        <record id="account_type_cash" model="account.account.type">
             <field name="name">Cash</field>
             <field name="code">cash</field>
         </record>
-        <record model="account.account.type" id="account_type_asset">
+        <record id="account_type_asset" model="account.account.type">
             <field name="name">Asset</field>
             <field name="code">asset</field>
         </record>
-        <record model="account.account.type" id="account_type_equity">
+        <record id="account_type_equity" model="account.account.type">
             <field name="name">Equity</field>
             <field name="code">equity</field>
         </record>
-        <record model="account.account.type" id="account_type_closed">
+        <record id="account_type_closed" model="account.account.type">
             <field name="name">Closed</field>
             <field name="code">closed</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index cdba6ac8609..9f51843efd2 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -1,251 +1,251 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
         <!--
 		Payment term
 		-->	
-        <record model="account.payment.term" id="account_payment_term">
+        <record id="account_payment_term" model="account.payment.term">
             <field name="name">30 Days Net</field>
         </record>
-        <record model="account.payment.term.line" id="account_payment_term_line">
+        <record id="account_payment_term_line" model="account.payment.term.line">
             <field name="name">30 days</field>
             <field name="value">balance</field>
-            <field name="days" eval="30"/>
+            <field eval="30" name="days"/>
             <field name="condition">net days</field>
-            <field name="payment_id" eval="account_payment_term"/>
+            <field eval="account_payment_term" name="payment_id"/>
         </record>
         
         <!--
 		Account Journal View
 		-->
-        <record model="account.journal.view" id="account_journal_bank_view">
+        <record id="account_journal_bank_view" model="account.journal.view">
             <field name="name">Cash Journal View</field>
         </record>
-        <record model="account.journal.column" id="bank_col1">
+        <record id="bank_col1" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Date</field>
             <field name="field">date</field>
-            <field name="required" eval="True"/>
-            <field name="sequence" eval="1"/>
+            <field eval="True" name="required"/>
+            <field eval="1" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col2">
+        <record id="bank_col2" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">N. Piece</field>
             <field name="field">move_id</field>
-            <field name="required" eval="False"/>
-            <field name="sequence" eval="2"/>
+            <field eval="False" name="required"/>
+            <field eval="2" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col7">
+        <record id="bank_col7" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Name</field>
             <field name="field">name</field>
-            <field name="sequence" eval="3"/>
-            <field name="required" eval="True"/>
+            <field eval="3" name="sequence"/>
+            <field eval="True" name="required"/>
         </record>
-        <record model="account.journal.column" id="bank_col4">
+        <record id="bank_col4" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Statement</field>
             <field name="field">statement_id</field>
-            <field name="sequence" eval="4"/>
+            <field eval="4" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col6">
+        <record id="bank_col6" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Partner</field>
             <field name="field">partner_id</field>
-            <field name="sequence" eval="5"/>
+            <field eval="5" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col5">
+        <record id="bank_col5" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Account</field>
             <field name="field">account_id</field>
-            <field name="required" eval="True"/>
-            <field name="sequence" eval="6"/>
+            <field eval="True" name="required"/>
+            <field eval="6" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col9">
+        <record id="bank_col9" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Debit</field>
             <field name="field">debit</field>
-            <field name="sequence" eval="10"/>
+            <field eval="10" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col10">
+        <record id="bank_col10" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Credit</field>
             <field name="field">credit</field>
-            <field name="sequence" eval="11"/>
+            <field eval="11" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col3">
+        <record id="bank_col3" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Ref</field>
             <field name="field">ref</field>
-            <field name="sequence" eval="7"/>
+            <field eval="7" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col23">
+        <record id="bank_col23" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
-            <field name="sequence" eval="12"/>
+            <field eval="12" name="sequence"/>
         </record>
         
-        <record model="account.journal.view" id="account_journal_bank_view_multi">
+        <record id="account_journal_bank_view_multi" model="account.journal.view">
             <field name="name">Multi-Currency Cash Journal View</field>
         </record>
-        <record model="account.journal.column" id="bank_col1_multi">
+        <record id="bank_col1_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Date</field>
             <field name="field">date</field>
-            <field name="required" eval="True"/>
-            <field name="sequence" eval="1"/>
+            <field eval="True" name="required"/>
+            <field eval="1" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col2_multi">
+        <record id="bank_col2_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">N. Piece</field>
             <field name="field">move_id</field>
-            <field name="required" eval="False"/>
-            <field name="sequence" eval="2"/>
+            <field eval="False" name="required"/>
+            <field eval="2" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col7_multi">
+        <record id="bank_col7_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Name</field>
             <field name="field">name</field>
-            <field name="sequence" eval="3"/>
-            <field name="required" eval="True"/>
+            <field eval="3" name="sequence"/>
+            <field eval="True" name="required"/>
         </record>
-        <record model="account.journal.column" id="bank_col4_multi">
+        <record id="bank_col4_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Statement</field>
             <field name="field">statement_id</field>
-            <field name="sequence" eval="4"/>
+            <field eval="4" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col6_multi">
+        <record id="bank_col6_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Partner</field>
             <field name="field">partner_id</field>
-            <field name="sequence" eval="5"/>
+            <field eval="5" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col5_multi">
+        <record id="bank_col5_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Account</field>
             <field name="field">account_id</field>
-            <field name="required" eval="True"/>
-            <field name="sequence" eval="6"/>
+            <field eval="True" name="required"/>
+            <field eval="6" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col9_multi">
+        <record id="bank_col9_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Debit</field>
             <field name="field">debit</field>
-            <field name="sequence" eval="10"/>
+            <field eval="10" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col10_multi">
+        <record id="bank_col10_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Credit</field>
             <field name="field">credit</field>
-            <field name="sequence" eval="11"/>
+            <field eval="11" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col17_multi">
+        <record id="bank_col17_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Currency Amt.</field>
             <field name="field">amount_currency</field>
-            <field name="sequence" eval="12"/>
+            <field eval="12" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col18_multi">
+        <record id="bank_col18_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Currency</field>
             <field name="field">currency_id</field>
-            <field name="sequence" eval="13"/>
+            <field eval="13" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col3_multi">
+        <record id="bank_col3_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Ref</field>
             <field name="field">ref</field>
-            <field name="sequence" eval="7"/>
+            <field eval="7" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="bank_col23_multi">
+        <record id="bank_col23_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">State</field>
             <field name="field">state</field>
-            <field name="sequence" eval="14"/>
+            <field eval="14" name="sequence"/>
         </record>
         
         
-        <record model="account.journal.view" id="account_journal_view">
+        <record id="account_journal_view" model="account.journal.view">
             <field name="name">Journal View</field>
         </record>
-        <record model="account.journal.column" id="journal_col1">
+        <record id="journal_col1" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Date</field>
             <field name="field">date</field>
-            <field name="required" eval="True"/>
-            <field name="sequence" eval="1"/>
+            <field eval="True" name="required"/>
+            <field eval="1" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col2">
+        <record id="journal_col2" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">N. Piece</field>
             <field name="field">move_id</field>
-            <field name="required" eval="False"/>
-            <field name="sequence" eval="2"/>
+            <field eval="False" name="required"/>
+            <field eval="2" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col3">
+        <record id="journal_col3" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Ref</field>
             <field name="field">ref</field>
-            <field name="sequence" eval="3"/>
+            <field eval="3" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col4">
+        <record id="journal_col4" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Account</field>
             <field name="field">account_id</field>
-            <field name="required" eval="True"/>
-            <field name="sequence" eval="5"/>
+            <field eval="True" name="required"/>
+            <field eval="5" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col5">
+        <record id="journal_col5" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Partner</field>
             <field name="field">partner_id</field>
-            <field name="sequence" eval="4"/>
+            <field eval="4" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col6">
+        <record id="journal_col6" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Name</field>
             <field name="field">name</field>
-            <field name="sequence" eval="6"/>
-            <field name="required" eval="True"/>
+            <field eval="6" name="sequence"/>
+            <field eval="True" name="required"/>
         </record>
-        <record model="account.journal.column" id="journal_col7">
+        <record id="journal_col7" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Maturity Date</field>
             <field name="field">date_maturity</field>
-            <field name="sequence" eval="7"/>
+            <field eval="7" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col8">
+        <record id="journal_col8" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Debit</field>
             <field name="field">debit</field>
-            <field name="sequence" eval="8"/>
+            <field eval="8" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col9">
+        <record id="journal_col9" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Credit</field>
             <field name="field">credit</field>
-            <field name="sequence" eval="9"/>
+            <field eval="9" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col25">
+        <record id="journal_col25" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Tax Acc.</field>
             <field name="field">tax_code_id</field>
-            <field name="sequence" eval="10"/>
+            <field eval="10" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col26">
+        <record id="journal_col26" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Tax</field>
             <field name="field">tax_amount</field>
-            <field name="sequence" eval="11"/>
+            <field eval="11" name="sequence"/>
         </record>
-        <record model="account.journal.column" id="journal_col24">
+        <record id="journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
-            <field name="sequence" eval="12"/>
+            <field eval="12" name="sequence"/>
         </record>
         
         
@@ -253,82 +253,82 @@
 		Account Journal Sequences
 		-->
         
-        <record model="ir.sequence.type" id="sequence_journal_type">
+        <record id="sequence_journal_type" model="ir.sequence.type">
             <field name="name">Account Journal</field>
             <field name="code">account.journal</field>
         </record>
-        <record model="ir.sequence" id="sequence_journal">
+        <record id="sequence_journal" model="ir.sequence">
             <field name="name">Account Journal</field>
             <field name="code">account.journal</field>
-            <field name="prefix"></field>
+            <field name="prefix"/>
         </record>
         
         <!--
 		Account Statement Sequences
 		-->
         
-        <record model="ir.sequence.type" id="sequence_reconcile">
+        <record id="sequence_reconcile" model="ir.sequence.type">
             <field name="name">Account reconcile sequence</field>
             <field name="code">account.reconcile</field>
         </record>
-        <record model="ir.sequence" id="sequence_reconcile_seq">
+        <record id="sequence_reconcile_seq" model="ir.sequence">
             <field name="name">Account reconcile sequence</field>
             <field name="code">account.reconcile</field>
             <field name="prefix">A</field>
-            <field name="number_next" eval="1"/>
-            <field name="number_increment" eval="1"/>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
         </record>
         
         
-        <record model="ir.sequence.type" id="sequence_statement_type">
+        <record id="sequence_statement_type" model="ir.sequence.type">
             <field name="name">Bank Statement</field>
             <field name="code">account.bank.statement</field>
         </record>
-        <record model="ir.sequence" id="sequence_statement">
+        <record id="sequence_statement" model="ir.sequence">
             <field name="name">Account Bank Statement</field>
             <field name="code">account.bank.statement</field>
             <field name="prefix">St. %(month)s/%(day)s</field>
-            <field name="number_next" eval="0"/>
-            <field name="number_increment" eval="1"/>
+            <field eval="0" name="number_next"/>
+            <field eval="1" name="number_increment"/>
         </record>
         
         <!--
 		Account Journal
 		-->
         
-        <record model="account.journal" id="sales_journal">
+        <record id="sales_journal" model="account.journal">
             <field name="name">Sales Journal</field>
             <field name="code">SAJ</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_journal"/>
-            <field name="default_credit_account_id" model="account.account" search="[('type','=','receivable')]"/>
-            <field name="default_debit_account_id" model="account.account" search="[('type','=','receivable')]"/>
+            <field model="account.account" name="default_credit_account_id" search="[('type','=','receivable')]"/>
+            <field model="account.account" name="default_debit_account_id" search="[('type','=','receivable')]"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
-        <record model="account.journal" id="expenses_journal">
+        <record id="expenses_journal" model="account.journal">
             <field name="name">Expenses Journal</field>
             <field name="code">EXJ</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_journal"/>
-            <field name="default_debit_account_id" model="account.account" search="[('type','=','payable')]"/>
-            <field name="default_credit_account_id" model="account.account" search="[('type','=','payable')]"/>
+            <field model="account.account" name="default_debit_account_id" search="[('type','=','payable')]"/>
+            <field model="account.account" name="default_credit_account_id" search="[('type','=','payable')]"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         
-        <record model="account.journal" id="bank_journal">
+        <record id="bank_journal" model="account.journal">
             <field name="name">Bank Journal</field>
             <field name="code">BNK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_journal"/>
-            <field name="default_debit_account_id" model="account.account" search="[('type','=','cash')]"/>
-            <field name="default_credit_account_id" model="account.account" search="[('type','=','cash')]"/>
+            <field model="account.account" name="default_debit_account_id" search="[('type','=','cash')]"/>
+            <field model="account.account" name="default_credit_account_id" search="[('type','=','cash')]"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         
-        <record model="account.journal" id="stock_journal" forcecreate="1">
+        <record forcecreate="1" id="stock_journal" model="account.journal">
             <field name="name">Stock Journal</field>
             <field name="code">STJ</field>
             <field name="type">general</field>
@@ -338,4 +338,4 @@
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml
index 6532ba8daee..498398357f5 100644
--- a/addons/account/data/account_invoice.xml
+++ b/addons/account/data/account_invoice.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="res.request.link" id="req_link_invoice">
+        <record id="req_link_invoice" model="res.request.link">
             <field name="name">Invoice</field>
             <field name="object">account.invoice</field>
         </record>
@@ -9,19 +9,19 @@
         <!--
 	Sequences types for invoices
 	-->
-        <record model="ir.sequence.type" id="seq_type_out_invoice">
+        <record id="seq_type_out_invoice" model="ir.sequence.type">
             <field name="name">Account Invoice Out</field>
             <field name="code">account.invoice.out_invoice</field>
         </record>
-        <record model="ir.sequence.type" id="seq_type_in_invoice">
+        <record id="seq_type_in_invoice" model="ir.sequence.type">
             <field name="name">Account Invoice In</field>
             <field name="code">account.invoice.in_invoice</field>
         </record>
-        <record model="ir.sequence.type" id="seq_type_out_refund">
+        <record id="seq_type_out_refund" model="ir.sequence.type">
             <field name="name">Account Refund Out</field>
             <field name="code">account.invoice.out_refund</field>
         </record>
-        <record model="ir.sequence.type" id="seq_type_in_refund">
+        <record id="seq_type_in_refund" model="ir.sequence.type">
             <field name="name">Account Refund In</field>
             <field name="code">account.invoice.in_refund</field>
         </record>
@@ -29,35 +29,35 @@
         <!--
 	Sequences for invoices
 	-->
-        <record model="ir.sequence" id="seq_out_invoice">
+        <record id="seq_out_invoice" model="ir.sequence">
             <field name="name">Account Invoice Out</field>
             <field name="code">account.invoice.out_invoice</field>
-            <field name="padding" eval="3"/>
+            <field eval="3" name="padding"/>
             <field name="prefix">%(year)s/</field>
         </record>
-        <record model="ir.sequence" id="seq_in_invoice">
+        <record id="seq_in_invoice" model="ir.sequence">
             <field name="name">Account Invoice In</field>
             <field name="code">account.invoice.in_invoice</field>
-            <field name="padding" eval="3"/>
+            <field eval="3" name="padding"/>
             <field name="prefix">%(year)s/</field>
         </record>
-        <record model="ir.sequence" id="seq_out_refund">
+        <record id="seq_out_refund" model="ir.sequence">
             <field name="name">Account Refund Out</field>
             <field name="code">account.invoice.out_refund</field>
-            <field name="padding" eval="3"/>
+            <field eval="3" name="padding"/>
             <field name="prefix">%(year)s/</field>
         </record>
-        <record model="ir.sequence" id="seq_in_refund">
+        <record id="seq_in_refund" model="ir.sequence">
             <field name="name">Account Refund In</field>
             <field name="code">account.invoice.in_refund</field>
-            <field name="padding" eval="3"/>
+            <field eval="3" name="padding"/>
             <field name="prefix">%(year)s/</field>
         </record>
         
         <!--
 	Sequences types for analytic account 
 	-->
-        <record model="ir.sequence.type" id="seq_type_analytic_account">
+        <record id="seq_type_analytic_account" model="ir.sequence.type">
             <field name="name">Analytic account</field>
             <field name="code">account.analytic.account</field>
         </record>
@@ -65,12 +65,11 @@
         <!-- 
 	Sequence for analytic account 
 	-->
-        <record model="ir.sequence" id="seq_analytic_account">
+        <record id="seq_analytic_account" model="ir.sequence">
             <field name="name">Analytic account sequence</field>
             <field name="code">account.analytic.account</field>
-            <field name="padding" eval="3" />
-            <field name="number_next" eval="2708" />
+            <field eval="3" name="padding"/>
+            <field eval="2708" name="number_next"/>
         </record>
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/account/data/account_minimal.xml b/addons/account/data/account_minimal.xml
index 7f60b09d51f..20bdc80918d 100644
--- a/addons/account/data/account_minimal.xml
+++ b/addons/account/data/account_minimal.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="True">
         
@@ -10,68 +10,68 @@
             <field name="code">0</field>
             <field name="name">Minimal account chart</field>
             <field name="close_method">none</field>
-            <field name="parent_id" eval="[]"/>
+            <field eval="[]" name="parent_id"/>
             <field name="type">view</field>
         </record>
         
-        <record model="account.account" id="a_recv">
+        <record id="a_recv" model="account.account">
             <field name="name">Main Receivable</field>
             <field name="code">40</field>
             <field name="type">receivable</field>
-            <field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
+            <field eval="[(6,0,[ref('minimal_0')])]" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="reconcile" eval="True"/>
+            <field eval="True" name="reconcile"/>
         </record>
-        <record model="account.account" id="a_pay">
+        <record id="a_pay" model="account.account">
             <field name="name">Main Payable</field>
             <field name="code">440</field>
             <field name="type">payable</field>
-            <field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
+            <field eval="[(6,0,[ref('minimal_0')])]" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="reconcile" eval="True"/>
+            <field eval="True" name="reconcile"/>
         </record>
         
-        <record model="account.account" id="cash">
+        <record id="cash" model="account.account">
             <field name="name">Petty Cash</field>
             <field name="code">57</field>
             <field name="type">cash</field>
-            <field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
+            <field eval="[(6,0,[ref('minimal_0')])]" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
         
-        <record model="account.account" id="a_expense">
+        <record id="a_expense" model="account.account">
             <field name="name">Products Purchase</field>
             <field name="code">600</field>
             <field name="type">expense</field>
-            <field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
+            <field eval="[(6,0,[ref('minimal_0')])]" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.account" id="a_sale">
+        <record id="a_sale" model="account.account">
             <field name="name">Products Sales</field>
             <field name="code">701</field>
             <field name="type">income</field>
-            <field name="parent_id" eval="[(6,0,[ref('minimal_0')])]"/>
+            <field eval="[(6,0,[ref('minimal_0')])]" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
         
-        <record model="ir.property" id="property_account_receivable" forcecreate="True">
+        <record forcecreate="True" id="property_account_receivable" model="ir.property">
             <field name="name">property_account_receivable</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_receivable')]"/>
-            <field name="value" eval="'account.account,'+str(a_recv)"/>
+            <field eval="'account.account,'+str(a_recv)" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="ir.property" id="property_account_payable" forcecreate="True">
+        <record forcecreate="True" id="property_account_payable" model="ir.property">
             <field name="name">property_account_payable</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_payable')]"/>
-            <field name="value" eval="'account.account,'+str(a_pay)"/>
+            <field eval="'account.account,'+str(a_pay)" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="ir.property" id="property_account_tax" forcecreate="True">
+        <record forcecreate="True" id="property_account_tax" model="ir.property">
             <field name="name">property_account_tax</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_tax')]"/>
-            <field name="value" eval="False"/>
+            <field eval="False" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index e8d0984a16a..88ea1d898f8 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!--
 		Partners Extension
 	-->
         
-        <record model="ir.ui.view" id="view_partner_form">
+        <record id="view_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
@@ -19,4 +19,4 @@
             </field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/product_data.xml b/addons/account/product_data.xml
index 3655947e120..43aeb63d753 100644
--- a/addons/account/product_data.xml
+++ b/addons/account/product_data.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!--
 		Product income and expense accounts, default parameters
 	-->
         
-        <record model="ir.property" id="property_account_expense_prd">
+        <record id="property_account_expense_prd" model="ir.property">
             <field name="name">property_account_expense</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>
-            <field name="value" eval="False"/>
+            <field eval="False" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="ir.property" id="property_account_income_prd">
+        <record id="property_account_income_prd" model="ir.property">
             <field name="name">property_account_income</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>
-            <field name="value" eval="False"/>
+            <field eval="False" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="ir.property" id="property_account_expense_categ">
+        <record id="property_account_expense_categ" model="ir.property">
             <field name="name">property_account_expense_categ</field>
             <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ')]"/>
-            <field name="value" eval="'account.account,'+str(ref('account.a_expense'))"/>
+            <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="ir.property" id="property_account_income_categ">
+        <record id="property_account_income_categ" model="ir.property">
             <field name="name">property_account_income_categ</field>
             <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_income_categ')]"/>
-            <field name="value" eval="'account.account,'+str(ref('account.a_sale'))" model="account.account"/>
+            <field eval="'account.account,'+str(ref('account.a_sale'))" model="account.account" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 263989e7f40..d4ffd9ea9a5 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="ir.ui.view" id="product_normal_form_view">
+        <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
@@ -9,14 +9,14 @@
             <field name="arch" type="xml">
                 <field name="product_manager" position="after">
                     <newline/>
-                    <field name="supplier_taxes_id" colspan="4"/>
-                    <field name="taxes_id" colspan="4"/>
+                    <field colspan="4" name="supplier_taxes_id"/>
+                    <field colspan="4" name="taxes_id"/>
                     <newline/>
                 </field>
             </field>
         </record>
         
-        <record model="ir.ui.view" id="product_template_form_view">
+        <record id="product_template_form_view" model="ir.ui.view">
             <field name="name">product.template.product.form.inherit</field>
             <field name="model">product.template</field>
             <field name="type">form</field>
@@ -24,11 +24,11 @@
             <field name="arch" type="xml">
                 <field name="cost_method" position="after">
                     <newline/>
-                    <field name="supplier_taxes_id" colspan="4"/>
-                    <field name="taxes_id" colspan="4"/>
+                    <field colspan="4" name="supplier_taxes_id"/>
+                    <field colspan="4" name="taxes_id"/>
                     <newline/>
                 </field>
             </field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 4754237386f..bc7bda80144 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -1,227 +1,227 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="account.analytic.account" id="analytic_absences">
+        <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Absences</field>
             <field name="code">1</field>
         </record>
-        <record model="account.analytic.account" id="analytic_internal">
+        <record id="analytic_internal" model="account.analytic.account">
             <field name="name">Internal</field>
             <field name="code">2</field>
         </record>
-        <record model="account.analytic.account" id="analytic_our_super_product">
+        <record id="analytic_our_super_product" model="account.analytic.account">
             <field name="name">Our Super Product</field>
             <field name="code">100</field>
             <field name="state">open</field>
         </record>
-        <record model="account.analytic.account" id="analytic_project_1">
+        <record id="analytic_project_1" model="account.analytic.account">
             <field name="name">Project 1</field>
             <field name="code">101</field>
         </record>
-        <record model="account.analytic.account" id="analytic_project_2">
+        <record id="analytic_project_2" model="account.analytic.account">
             <field name="name">Project 2</field>
             <field name="code">102</field>
         </record>
-        <record model="account.analytic.account" id="analytic_journal_trainings">
+        <record id="analytic_journal_trainings" model="account.analytic.account">
             <field name="name">Trainings</field>
             <field name="code">4</field>
-            <field name="parent_id" ref="analytic_internal" />
+            <field name="parent_id" ref="analytic_internal"/>
         </record>
-        <record model="account.analytic.account" id="analytic_in_house">
+        <record id="analytic_in_house" model="account.analytic.account">
             <field name="name">In House</field>
             <field name="code">1</field>
-            <field name="parent_id" ref="analytic_journal_trainings" />
+            <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
-        <record model="account.analytic.account" id="analytic_online">
+        <record id="analytic_online" model="account.analytic.account">
             <field name="name">Online</field>
             <field name="code">2</field>
-            <field name="parent_id" ref="analytic_journal_trainings" />
+            <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
-        <record model="account.analytic.account" id="analytic_support">
+        <record id="analytic_support" model="account.analytic.account">
             <field name="name">Support</field>
             <field name="code">support</field>
-            <field name="parent_id" ref="analytic_our_super_product" />
+            <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
-        <record model="account.analytic.account" id="analytic_partners">
+        <record id="analytic_partners" model="account.analytic.account">
             <field name="name">Partners</field>
             <field name="code">partners</field>
-            <field name="parent_id" ref="analytic_support" />
+            <field name="parent_id" ref="analytic_support"/>
         </record>
-        <record model="account.analytic.account" id="analytic_customers">
+        <record id="analytic_customers" model="account.analytic.account">
             <field name="name">Customers</field>
             <field name="code">customers</field>
-            <field name="parent_id" ref="analytic_support" />
+            <field name="parent_id" ref="analytic_support"/>
         </record>
-        <record model="account.analytic.account" id="analytic_support_internal">
+        <record id="analytic_support_internal" model="account.analytic.account">
             <field name="name">Internal</field>
             <field name="code">3</field>
-            <field name="parent_id" ref="analytic_support" />
+            <field name="parent_id" ref="analytic_support"/>
         </record>
-        <record model="account.analytic.account" id="analytic_integration">
+        <record id="analytic_integration" model="account.analytic.account">
             <field name="name">Integration</field>
             <field name="code">integration</field>
-            <field name="parent_id" ref="analytic_our_super_product" />
+            <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
-        <record model="account.analytic.account" id="analytic_consultancy">
+        <record id="analytic_consultancy" model="account.analytic.account">
             <field name="name">Consultancy</field>
             <field name="code">4</field>
-            <field name="parent_id" ref="analytic_our_super_product" />
+            <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
-        <record model="account.analytic.account" id="analytic_super_product_trainings">
+        <record id="analytic_super_product_trainings" model="account.analytic.account">
             <field name="name">Trainings</field>
             <field name="code">5</field>
-            <field name="parent_id" ref="analytic_our_super_product" />
+            <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
-        <record model="account.analytic.account" id="analytic_seagate_p1">
+        <record id="analytic_seagate_p1" model="account.analytic.account">
             <field name="name">Seagate P1</field>
             <field name="code">1</field>
-            <field name="parent_id" ref="analytic_integration" />
+            <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
-            <field name="partner_id" ref="base.res_partner_seagate" />
+            <field name="partner_id" ref="base.res_partner_seagate"/>
         </record>
-        <record model="account.analytic.account" id="analytic_seagate_p2">
+        <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
             <field name="code">2</field>
-            <field name="parent_id" ref="analytic_integration" />
+            <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
-            <field name="partner_id" ref="base.res_partner_seagate" />
+            <field name="partner_id" ref="base.res_partner_seagate"/>
         </record>
-        <record model="account.analytic.account" id="analytic_magasin_bml_1">
+        <record id="analytic_magasin_bml_1" model="account.analytic.account">
             <field name="name">Magasin BML 1</field>
             <field name="code">3</field>
-            <field name="parent_id" ref="analytic_integration" />
-            <field name="partner_id" ref="base.res_partner_15" />
+            <field name="parent_id" ref="analytic_integration"/>
+            <field name="partner_id" ref="base.res_partner_15"/>
         </record>
-        <record model="account.analytic.account" id="analytic_integration_c2c">
+        <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
             <field name="code">7</field>
-            <field name="date_start" eval="str(time.localtime()[0] - 1) + '-08-07'" />
-            <field name="date" eval="time.strftime('%Y-12-31')" />
-            <field name="parent_id" ref="analytic_integration" />
-            <field name="partner_id" ref="base.res_partner_c2c" />
+            <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
+            <field eval="time.strftime('%Y-12-31')" name="date"/>
+            <field name="parent_id" ref="analytic_integration"/>
+            <field name="partner_id" ref="base.res_partner_c2c"/>
             <field name="state">open</field>
         </record>
-        <record model="account.analytic.account" id="analytic_agrolait">
+        <record id="analytic_agrolait" model="account.analytic.account">
             <field name="name">Agrolait</field>
             <field name="code">3</field>
-            <field name="parent_id" ref="analytic_customers" />
-            <field name="partner_id" ref="base.res_partner_agrolait" />
+            <field name="parent_id" ref="analytic_customers"/>
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
         </record>
-        <record model="account.analytic.account" id="analytic_asustek">
+        <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
             <field name="code">4</field>
-            <field name="parent_id" ref="analytic_customers" />
-            <field name="partner_id" ref="base.res_partner_asus" />
+            <field name="parent_id" ref="analytic_customers"/>
+            <field name="partner_id" ref="base.res_partner_asus"/>
         </record>
-        <record model="account.analytic.account" id="analytic_distripc">
+        <record id="analytic_distripc" model="account.analytic.account">
             <field name="name">DistriPC</field>
             <field name="code">7</field>
-            <field name="parent_id" ref="analytic_customers" />
-            <field name="partner_id" ref="base.res_partner_4" />
+            <field name="parent_id" ref="analytic_customers"/>
+            <field name="partner_id" ref="base.res_partner_4"/>
         </record>
-        <record model="account.analytic.account" id="analytic_sednacom">
+        <record id="analytic_sednacom" model="account.analytic.account">
             <field name="name">Sednacom</field>
             <field name="code">2</field>
-            <field name="date_start" eval="str(time.localtime()[0] - 1) + '-05-09'" />
-            <field name="date" eval="time.strftime('%Y-05-08')" />
-            <field name="parent_id" ref="analytic_partners" />
-            <field name="partner_id" ref="base.res_partner_sednacom" />
+            <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
+            <field eval="time.strftime('%Y-05-08')" name="date"/>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_sednacom"/>
             <field name="state">open</field>
         </record>
-        <record model="account.analytic.account" id="analytic_thymbra">
+        <record id="analytic_thymbra" model="account.analytic.account">
             <field name="name">Thymbra</field>
             <field name="code">3</field>
-            <field name="date_start" eval="time.strftime('%Y-02-01')" />
-            <field name="date" eval="time.strftime('%Y-07-01')" />
-            <field name="parent_id" ref="analytic_partners" />
-            <field name="partner_id" ref="base.res_partner_thymbra" />
+            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
+            <field eval="time.strftime('%Y-07-01')" name="date"/>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_thymbra"/>
             <field name="state">open</field>
         </record>
-        <record model="account.analytic.account" id="analytic_leclerc">
+        <record id="analytic_leclerc" model="account.analytic.account">
             <field name="name">Leclerc</field>
             <field name="code">10</field>
-            <field name="date_start" eval="time.strftime('%Y-04-24')" />
-            <field name="date" eval="str(time.localtime()[0] + 1) + '-04-24'" />
-            <field name="parent_id" ref="analytic_partners" />
-            <field name="partner_id" ref="base.res_partner_11" />
+            <field eval="time.strftime('%Y-04-24')" name="date_start"/>
+            <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_11"/>
         </record>
-        <record model="account.analytic.account" id="analytic_desertic_hispafuentes">
+        <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
             <field name="name">Desertic - Hispafuentes</field>
             <field name="code">12</field>
-            <field name="date_start" eval="time.strftime('%Y-02-01')" />
-            <field name="date" eval="str(time.localtime()[0] + 1) + '-02-01'" />
-            <field name="parent_id" ref="analytic_partners" />
-            <field name="partner_id" ref="base.res_partner_desertic_hispafuentes" />
+            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
+            <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
         </record>
-        <record model="account.analytic.account" id="analytic_tiny_at_work">
+        <record id="analytic_tiny_at_work" model="account.analytic.account">
             <field name="name">Tiny AT Work</field>
             <field name="code">15</field>
-            <field name="parent_id" ref="analytic_partners" />
-            <field name="partner_id" ref="base.res_partner_tinyatwork" />
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_tinyatwork"/>
         </record>
-        <record model="account.analytic.account" id="analytic_partners_camp_to_camp">
+        <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="name">Camp to Camp</field>
             <field name="code">21</field>
-            <field name="date_start" eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" />
-            <field name="date" eval="time.strftime('%Y-%m-%d')" />
-            <field name="parent_id" ref="analytic_partners" />
-            <field name="partner_id" ref="base.res_partner_c2c" />
+            <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field name="parent_id" ref="analytic_partners"/>
+            <field name="partner_id" ref="base.res_partner_c2c"/>
             <field name="state">open</field>
         </record>
-        <record model="account.analytic.account" id="analytic_project_2_support">
+        <record id="analytic_project_2_support" model="account.analytic.account">
             <field name="name">Support</field>
             <field name="code">1</field>
-            <field name="parent_id" ref="analytic_project_2" />
+            <field name="parent_id" ref="analytic_project_2"/>
         </record>
-        <record model="account.analytic.account" id="analytic_project_2_development">
+        <record id="analytic_project_2_development" model="account.analytic.account">
             <field name="name">Development</field>
             <field name="code">2</field>
-            <field name="parent_id" ref="analytic_project_2" />
+            <field name="parent_id" ref="analytic_project_2"/>
         </record>
-        <record model="account.analytic.account" id="analytic_project_1_trainings">
+        <record id="analytic_project_1_trainings" model="account.analytic.account">
             <field name="name">Trainings</field>
             <field name="code">1</field>
-            <field name="parent_id" ref="analytic_project_1" />
+            <field name="parent_id" ref="analytic_project_1"/>
         </record>
-        <record model="account.analytic.account" id="analytic_project_1_development">
+        <record id="analytic_project_1_development" model="account.analytic.account">
             <field name="name">Development</field>
             <field name="code">2</field>
-            <field name="parent_id" ref="analytic_project_1" />
+            <field name="parent_id" ref="analytic_project_1"/>
         </record>
-        <record model="account.analytic.account" id="analytic_administratif">
+        <record id="analytic_administratif" model="account.analytic.account">
             <field name="name">Administratif</field>
             <field name="code">1</field>
-            <field name="parent_id" ref="analytic_internal" />
+            <field name="parent_id" ref="analytic_internal"/>
         </record>
-        <record model="account.analytic.account" id="analytic_commercial_marketing">
+        <record id="analytic_commercial_marketing" model="account.analytic.account">
             <field name="name">Commercial &amp; Marketing</field>
             <field name="code">2</field>
-            <field name="parent_id" ref="analytic_internal" />
+            <field name="parent_id" ref="analytic_internal"/>
         </record>
-        <record model="account.analytic.account" id="analytic_our_super_product_development">
+        <record id="analytic_our_super_product_development" model="account.analytic.account">
             <field name="name">Our Super Product Development</field>
             <field name="code">3</field>
-            <field name="parent_id" ref="analytic_internal" />
+            <field name="parent_id" ref="analytic_internal"/>
         </record>
-        <record model="account.analytic.account" id="analytic_stable">
+        <record id="analytic_stable" model="account.analytic.account">
             <field name="name">Stable</field>
             <field name="code">1</field>
-            <field name="parent_id" ref="analytic_our_super_product_development" />
+            <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
-        <record model="account.analytic.account" id="analytic_trunk">
+        <record id="analytic_trunk" model="account.analytic.account">
             <field name="name">Trunk</field>
             <field name="code">2</field>
-            <field name="parent_id" ref="analytic_our_super_product_development" />
+            <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
-        <record model="account.analytic.account" id="analytic_paid">
+        <record id="analytic_paid" model="account.analytic.account">
             <field name="name">Paid</field>
             <field name="code">1</field>
-            <field name="parent_id" ref="analytic_absences" />
+            <field name="parent_id" ref="analytic_absences"/>
         </record>
-        <record model="account.analytic.account" id="analytic_unpaid">
+        <record id="analytic_unpaid" model="account.analytic.account">
             <field name="name">Unpaid</field>
             <field name="code">2</field>
-            <field name="parent_id" ref="analytic_absences" />
+            <field name="parent_id" ref="analytic_absences"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/project/project_demo.xml b/addons/account/project/project_demo.xml
index 433f76b5c4e..c9bb7187c6a 100644
--- a/addons/account/project/project_demo.xml
+++ b/addons/account/project/project_demo.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="account.analytic.journal" id="cose_journal_sale">
+        <record id="cose_journal_sale" model="account.analytic.journal">
             <field name="code">SAL</field>
             <field name="name">Sales</field>
             <field name="type">sale</field>
         </record>
-        <record model="account.analytic.journal" id="exp">
+        <record id="exp" model="account.analytic.journal">
             <field name="code">PUR</field>
             <field name="name">Purchases</field>
             <field name="type">purchase</field>
         </record>
-        <record model="account.analytic.journal" id="sit">
+        <record id="sit" model="account.analytic.journal">
             <field name="code">START</field>
             <field name="name">Starting Balance</field>
             <field name="type">situation</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/project/project_report.xml b/addons/account/project/project_report.xml
index dca15479b07..99e79ca0474 100644
--- a/addons/account/project/project_report.xml
+++ b/addons/account/project/project_report.xml
@@ -1,106 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report
-			id="analytic_journal_print"
-			string="Analytic Journal"
-			model="account.analytic.journal"
-			name="account.analytic.account.journal"
-			rml="account/project/report/analytic_journal.rml"
-			auto="False"
-			menu="False"/>
+        <report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
         
-        <wizard
-			id="account_analytic_account_journal_report"
-			string="Analytic Journal"
-			model="account.analytic.journal"
-			name="account.analytic.account.journal.report"
-			keyword="client_print_multi"/>
+        <wizard id="account_analytic_account_journal_report" keyword="client_print_multi" model="account.analytic.journal" name="account.analytic.account.journal.report" string="Analytic Journal"/>
         
         
-        <report
-			id="account_analytic_account_balance"
-			string="Analytic Balance"
-			model="account.analytic.account"
-			name="account.analytic.account.balance"
-			rml="account/project/report/analytic_balance.rml"
-			auto="False"
-			menu="False"/>
+        <report auto="False" id="account_analytic_account_balance" menu="False" model="account.analytic.account" name="account.analytic.account.balance" rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
         
-        <wizard
-			id="account_analytic_account_balance_report"
-			string="Analytic Balance"
-			model="account.analytic.account"
-			name="account.analytic.account.balance.report"
-			keyword="client_print_multi"/>
+        <wizard id="account_analytic_account_balance_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.balance.report" string="Analytic Balance"/>
         
         
-        <report
-			id="account_analytic_account_inverted_balance"
-			string="Inverted Analytic Balance"
-			model="account.analytic.account"
-			name="account.analytic.account.inverted.balance"
-			rml="account/project/report/inverted_analytic_balance.rml"
-			auto="False"
-			menu="False"/>
+        <report auto="False" id="account_analytic_account_inverted_balance" menu="False" model="account.analytic.account" name="account.analytic.account.inverted.balance" rml="account/project/report/inverted_analytic_balance.rml" string="Inverted Analytic Balance"/>
         
-        <wizard
-			id="account_analytic_account_inverted_balance_report"
-			string="Inverted Analytic Balance"
-			model="account.analytic.account"
-			name="account.analytic.account.inverted.balance.report"
-			keyword="client_print_multi"/>
+        <wizard id="account_analytic_account_inverted_balance_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.inverted.balance.report" string="Inverted Analytic Balance"/>
         
         
-        <report
-			id="account_analytic_account_cost_ledger"
-			string="Cost Ledger"
-			model="account.analytic.account"
-			name="account.analytic.account.cost_ledger"
-			rml="account/project/report/cost_ledger.rml"
-			auto="False"
-			menu="False"/>
+        <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
         
-        <wizard
-			id="account_analytic_account_cost_ledger_report"
-			string="Cost Ledger"
-			model="account.analytic.account"
-			name="account.analytic.account.cost_ledger.report"
-			keyword="client_print_multi"/>
+        <wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.cost_ledger.report" string="Cost Ledger"/>
         
         
-        <report
-			id="account_analytic_account_quantity_cost_ledger"
-			string="Cost Ledger (Only quantities)"
-			model="account.analytic.account"
-			name="account.analytic.account.quantity_cost_ledger"
-			rml="account/project/report/quantity_cost_ledger.rml"
-			auto="False"
-			menu="False"/>
+        <report auto="False" id="account_analytic_account_quantity_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger" rml="account/project/report/quantity_cost_ledger.rml" string="Cost Ledger (Only quantities)"/>
         
-        <wizard
-			id="account_analytic_account_quantity_cost_ledger_report"
-			string="Cost Ledger (Only quantities)"
-			model="account.analytic.account"
-			name="account.analytic.account.quantity_cost_ledger.report"
-			keyword="client_print_multi"/>
+        <wizard id="account_analytic_account_quantity_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger.report" string="Cost Ledger (Only quantities)"/>
         
         
-        <report
-			id="account_analytic_account_analytic_check"
-			string="Analytic Check"
-			model="account.account"
-			name="account.analytic.account.analytic.check"
-			rml="account/project/report/analytic_check.rml"
-			auto="False"
-			menu="False"/>
+        <report auto="False" id="account_analytic_account_analytic_check" menu="False" model="account.account" name="account.analytic.account.analytic.check" rml="account/project/report/analytic_check.rml" string="Analytic Check"/>
         
-        <wizard
-			id="account_analytic_account_analytic_check_report"
-			string="Analytic Check"
-			model="account.account"
-			name="account.analytic.account.analytic.check.report"
-			keyword="client_print_multi"/>
+        <wizard id="account_analytic_account_analytic_check_report" keyword="client_print_multi" model="account.account" name="account.analytic.account.analytic.check.report" string="Analytic Check"/>
         
         <!--Budget -->
         <!--<report
@@ -113,5 +41,4 @@
 			menu="False"/>-->
         
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/account/project/project_security.xml b/addons/account/project/project_security.xml
index 907ef1b9e8d..f7f7dc7fa08 100644
--- a/addons/account/project/project_security.xml
+++ b/addons/account/project/project_security.xml
@@ -1,26 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="ir.model.access" id="access_analytic_account">
+        <record id="access_analytic_account" model="ir.model.access">
             <field name="name">Analytic Accounts</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.analytic.account')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.analytic.account')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_analytic_account_account_user">
+        <record id="access_analytic_account_account_user" model="ir.model.access">
             <field name="name">Analytic Accounts</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.analytic.account')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.analytic.account')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!--<record model="ir.model.access" id="access_analytic_account_account_admin">
@@ -34,25 +32,23 @@
 			<field name="perm_unlink" eval="True"/>
 		</record>-->
         
-        <record model="ir.model.access" id="access_analytic_journal">
+        <record id="access_analytic_journal" model="ir.model.access">
             <field name="name">Analytic Journal</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.analytic.journal')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.analytic.journal')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_analytic_journal_account_user">
+        <record id="access_analytic_journal_account_user" model="ir.model.access">
             <field name="name">Analytic Journal</field>
-            <field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.analytic.journal')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'account.analytic.journal')]"/>
             <field name="group_id" ref="group_account_user"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         <!--
 
@@ -132,4 +128,4 @@
 		</record>-->
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 5c96691738b..defbd07f391 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -1,331 +1,331 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='view_account_analytic_account_list' model='ir.ui.view'>
-            <field name='name'>account.analytic.account.list</field>
-            <field name='model'>account.analytic.account</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='8'/>
-            <field name='arch' type='xml'>
-                <tree colors='red:date and (date&lt;=current_date)' string='Analytic account'>
-                    <field name='code'/>
-                    <field name='complete_name'/>
-                    <field name='quantity'/>
-                    <field name='quantity_max'/>
-                    <field name='date'/>
+        <record id="view_account_analytic_account_list" model="ir.ui.view">
+            <field name="name">account.analytic.account.list</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">tree</field>
+            <field eval="8" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:date and (date&lt;=current_date)" string="Analytic account">
+                    <field name="code"/>
+                    <field name="complete_name"/>
+                    <field name="quantity"/>
+                    <field name="quantity_max"/>
+                    <field name="date"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_account_analytic_account_tree' model='ir.ui.view'>
-            <field name='name'>account.analytic.account.tree</field>
-            <field name='model'>account.analytic.account</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree colors='red:date and (date&lt;=current_date)' string='Analytic account'>
-                    <field name='name'/>
-                    <field name='code'/>
-                    <field name='date'/>
-                    <field name='company_currency_id'/>
-                    <field name='debit'/>
-                    <field name='credit'/>
-                    <field name='balance'/>
-                    <field name='quantity'/>
-                    <field name='quantity_max'/>
+        <record id="view_account_analytic_account_tree" model="ir.ui.view">
+            <field name="name">account.analytic.account.tree</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree colors="red:date and (date&lt;=current_date)" string="Analytic account">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="date"/>
+                    <field name="company_currency_id"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
+                    <field name="balance"/>
+                    <field name="quantity"/>
+                    <field name="quantity_max"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_account_analytic_account_form' model='ir.ui.view'>
-            <field name='name'>account.analytic.account.form</field>
-            <field name='model'>account.analytic.account</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Analytic account'>
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic account">
                     <notebook>
-                        <page string='Account Data'>
-                            <field name='name' select='1'/>
-                            <field name='code' select='1'/>
-                            <field name='parent_id' on_change='on_change_parent(parent_id)'/>
-                            <field name='company_id' select='2'/>
-                            <field name='type' select='2'/>
-                            <field name='partner_id' select='1'/>
+                        <page string="Account Data">
+                            <field name="name" select="1"/>
+                            <field name="code" select="1"/>
+                            <field name="parent_id" on_change="on_change_parent(parent_id)"/>
+                            <field name="company_id" select="2"/>
+                            <field name="type" select="2"/>
+                            <field name="partner_id" select="1"/>
                             <newline/>
-                            <field name='date_start'/>
-                            <field name='date' select='2'/>
-                            <field name='active' select='2'/>
+                            <field name="date_start"/>
+                            <field name="date" select="2"/>
+                            <field name="active" select="2"/>
                             <newline/>
-                            <field name='quantity_max'/>
-                            <field name='user_id'/>
-                            <separator string='Note' colspan='4'/>
-                            <field name='description' nolabel='1' colspan='4'/>
+                            <field name="quantity_max"/>
+                            <field name="user_id"/>
+                            <separator colspan="4" string="Note"/>
+                            <field colspan="4" name="description" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
         
-        <record id='action_account_analytic_account_form' model='ir.actions.act_window'>
-            <field name='name'>Analytic Accounts</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_account_analytic_account_tree'/>
+        <record id="action_account_analytic_account_form" model="ir.actions.act_window">
+            <field name="name">Analytic Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
-        <menuitem name='Financial Management/Configuration/Analytic Accounts/Analytic Accounts' action='action_account_analytic_account_form' id='account_analytic_def_account'/>
+        <menuitem id="next_id_39" name="Analytic Accounts" parent="account.menu_finance_configuration"/><menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="next_id_39"/>
         
-        <record id='action_account_analytic_account_tree2' model='ir.actions.act_window'>
-            <field name='name'>Analytic Charts of Accounts</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='domain'>[('parent_id','=',False)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_account_analytic_account_tree'/>
+        <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
+            <field name="name">Analytic Charts of Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
-        <menuitem name='Financial Management/Configuration/Analytic Accounts/' action='action_account_analytic_account_tree2' id='account_analytic_def_chart'/>
-        <menuitem name='Financial Management/Charts/' action='action_account_analytic_account_tree2' id='account_analytic_chart'/>
+        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_def_chart" parent="account.next_id_39"/>
+        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
         
-        <menuitem name='Financial Management/Reporting/Analytic/Analytic Balance' action='action_account_analytic_account_tree2' id='account_analytic_chart_balance'/>
+        <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
         
-        <record id='view_account_analytic_line_form' model='ir.ui.view'>
-            <field name='name'>account.analytic.line.form</field>
-            <field name='model'>account.analytic.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Analytic Entry'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='amount' select='2'/>
-                    <field name='date' select='1'/>
-                    <field name='account_id' select='1'/>
-                    <field name='journal_id' select='2'/>
-                    <field name='general_account_id' select='2'/>
-                    <field name='move_id' select='2'/>
-                    <field name='unit_amount' select='2'/>
-                    <field name='ref' select='2'/>
+        <record id="view_account_analytic_line_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Entry">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="amount" select="2"/>
+                    <field name="date" select="1"/>
+                    <field name="account_id" select="1"/>
+                    <field name="journal_id" select="2"/>
+                    <field name="general_account_id" select="2"/>
+                    <field name="move_id" select="2"/>
+                    <field name="unit_amount" select="2"/>
+                    <field name="ref" select="2"/>
                     <newline/>
-                    <field name='product_id' select='2'/>
-                    <field name='product_uom_id' select='2'/>
+                    <field name="product_id" select="2"/>
+                    <field name="product_uom_id" select="2"/>
                 </form>
             </field>
         </record>
-        <record id='view_account_analytic_line_tree' model='ir.ui.view'>
-            <field name='name'>account.analytic.line.tree</field>
-            <field name='model'>account.analytic.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree editable='top' string='Analytic Entries'>
-                    <field name='date'/>
-                    <field name='name'/>
-                    <field name='unit_amount' sum='Total quantity' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                    <field name='product_id' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                    <field name='account_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;normal&apos;)]'/>
-                    <field name='product_uom_id' invisible='True' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                    <field name='amount' sum='Total amount'/>
-                    <field name='general_account_id'/>
-                    <field name='journal_id'/>
-                    <field name='ref'/>
+        <record id="view_account_analytic_line_tree" model="ir.ui.view">
+            <field name="name">account.analytic.line.tree</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="top" string="Analytic Entries">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total quantity"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field domain="[('type','=','normal')]" name="account_id"/>
+                    <field invisible="True" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field name="amount" sum="Total amount"/>
+                    <field name="general_account_id"/>
+                    <field name="journal_id"/>
+                    <field name="ref"/>
                 </tree>
             </field>
         </record>
-        <record id='action_account_analytic_line_form' model='ir.actions.act_window'>
-            <field name='name'>Analytic Entries</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account.analytic.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_account_analytic_line_tree'/>
+        <record id="action_account_analytic_line_form" model="ir.actions.act_window">
+            <field name="name">Analytic Entries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
-        <menuitem name='Financial Management/Entries/Analytic Entries/Analytic Entries' action='action_account_analytic_line_form' id='account_entries_analytic_entries'/>
+        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/><menuitem action="action_account_analytic_line_form" id="account_entries_analytic_entries" parent="next_id_41"/>
         
         
-        <record id='action_account_tree1' model='ir.actions.act_window'>
-            <field name='name'>action.account.tree1</field>
-            <field name='res_model'>account.analytic.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('account_id','=', active_id)]</field>
+        <record id="action_account_tree1" model="ir.actions.act_window">
+            <field name="name">action.account.tree1</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('account_id','=', active_id)]</field>
         </record>
-        <record id='ir_open_account_analytic_account' model='ir.values'>
-            <field name='key2' eval='&apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;account.analytic.account&apos;'/>
-            <field name='name'>Open Account Tree</field>
-            <field name='value' eval='&apos;ir.actions.act_window,%d&apos;%action_account_tree1'/>
-            <field name='object' eval='True'/>
+        <record id="ir_open_account_analytic_account" model="ir.values">
+            <field eval="'tree_but_open'" name="key2"/>
+            <field eval="'account.analytic.account'" name="model"/>
+            <field name="name">Open Account Tree</field>
+            <field eval="'ir.actions.act_window,%d'%action_account_tree1" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
-        <record id='account_analytic_line_extended_form' model='ir.ui.view'>
-            <field name='name'>account.analytic.line.extended_form</field>
-            <field name='model'>account.analytic.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Project line'>
-                    <field name='name'/>
-                    <field name='account_id'/>
-                    <field name='date'/>
-                    <field name='journal_id'/>
-                    <field name='unit_amount' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                    <field name='product_id' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                    <field name='product_uom_id' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                    <field name='general_account_id' invisible='True'/>
-                    <field name='amount'/>
+        <record id="account_analytic_line_extended_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.extended_form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Project line">
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="date"/>
+                    <field name="journal_id"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field invisible="True" name="general_account_id"/>
+                    <field name="amount"/>
                 </form>
             </field>
         </record>
-        <record id='action_account_analytic_account_line_extended_form' model='ir.actions.act_window'>
-            <field name='name'>account.analytic.line.extended</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account.analytic.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='account_analytic_line_extended_form'/>
+        <record id="action_account_analytic_account_line_extended_form" model="ir.actions.act_window">
+            <field name="name">account.analytic.line.extended</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="account_analytic_line_extended_form"/>
         </record>
         
         #
         # Analytic Journal
         #
         
-        <record id='view_account_analytic_journal_tree' model='ir.ui.view'>
-            <field name='name'>account.analytic.journal.tree</field>
-            <field name='model'>account.analytic.journal</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Analytic Journal'>
-                    <field name='code'/>
-                    <field name='name'/>
-                    <field name='type'/>
+        <record id="view_account_analytic_journal_tree" model="ir.ui.view">
+            <field name="name">account.analytic.journal.tree</field>
+            <field name="model">account.analytic.journal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Journal">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_account_analytic_journal_form' model='ir.ui.view'>
-            <field name='name'>account.analytic.journal.form</field>
-            <field name='model'>account.analytic.journal</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Analytic Journal'>
-                    <field name='name' select='1'/>
-                    <field name='code' select='1'/>
-                    <field name='type' select='2'/>
-                    <field name='active' select='2'/>
+        <record id="view_account_analytic_journal_form" model="ir.ui.view">
+            <field name="name">account.analytic.journal.form</field>
+            <field name="model">account.analytic.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Journal">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="type" select="2"/>
+                    <field name="active" select="2"/>
                 </form>
             </field>
         </record>
-        <record id='action_account_analytic_journal_form' model='ir.actions.act_window'>
-            <field name='name'>Analytic Journal Definition</field>
-            <field name='res_model'>account.analytic.journal</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_account_analytic_journal_form" model="ir.actions.act_window">
+            <field name="name">Analytic Journal Definition</field>
+            <field name="res_model">account.analytic.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/Journal/Analytic Journal Definition' action='action_account_analytic_journal_form' id='account_def_analytic_journal'/>
+        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="account.next_id_25"/>
         
         #
         # Open journal entries
         #
         
-        <record id='action_account_analytic_journal_open_form' model='ir.actions.act_window'>
-            <field name='name'>account.analytic.journal.open.form</field>
-            <field name='res_model'>account.analytic.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('journal_id','=',active_id)]</field>
+        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
+            <field name="name">account.analytic.journal.open.form</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('journal_id','=',active_id)]</field>
         </record>
-        <record id='ir_open_account_journal_analytic' model='ir.values'>
-            <field name='key2' eval='&apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;account.analytic.journal&apos;'/>
-            <field name='name'>Open Analytic Journal</field>
-            <field name='value' eval='&apos;ir.actions.act_window,%d&apos;%action_account_analytic_journal_open_form'/>
-            <field name='object' eval='True'/>
+        <record id="ir_open_account_journal_analytic" model="ir.values">
+            <field eval="'tree_but_open'" name="key2"/>
+            <field eval="'account.analytic.journal'" name="model"/>
+            <field name="name">Open Analytic Journal</field>
+            <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         #
         # Reporting
         #
         
-        <record id='action_account_analytic_journal_tree' model='ir.actions.act_window'>
-            <field name='name'>Print Analytic Journals</field>
-            <field name='res_model'>account.analytic.journal</field>
-            <field name='view_type'>tree</field>
+        <record id="action_account_analytic_journal_tree" model="ir.actions.act_window">
+            <field name="name">Print Analytic Journals</field>
+            <field name="res_model">account.analytic.journal</field>
+            <field name="view_type">tree</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Analytic/Print Analytic Journals' action='action_account_analytic_journal_tree' id='account_analytic_journal_print'/>
+        <menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
         
         
-        <record id='action_account_analytic_journal_tree2' model='ir.actions.act_window'>
-            <field name='name'>Entries by Journal</field>
-            <field name='res_model'>account.analytic.journal</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_account_analytic_journal_tree'/>
+        <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">
+            <field name="name">Entries by Journal</field>
+            <field name="res_model">account.analytic.journal</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_analytic_journal_tree"/>
         </record>
-        <menuitem name='Financial Management/Entries/Analytic Entries/Entries by Journal' action='action_account_analytic_journal_tree2' id='account_analytic_journal_entries'/>
+        <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>
         
         #
         # Statistics
         #
         
-        <record id='report_hr_timesheet_invoice_journal_form' model='ir.ui.view'>
-            <field name='name'>report.hr.timesheet.invoice.journal.form</field>
-            <field name='model'>report.hr.timesheet.invoice.journal</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Analytic Entries Stats'>
-                    <field name='name' select='1'/>
-                    <field name='account_id' select='1'/>
-                    <field name='journal_id' select='2'/>
+        <record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">
+            <field name="name">report.hr.timesheet.invoice.journal.form</field>
+            <field name="model">report.hr.timesheet.invoice.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Entries Stats">
+                    <field name="name" select="1"/>
+                    <field name="account_id" select="1"/>
+                    <field name="journal_id" select="2"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='report_hr_timesheet_invoice_journal_tree' model='ir.ui.view'>
-            <field name='name'>report.hr.timesheet.invoice.journal.tree</field>
-            <field name='model'>report.hr.timesheet.invoice.journal</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Analytic Entries Stats'>
-                    <field name='name'/>
-                    <field name='account_id'/>
-                    <field name='journal_id'/>
-                    <field name='quantity'/>
-                    <field name='revenue'/>
-                    <field name='cost'/>
+        <record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">
+            <field name="name">report.hr.timesheet.invoice.journal.tree</field>
+            <field name="model">report.hr.timesheet.invoice.journal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Entries Stats">
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="journal_id"/>
+                    <field name="quantity"/>
+                    <field name="revenue"/>
+                    <field name="cost"/>
                 </tree>
             </field>
         </record>
         
-        <record id='report_hr_timesheet_invoice_journal_graph' model='ir.ui.view'>
-            <field name='name'>report.hr.timesheet.invoice.journal.graph</field>
-            <field name='model'>report.hr.timesheet.invoice.journal</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' string='Analytic Entries Stats'>
-                    <field name='name'/>
-                    <field name='cost' operator='+'/>
-                    <field name='revenue' operator='+'/>
-                    <field name='journal_id' group='True'/>
+        <record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">
+            <field name="name">report.hr.timesheet.invoice.journal.graph</field>
+            <field name="model">report.hr.timesheet.invoice.journal</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Analytic Entries Stats" type="bar">
+                    <field name="name"/>
+                    <field name="cost" operator="+"/>
+                    <field name="revenue" operator="+"/>
+                    <field group="True" name="journal_id"/>
                 </graph>
             </field>
         </record>
         
-        <record id='report_account_analytic_journal_tree' model='ir.actions.act_window'>
-            <field name='name'>Account cost and revenue by journal</field>
-            <field name='res_model'>report.hr.timesheet.invoice.journal</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,graph</field>
+        <record id="report_account_analytic_journal_tree" model="ir.actions.act_window">
+            <field name="name">Account cost and revenue by journal</field>
+            <field name="res_model">report.hr.timesheet.invoice.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Analytic/All Months/Account Cost and Revenue by Journal' action='report_account_analytic_journal_tree' id='report_account_analytic_journal_print'/>
+        <menuitem id="next_id_42" name="All Months" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="next_id_42"/>
         
-        <record id='report_account_analytic_journal_tree_month' model='ir.actions.act_window'>
-            <field name='name'>Account cost and revenue by journal (This Month)</field>
-            <field name='res_model'>report.hr.timesheet.invoice.journal</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="report_account_analytic_journal_tree_month" model="ir.actions.act_window">
+            <field name="name">Account cost and revenue by journal (This Month)</field>
+            <field name="res_model">report.hr.timesheet.invoice.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Analytic/This Month/Account Cost and Revenue by Journal' action='report_account_analytic_journal_tree_month' id='report_account_analytic_journal_print_month'/>
+        <menuitem id="next_id_43" name="This Month" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree_month" id="report_account_analytic_journal_print_month" parent="next_id_43"/>
         
-        <act_window name='All Analytic Entries' view_type='form' domain='[(&apos;account_id&apos;, &apos;=&apos;, active_id)]' id='act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal' src_model='account.analytic.account' view_mode='tree,form' res_model='account.analytic.line'/>
+        <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" name="All Analytic Entries" res_model="account.analytic.line" src_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
         
         
-        <act_window name='Costs &amp; Revenues' view_type='form' domain='[(&apos;account_id&apos;, &apos;=&apos;, active_id)]' id='act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal' src_model='account.analytic.account' view_mode='graph,tree,form' res_model='report.hr.timesheet.invoice.journal'/>
+        <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs &amp; Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 11f311b59ba..6ebab7aa0a8 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,104 +1,104 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <menuitem name='Project Management' icon='terp-project' id='menu_main'/>
+        <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
         
-        <record id='action_account_analytic_managed' model='ir.actions.act_window'>
-            <field name='name'>My managed accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="action_account_analytic_managed" model="ir.actions.act_window">
+            <field name="name">My managed accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/My Managed Accounts' action='action_account_analytic_managed' id='menu_analytic_account_managed'/>
+        <menuitem id="next_id_71" name="Analytic Accounts" parent="account_analytic_analysis.menu_main"/><menuitem action="action_account_analytic_managed" id="menu_analytic_account_managed" parent="next_id_71"/>
         
-        <record id='action_hr_tree_invoiced_my' model='ir.actions.act_window'>
-            <field name='name'>Uninvoiced entries of my accounts</field>
-            <field name='res_model'>account.analytic.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
+        <record id="action_hr_tree_invoiced_my" model="ir.actions.act_window">
+            <field name="name">Uninvoiced entries of my accounts</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/Uninvoiced Entries of My Projects' action='action_hr_tree_invoiced_my' id='menu_action_hr_tree_invoiced_my'/>
+        <menuitem action="action_hr_tree_invoiced_my" id="menu_action_hr_tree_invoiced_my" parent="account_analytic_analysis.next_id_71"/>
         
-        <record id='action_account_analytic_managed_open' model='ir.actions.act_window'>
-            <field name='name'>My Open Managed Accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('user_id','=',uid),('state','=','open')]</field>
+        <record id="action_account_analytic_managed_open" model="ir.actions.act_window">
+            <field name="name">My Open Managed Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/My Managed Accounts/' action='action_account_analytic_managed_open' id='menu_analytic_account_to_valid_open'/>
+        <menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed"/>
         
-        <record id='action_account_analytic_managed_pending' model='ir.actions.act_window'>
-            <field name='name'>My Pending Managed Accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('user_id','=',uid),('state','=','pending')]</field>
+        <record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
+            <field name="name">My Pending Managed Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/My Managed Accounts/' action='action_account_analytic_managed_pending' id='menu_analytic_account_to_valid_pending'/>
+        <menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed"/>
         
-        <record id='action_account_analytic_managed_overpassed' model='ir.actions.act_window'> 
-            <field name='name'>Overpassed accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
+        <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window"> 
+            <field name="name">Overpassed accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/Overpassed Accounts' action='action_account_analytic_managed_overpassed' id='menu_action_account_analytic_managed_overpassed'/>
+        <menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" parent="account_analytic_analysis.next_id_71"/>
         
-        <record id='action_account_analytic_all' model='ir.actions.act_window'>
-            <field name='name'>All Analytic Accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='account.view_account_analytic_account_list'/>
-            <field name='domain'>[]</field>
+        <record id="action_account_analytic_all" model="ir.actions.act_window">
+            <field name="name">All Analytic Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="account.view_account_analytic_account_list"/>
+            <field name="domain">[]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/' action='action_account_analytic_all' id='menu_action_account_analytic_all'/>
+        <menuitem action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="account_analytic_analysis.next_id_71"/>
         
-        <record id='action_account_analytic_all_draft' model='ir.actions.act_window'>
-            <field name='name'>Draft Analytic Accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='account.view_account_analytic_account_list'/>
-            <field name='domain'>[('state','=','draft')]</field>
+        <record id="action_account_analytic_all_draft" model="ir.actions.act_window">
+            <field name="name">Draft Analytic Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="account.view_account_analytic_account_list"/>
+            <field name="domain">[('state','=','draft')]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/All Analytic Accounts/' action='action_account_analytic_all_draft' id='menu_action_account_analytic_all_draft'/>
+        <menuitem id="next_id_72" name="All Analytic Accounts" parent="account_analytic_analysis.next_id_71"/><menuitem action="action_account_analytic_all_draft" id="menu_action_account_analytic_all_draft" parent="next_id_72"/>
         
-        <record id='action_account_analytic_all_open' model='ir.actions.act_window'>
-            <field name='name'>Open Analytic Accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='account.view_account_analytic_account_list'/>
-            <field name='domain'>[('state','=','open')]</field>
+        <record id="action_account_analytic_all_open" model="ir.actions.act_window">
+            <field name="name">Open Analytic Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="account.view_account_analytic_account_list"/>
+            <field name="domain">[('state','=','open')]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/All Analytic Accounts/' action='action_account_analytic_all_open' id='menu_action_account_analytic_all_open'/>
+        <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="account_analytic_analysis.next_id_72"/>
         
-        <record id='action_account_analytic_all_pending' model='ir.actions.act_window'>
-            <field name='name'>Pending Analytic Accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='account.view_account_analytic_account_list'/>
-            <field name='domain'>[('state','=','pending')]</field>
+        <record id="action_account_analytic_all_pending" model="ir.actions.act_window">
+            <field name="name">Pending Analytic Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="account.view_account_analytic_account_list"/>
+            <field name="domain">[('state','=','pending')]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/All Analytic Accounts/' action='action_account_analytic_all_pending' id='menu_action_account_analytic_all_pending'/>
+        <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="account_analytic_analysis.next_id_72"/>
         
-        <record id='action_account_analytic_all_simplified' model='ir.actions.act_window'>
-            <field name='name'>Simplified View Analytic Accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_account_analytic_simplified'/>
-            <field name='domain'>[]</field>
+        <record id="action_account_analytic_all_simplified" model="ir.actions.act_window">
+            <field name="name">Simplified View Analytic Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_account_analytic_simplified"/>
+            <field name="domain">[]</field>
         </record>
         
-        <menuitem name='Project Management/Analytic Accounts/All Analytic Accounts/' action='action_account_analytic_all_simplified' id='menu_action_account_analytic_all_simplified'/>
+        <menuitem action="action_account_analytic_all_simplified" id="menu_action_account_analytic_all_simplified" parent="account_analytic_analysis.next_id_72"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 40530fb6e79..6f30c05d20c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
 
@@ -7,17 +8,17 @@
         Remove information on Account data => because they move on analysis sheet
         create a page with invoicing informations
         -->
-        <record model="ir.ui.view" id="hr_timesheet.account_analytic_account_form_form">
+        <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field> 
             <field name="model">account.analytic.account</field> 
             <field name="type">form</field> 
-            <field name="inherit_id" ref="account.view_account_analytic_account_form" />
-            <field name="priority" eval="18"/>
+            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <form>
                     <notebook position="inside">
                         <page string="Analysis summary">
-                            <separator string="Work done stats" colspan="4" />
+                            <separator colspan="4" string="Work done stats"/>
 
                             <field name="total_cost"/>
                             <field name="remaining_ca"/>
@@ -29,25 +30,25 @@
                             <field name="hours_qtt_invoiced"/>
                             <field name="remaining_hours"/>
                             <newline/>
-                            <separator string="Analysis stats" colspan="4" />
+                            <separator colspan="4" string="Analysis stats"/>
 
                             <field name="revenue_per_hour"/>
                             <field name="real_margin"/>
                             <field name="theorical_margin"/>
                             <field name="real_margin_rate"/>
-                            <separator string="Key dates" colspan="4" />
+                            <separator colspan="4" string="Key dates"/>
 
                             <field name="last_invoice_date"/>
 
                             <field name="last_worked_invoiced_date" select="2"/>
                             <field name="last_worked_date"/>
-                            <separator string="To be invoiced" colspan="4" />
+                            <separator colspan="4" string="To be invoiced"/>
                             <field name="hours_qtt_non_invoiced"/>
                             <field name="ca_to_invoice" select="2"/>
 
                         </page>
                         <page string="Stats by month">  
-                            <field name="month_ids" colspan="4" nolabel="1">
+                            <field colspan="4" name="month_ids" nolabel="1">
                                 <tree string="Month">
                                     <field name="month"/>
                                     <field name="unit_amount" widget="float_time"/>
@@ -55,7 +56,7 @@
                             </field>
                         </page>
                         <page string="Stats by user"> 
-                            <field name="user_ids" colspan="4" nolabel="1">
+                            <field colspan="4" name="user_ids" nolabel="1">
                                 <tree string="Users">
                                     <field name="user"/>
                                     <field name="unit_amount" widget="float_time"/>
@@ -69,10 +70,10 @@
         </record>
 
         <!-- Add information on Account analytic list for the project management -->
-        <record model="ir.ui.view" id="view_account_analytic_account_tree_c2c_2">
+        <record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view">
             <field name="name">account.analytic.account.tree</field>
             <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_list" />
+            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <field name="quantity" position="replace">
@@ -82,10 +83,10 @@
                 </field>
             </field>
         </record>
-        <record model="ir.ui.view" id="view_account_analytic_account_tree_c2c_3"> 
+        <record id="view_account_analytic_account_tree_c2c_3" model="ir.ui.view"> 
             <field name="name">account.analytic.account.tree</field> 
             <field name="model">account.analytic.account</field> 
-            <field name="inherit_id" ref="account.view_account_analytic_account_list" />
+            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
 
             <field name="type">tree</field> 
             <field name="arch" type="xml"> 
@@ -99,11 +100,11 @@
 
         </record>
 
-        <record model="ir.ui.view" id="view_account_analytic_simplified">
+        <record id="view_account_analytic_simplified" model="ir.ui.view">
             <field name="name">account.analytic.account.simplified.tree</field>
             <field name="model">account.analytic.account</field>
             <field name="type">tree</field>
-            <field name="priority" eval="20"/>
+            <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Analytic accounts">
                     <field name="code"/>
@@ -118,4 +119,4 @@
         </record>
 
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_chart/account_chart.xml b/addons/account_chart/account_chart.xml
index c8f924e3e15..2b6e6fe7825 100644
--- a/addons/account_chart/account_chart.xml
+++ b/addons/account_chart/account_chart.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="True">
         
         <!-- deactivate minimal account -->
-        <record model="account.account" id="account.minimal_0">
-            <field name="active" eval="False"/>
+        <record id="account.minimal_0" model="account.account">
+            <field eval="False" name="active"/>
         </record>
-        <record model="account.account" id="account.a_recv">
-            <field name="active" eval="False"/>
+        <record id="account.a_recv" model="account.account">
+            <field eval="False" name="active"/>
         </record>
-        <record model="account.account" id="account.a_pay">
-            <field name="active" eval="False"/>
+        <record id="account.a_pay" model="account.account">
+            <field eval="False" name="active"/>
         </record>
-        <record model="account.account" id="account.cash">
-            <field name="active" eval="False"/>
+        <record id="account.cash" model="account.account">
+            <field eval="False" name="active"/>
         </record>
-        <record model="account.account" id="account.a_expense">
-            <field name="active" eval="False"/>
+        <record id="account.a_expense" model="account.account">
+            <field eval="False" name="active"/>
         </record>
-        <record model="account.account" id="account.a_sale">
-            <field name="active" eval="False"/>
+        <record id="account.a_sale" model="account.account">
+            <field eval="False" name="active"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_followup/followup_demo.xml b/addons/account_followup/followup_demo.xml
index 15b3969653b..a75de0b1be9 100644
--- a/addons/account_followup/followup_demo.xml
+++ b/addons/account_followup/followup_demo.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="account_followup.followup" id="demo_followup1">
+        <record id="demo_followup1" model="account_followup.followup">
             <field name="name">Default follow-up</field>
             <field name="description">First letter after 15 net days, 30 net days and 45 days end of month levels.</field>
         </record>
         
-        <record model="account_followup.followup.line" id="demo_followup_line1">
+        <record id="demo_followup_line1" model="account_followup.followup.line">
             <field name="name">Level 0 : 15 net days</field>
             <field name="sequence">0</field>
             <field name="start">days</field>
             <field name="delay">15</field>
             <field name="followup_id" ref="demo_followup1"/>
         </record>
-        <record model="account_followup.followup.line" id="demo_followup_line2">
+        <record id="demo_followup_line2" model="account_followup.followup.line">
             <field name="name">Level 1 : 30 net days</field>
             <field name="sequence">1</field>
             <field name="start">days</field>
             <field name="delay">30</field>
             <field name="followup_id" ref="demo_followup1"/>
         </record>
-        <record model="account_followup.followup.line" id="demo_followup_line3">
+        <record id="demo_followup_line3" model="account_followup.followup.line">
             <field name="name">Level 2 : 45 days end of month</field>
             <field name="sequence">2</field>
             <field name="start">end_of_month</field>
@@ -30,4 +30,4 @@
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_followup/followup_report_view.xml b/addons/account_followup/followup_report_view.xml
index 65633f31240..7ee9a34fb2b 100644
--- a/addons/account_followup/followup_report_view.xml
+++ b/addons/account_followup/followup_report_view.xml
@@ -1,53 +1,53 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='view_account_followup_stat_form' model='ir.ui.view'>
-            <field name='name'>account_followup.stat.form</field>
-            <field name='model'>account_followup.stat</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Follow-Up lines'>
-                    <field name='name' select='1'/>
-                    <field name='account_type' select='2'/>
-                    <field name='date_move' select='1'/>
-                    <field name='date_move_last' select='1'/>
-                    <field name='date_followup' select='2'/>
-                    <field name='followup_id' select='2'/>
-                    <field name='balance' select='2'/>
-                    <field name='debit'/>
-                    <field name='credit'/>
+        <record id="view_account_followup_stat_form" model="ir.ui.view">
+            <field name="name">account_followup.stat.form</field>
+            <field name="model">account_followup.stat</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Follow-Up lines">
+                    <field name="name" select="1"/>
+                    <field name="account_type" select="2"/>
+                    <field name="date_move" select="1"/>
+                    <field name="date_move_last" select="1"/>
+                    <field name="date_followup" select="2"/>
+                    <field name="followup_id" select="2"/>
+                    <field name="balance" select="2"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='view_account_followup_stat_tree' model='ir.ui.view'>
-            <field name='name'>account_followup.stat.tree</field>
-            <field name='model'>account_followup.stat</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Follow-Up lines'>
-                    <field name='name'/>
-                    <field name='account_type'/>
-                    <field name='date_move'/>
-                    <field name='date_move_last'/>
-                    <field name='date_followup'/>
-                    <field name='followup_id'/>
-                    <field name='balance'/>
-                    <field name='debit'/>
-                    <field name='credit'/>
+        <record id="view_account_followup_stat_tree" model="ir.ui.view">
+            <field name="name">account_followup.stat.tree</field>
+            <field name="model">account_followup.stat</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Follow-Up lines">
+                    <field name="name"/>
+                    <field name="account_type"/>
+                    <field name="date_move"/>
+                    <field name="date_move_last"/>
+                    <field name="date_followup"/>
+                    <field name="followup_id"/>
+                    <field name="balance"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_followup_stat' model='ir.actions.act_window'>
-            <field name='name'>Follow-Ups</field>
-            <field name='res_model'>account_followup.stat</field>
-            <field name='view_type'>form</field>
+        <record id="action_followup_stat" model="ir.actions.act_window">
+            <field name="name">Follow-Ups</field>
+            <field name="res_model">account_followup.stat</field>
+            <field name="view_type">form</field>
         </record>
-        <menuitem name='Financial Management/Reporting/' action='action_followup_stat' id='menu_action_followup_stat'/>
+        <menuitem action="action_followup_stat" id="menu_action_followup_stat" parent="account.menu_finance_reporting"/>
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index 482defd257f..de7b8afb9d6 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -1,112 +1,112 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='view_account_followup_followup_line_form' model='ir.ui.view'>
-            <field name='name'>account_followup.followup.line.form</field>
-            <field name='model'>account_followup.followup.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Follow-Up lines'>
-                    <field name='sequence' select='1'/>
-                    <field name='name' select='1'/>
-                    <field name='delay' select='1'/>
-                    <field name='start' select='1'/>
+        <record id="view_account_followup_followup_line_form" model="ir.ui.view">
+            <field name="name">account_followup.followup.line.form</field>
+            <field name="model">account_followup.followup.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Follow-Up lines">
+                    <field name="sequence" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="delay" select="1"/>
+                    <field name="start" select="1"/>
                     <newline/>
-                    <field name='description' select='1' colspan='4'/>
+                    <field colspan="4" name="description" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_account_followup_followup_form' model='ir.ui.view'>
-            <field name='name'>account_followup.followup.form</field>
-            <field name='model'>account_followup.followup</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Follow-Up'>
-                    <field name='name' select='1'/>
-                    <separator string='Description' colspan='4'/>
-                    <field name='description' nolabel='1' colspan='4'/>
-                    <separator string='Lines' colspan='4'/>
-                    <field name='followup_line' nolabel='1' widget='one2many_list' colspan='4'/>
+        <record id="view_account_followup_followup_form" model="ir.ui.view">
+            <field name="name">account_followup.followup.form</field>
+            <field name="model">account_followup.followup</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Follow-Up">
+                    <field name="name" select="1"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="description" nolabel="1"/>
+                    <separator colspan="4" string="Lines"/>
+                    <field colspan="4" name="followup_line" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
-        <record id='action_account_followup_definition_form' model='ir.actions.act_window'>
-            <field name='name'>Follow-Ups</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>account_followup.followup</field>
-            <field name='view_type'>form</field>
+        <record id="action_account_followup_definition_form" model="ir.actions.act_window">
+            <field name="name">Follow-Ups</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account_followup.followup</field>
+            <field name="view_type">form</field>
         </record>
-        <menuitem name='Financial Management/Configuration/Payment Terms/Follow-Ups' action='action_account_followup_definition_form' id='account_followup_menu'/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.next_id_33"/>
         
-        <report name='account_followup.followup.print' id='account_followup_followup_report' rml='account_followup/report/rappel.rml' auto='False' model='account_followup.followup' menu='False' string='Followup Report'/>
+        <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/rappel.rml" string="Followup Report"/>
         
-        <record id='action_account_followup_all_wizard' model='ir.actions.wizard'>
-            <field name='name'>Send followups</field>
-            <field name='wiz_name'>account_followup.followup.print.all</field>
+        <record id="action_account_followup_all_wizard" model="ir.actions.wizard">
+            <field name="name">Send followups</field>
+            <field name="wiz_name">account_followup.followup.print.all</field>
         </record>
-        <menuitem name='Financial Management/Periodical Processing/Send Follow-Ups' action='action_account_followup_all_wizard' type='wizard' id='account_followup_wizard_menu'/>
+        <menuitem action="action_account_followup_all_wizard" id="account_followup_wizard_menu" parent="account.menu_finance_periodical_processing" type="wizard"/>
         
         
-        <record id='account_move_line_partner_tree' model='ir.ui.view'>
-            <field name='name'>account.move.line.partner.tree</field>
-            <field name='model'>account.move.line</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='32'/>
-            <field name='arch' type='xml'>
-                <tree editable='bottom' string='Partner entries'>
-                    <field name='date'/>
-                    <field name='move_id'/>
-                    <field name='ref'/>
-                    <field name='name'/>
-                    <field name='partner_id'/>
-                    <field name='account_id'/>
-                    <field name='followup_line_id'/>
-                    <field name='followup_date'/>
-                    <field name='debit' sum='Total debit'/>
-                    <field name='credit' sum='Total credit'/>
-                    <field name='state'/>
-                    <field name='date_maturity'/>
+        <record id="account_move_line_partner_tree" model="ir.ui.view">
+            <field name="name">account.move.line.partner.tree</field>
+            <field name="model">account.move.line</field>
+            <field name="type">tree</field>
+            <field eval="32" name="priority"/>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Partner entries">
+                    <field name="date"/>
+                    <field name="move_id"/>
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="account_id"/>
+                    <field name="followup_line_id"/>
+                    <field name="followup_date"/>
+                    <field name="debit" sum="Total debit"/>
+                    <field name="credit" sum="Total credit"/>
+                    <field name="state"/>
+                    <field name="date_maturity"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_move_line_form' model='ir.ui.view'>
-            <field name='name'>account.move.line.form.followup</field>
-            <field name='model'>account.move.line</field>
-            <field name='inherit_id' ref='account.view_move_line_form'/>
-            <field name='arch' type='xml'>
-                <field name='date_created' position='after'>
-                    <field name='followup_date'/>
-                    <field name='followup_line_id'/>
+        <record id="view_move_line_form" model="ir.ui.view">
+            <field name="name">account.move.line.form.followup</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_move_line_form"/>
+            <field name="arch" type="xml">
+                <field name="date_created" position="after">
+                    <field name="followup_date"/>
+                    <field name="followup_line_id"/>
                 </field>
             </field>
         </record>
         
-        <record id='view_move_line_tree' model='ir.ui.view'>
-            <field name='name'>account.move.line.tree.followup</field>
-            <field name='model'>account.move.line</field>
-            <field name='inherit_id' ref='account.view_move_line_tree'/>
-            <field name='arch' type='xml'>
-                <field name='state' position='before'>
-                    <field name='followup_date'/>
-                    <field name='followup_line_id'/>
+        <record id="view_move_line_tree" model="ir.ui.view">
+            <field name="name">account.move.line.tree.followup</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                    <field name="followup_date"/>
+                    <field name="followup_line_id"/>
                 </field>
             </field>
         </record>
         
         
-        <act_window name='Receivables &amp; Payables' domain='[(&apos;partner_id&apos;, &apos;=&apos;, active_id),(&apos;reconcile_id&apos;,&apos;=&apos;,False),(&apos;account_id.reconcile&apos;, &apos;=&apos;, True)]' id='account.act_account_partner_account_move_unreconciled' view='account_move_line_partner_tree' res_model='account.move.line'/>
+        <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True)]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
         
-        <act_window name='All receivable entries' domain='[(&apos;reconcile_id&apos;, &apos;=&apos;, False),(&apos;account_id.type&apos;,&apos;=&apos;,&apos;receivable&apos;)]' id='act_account_partner_account_move_all' src_model='' view='account_move_line_partner_tree' res_model='account.move.line'/>
+        <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
         
-        <menuitem name='Financial Management/Periodical Processing/Send Follow-Ups/Receivable Entries' action='act_account_partner_account_move_all' id='menu_account_move_open_unreconcile'/>
+        <menuitem action="act_account_partner_account_move_all" id="menu_account_move_open_unreconcile" parent="account_followup.account_followup_wizard_menu"/>
         
-        <act_window name='All payable entries' domain='[(&apos;reconcile_id&apos;, &apos;=&apos;, False), (&apos;account_id.type&apos;,&apos;=&apos;,&apos;payable&apos;)]' id='act_account_partner_account_move_payable_all' src_model='' view='account_move_line_partner_tree' res_model='account.move.line'/>
+        <act_window domain="[('reconcile_id', '=', False), ('account_id.type','=','payable')]" id="act_account_partner_account_move_payable_all" name="All payable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
         
-        <menuitem name='Financial Management/Periodical Processing/Send Follow-Ups/Payable Entries' action='act_account_partner_account_move_payable_all' id='menu_account_move_open_unreconcile_payable'/>
+        <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.account_followup_wizard_menu"/>
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_payment/account_invoice_view.xml b/addons/account_payment/account_invoice_view.xml
index 39a3e3a73e4..dde7462af74 100644
--- a/addons/account_payment/account_invoice_view.xml
+++ b/addons/account_payment/account_invoice_view.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="ir.ui.view" id="invoice_supplier_form">
+        <record id="invoice_supplier_form" model="ir.ui.view">
             <field name="name">account.invoice.supplier.form.inherit</field>
             <field name="model">account.invoice</field>
             <field name="type">form</field>
@@ -14,4 +14,4 @@
             </field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_payment/payment_report.xml b/addons/account_payment/payment_report.xml
index 913bae8f1f2..733d71c9a19 100644
--- a/addons/account_payment/payment_report.xml
+++ b/addons/account_payment/payment_report.xml
@@ -1,11 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report id="payment_order"
-			string="Payment Order"
-			model="payment.order"
-			name="payement.order"
-			rml="account_payment/report/order.rml"
-			auto="True"/>
+        <report auto="True" id="payment_order" model="payment.order" name="payement.order" rml="account_payment/report/order.rml" string="Payment Order"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_payment/payment_sequence.xml b/addons/account_payment/payment_sequence.xml
index 8218e246e09..67f118a1852 100644
--- a/addons/account_payment/payment_sequence.xml
+++ b/addons/account_payment/payment_sequence.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="ir.sequence.type" id="seq_type_payment_order" forcecreate="1">
+        <record forcecreate="1" id="seq_type_payment_order" model="ir.sequence.type">
             <field name="name">Payment order</field>
             <field name="code">payment.order</field>
         </record>
         
-        <record model="ir.sequence" id="seq_payment_order" forcecreate="1">
+        <record forcecreate="1" id="seq_payment_order" model="ir.sequence">
             <field name="name">Payment order</field>
             <field name="code">payment.order</field>
-            <field name="padding" eval="3"/>
+            <field eval="3" name="padding"/>
             <field name="prefix">%(year)s/</field>
         </record>
         
-        <record model="ir.sequence.type" id="seq_type_payment_line" forcecreate="1">
+        <record forcecreate="1" id="seq_type_payment_line" model="ir.sequence.type">
             <field name="name">Payment Line</field>
             <field name="code">payment.line</field>
         </record>
         
-        <record model="ir.sequence" id="seq_payment_line" forcecreate="1">
+        <record forcecreate="1" id="seq_payment_line" model="ir.sequence">
             <field name="name">Payment Line</field>
             <field name="code">payment.line</field>
-            <field name="prefix"></field>
+            <field name="prefix"/>
             <field name="padding">3</field>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index 60c3a976f93..188bd09f6d0 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -1,170 +1,170 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem name='Financial Management/Payment' id='menu_main'/>
-        <menuitem name='Financial Management/Configuration' sequence='1' groups='base.group_admin' id='menu_main_configuration'/>
+        <menuitem id="menu_main" name="Payment" parent="account.menu_finance"/>
+        <menuitem groups="base.group_admin" id="menu_main_configuration" name="Configuration" parent="account.menu_finance" sequence="1"/>
         
-        <record id='view_payment_type_form' model='ir.ui.view'>
-            <field name='name'>payment.type.form</field>
-            <field name='model'>payment.type</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Payment type'>
-                    <field name='name' select='1'/>
-                    <field name='code'/>
+        <record id="view_payment_type_form" model="ir.ui.view">
+            <field name="name">payment.type.form</field>
+            <field name="model">payment.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment type">
+                    <field name="name" select="1"/>
+                    <field name="code"/>
                     <newline/>
-                    <field name='suitable_bank_types' select='1' colspan='4'/>
+                    <field colspan="4" name="suitable_bank_types" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_payment_mode_tree' model='ir.ui.view'>
-            <field name='name'>payment.mode.tree</field>
-            <field name='model'>payment.mode</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Payment mode'>
-                    <field name='name'/>
-                    <field name='journal'/>
+        <record id="view_payment_mode_tree" model="ir.ui.view">
+            <field name="name">payment.mode.tree</field>
+            <field name="model">payment.mode</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Payment mode">
+                    <field name="name"/>
+                    <field name="journal"/>
                 </tree>
             </field>
         </record>
-        <record id='view_payment_mode_form' model='ir.ui.view'>
-            <field name='name'>payment.mode.form</field>
-            <field name='model'>payment.mode</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Payment mode'>
-                    <field name='name' select='1'/>
-                    <field name='type'/>
-                    <field name='journal'/>
-                    <field name='bank_id'/>
+        <record id="view_payment_mode_form" model="ir.ui.view">
+            <field name="name">payment.mode.form</field>
+            <field name="model">payment.mode</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment mode">
+                    <field name="name" select="1"/>
+                    <field name="type"/>
+                    <field name="journal"/>
+                    <field name="bank_id"/>
                 </form>
             </field>
         </record>
-        <record id='action_payment_mode_form' model='ir.actions.act_window'>
-            <field name='name'>Payment mode</field>
-            <field name='res_model'>payment.mode</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_payment_mode_form" model="ir.actions.act_window">
+            <field name="name">Payment mode</field>
+            <field name="res_model">payment.mode</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
         
-        <menuitem name='Financial Management/Configuration/Payment/Payment Mode' action='action_payment_mode_form' id='menu_action_payment_mode_form'/>
+        <menuitem id="next_id_44" name="Payment" parent="account_payment.menu_main_configuration"/><menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
         
-        <record id='view_payment_order_form' model='ir.ui.view'>
-            <field name='name'>payment.order.form</field>
-            <field name='model'>payment.order</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Payment order'>
-                    <field name='reference'/>
-                    <field name='mode'/>
-                    <field name='date_prefered'/>
-                    <field name='date_planned' select='1'/>
-                    <field name='user_id' select='2'/>
-                    <button name='%(wizard_populate_payment)d' type='action' string='Add payment lines' colspan='2'/>
-                    <field name='line_ids' nolabel='1' colspan='4'/>
-                    <field name='date_created' select='2'/>
-                    <field name='date_done' select='2'/>
-                    <field name='state' readonly='1' select='1'/>
-                    <group col='4' colspan='2'>
-                        <button name='cancel' states='draft,open' string='Cancel'/>
-                        <button name='open' states='draft' string='Open'/>
-                        <button name='%(wizard_pay_payment)d' type='action' states='open,done' string='Make Payment'/>
-                        <button name='set_to_draft' type='object' states='cancel' string='Set to draft'/>
+        <record id="view_payment_order_form" model="ir.ui.view">
+            <field name="name">payment.order.form</field>
+            <field name="model">payment.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment order">
+                    <field name="reference"/>
+                    <field name="mode"/>
+                    <field name="date_prefered"/>
+                    <field name="date_planned" select="1"/>
+                    <field name="user_id" select="2"/>
+                    <button colspan="2" name="%(wizard_populate_payment)d" string="Add payment lines" type="action"/>
+                    <field colspan="4" name="line_ids" nolabel="1"/>
+                    <field name="date_created" select="2"/>
+                    <field name="date_done" select="2"/>
+                    <field name="state" readonly="1" select="1"/>
+                    <group col="4" colspan="2">
+                        <button name="cancel" states="draft,open" string="Cancel"/>
+                        <button name="open" states="draft" string="Open"/>
+                        <button name="%(wizard_pay_payment)d" states="open,done" string="Make Payment" type="action"/>
+                        <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
         
-        <record id='view_payment_order_tree' model='ir.ui.view'>
-            <field name='name'>payment.order.tree</field>
-            <field name='model'>payment.order</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='4'/>
-            <field name='arch' type='xml'>
-                <tree string='Payment order'>
-                    <field name='reference'/>
-                    <field name='mode'/>
-                    <field name='line_ids'/>
-                    <field name='date_planned'/>
-                    <field name='date_created' select='2'/>
-                    <field name='date_done' select='2'/>
-                    <field name='total'/>
-                    <field name='state'/>
+        <record id="view_payment_order_tree" model="ir.ui.view">
+            <field name="name">payment.order.tree</field>
+            <field name="model">payment.order</field>
+            <field name="type">tree</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Payment order">
+                    <field name="reference"/>
+                    <field name="mode"/>
+                    <field name="line_ids"/>
+                    <field name="date_planned"/>
+                    <field name="date_created" select="2"/>
+                    <field name="date_done" select="2"/>
+                    <field name="total"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_payment_order_tree' model='ir.actions.act_window'>
-            <field name='name'>Payment order</field>
-            <field name='res_model'>payment.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="action_payment_order_tree" model="ir.actions.act_window">
+            <field name="name">Payment order</field>
+            <field name="res_model">payment.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
         </record>
-        <menuitem name='Financial Management/Payment/Payment Orders' sequence='3' action='action_payment_order_tree' id='menu_action_payment_order_form'/>
+        <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="account_payment.menu_main" sequence="3"/>
         
-        <record id='action_payment_order_draft' model='ir.actions.act_window'>
-            <field name='name'>Draft payment order</field>
-            <field name='res_model'>payment.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft')]</field>
+        <record id="action_payment_order_draft" model="ir.actions.act_window">
+            <field name="name">Draft payment order</field>
+            <field name="res_model">payment.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
         </record>
-        <menuitem name='Financial Management/Payment/Payment Orders/Draft Payment Orders' sequence='1' action='action_payment_order_draft' id='menu_action_payment_order_draft'/>
+        <menuitem action="action_payment_order_draft" id="menu_action_payment_order_draft" parent="account_payment.menu_action_payment_order_form" sequence="1"/>
         
-        <record id='action_payment_order_open' model='ir.actions.act_window'>
-            <field name='name'>Payment orders to validate</field>
-            <field name='res_model'>payment.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','open')]</field>
+        <record id="action_payment_order_open" model="ir.actions.act_window">
+            <field name="name">Payment orders to validate</field>
+            <field name="res_model">payment.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','open')]</field>
         </record>
-        <menuitem name='Financial Management/Payment/Payment Orders/Payment Orders to Validate' sequence='2' action='action_payment_order_open' id='menu_action_payment_order_open'/>
+        <menuitem action="action_payment_order_open" id="menu_action_payment_order_open" parent="account_payment.menu_action_payment_order_form" sequence="2"/>
         
-        <record id='view_payment_line_form' model='ir.ui.view'>
-            <field name='name'>Payment Line</field>
-            <field name='model'>payment.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Payment Line'>
+        <record id="view_payment_line_form" model="ir.ui.view">
+            <field name="name">Payment Line</field>
+            <field name="model">payment.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment Line">
                     <notebook>
-                        <page string='Payment'>
-                            <field name='move_line_id' domain='[(&apos;reconcile_id&apos;,&apos;=&apos;, False), (&apos;credit&apos;, &apos;>&apos;,0)] ' on_change='onchange_move_line(move_line_id,parent.mode)' select='1'/>
+                        <page string="Payment">
+                            <field domain="[('reconcile_id','=', False), ('credit', '&gt;',0)] " name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)" select="1"/>
                             <!--domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>-->
-                            <separator string='Transaction Information' colspan='4'/>
-                            <field name='date'/>
-                            <group colspan='2'>
-                                <field name='amount_currency' select='1'/>
-                                <field name='currency' nolabel='1'/>
+                            <separator colspan="4" string="Transaction Information"/>
+                            <field name="date"/>
+                            <group colspan="2">
+                                <field name="amount_currency" select="1"/>
+                                <field name="currency" nolabel="1"/>
                             </group>
-                            <field name='partner_id'/>
-                            <field name='bank_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]'/>
-                            <separator string='Owner Account' colspan='2'/>
-                            <separator string='Desitination Account' colspan='2'/>
-                            <field name='info_owner' nolabel='1' colspan='2'/>
-                            <field name='info_partner' nolabel='1' colspan='2'/>
+                            <field name="partner_id"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
+                            <separator colspan="2" string="Owner Account"/>
+                            <separator colspan="2" string="Desitination Account"/>
+                            <field colspan="2" name="info_owner" nolabel="1"/>
+                            <field colspan="2" name="info_partner" nolabel="1"/>
                             
-                            <field name='communication' colspan='4'/>
-                            <field name='communication2' colspan='4'/>
-                            <field name='name'/>
-                             <field name='state'/>
+                            <field colspan="4" name="communication"/>
+                            <field colspan="4" name="communication2"/>
+                            <field name="name"/>
+                             <field name="state"/>
                         </page>
-                        <page string='Information'>
+                        <page string="Information">
                             
-                            <separator string='General Information' colspan='2'/>
-                            <separator string='Entry Information' colspan='2'/>
-                            <group col='2' colspan='2'>
-                                <field name='amount' select='1'/>
+                            <separator colspan="2" string="General Information"/>
+                            <separator colspan="2" string="Entry Information"/>
+                            <group col="2" colspan="2">
+                                <field name="amount" select="1"/>
                                 <!--<field name="currency"/>-->
                                 <newline/>
-                                <field name='partner_payable'/>
+                                <field name="partner_payable"/>
                             </group>
-                            <group col='2' colspan='2'>
-                                <field name='date_created'/>
-                                <field name='due_date'/>
-                                <field name='to_pay_currency'/>
-                                <field name='to_pay'/>
+                            <group col="2" colspan="2">
+                                <field name="date_created"/>
+                                <field name="due_date"/>
+                                <field name="to_pay_currency"/>
+                                <field name="to_pay"/>
                             </group>
                         </page>
                     </notebook>
@@ -172,48 +172,48 @@
                 </form>
             </field>
         </record>
-        <record id='view_payment_line_tree' model='ir.ui.view'>
-            <field name='name'>Payment Lines</field>
-            <field name='model'>payment.line</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='4'/>
-            <field name='arch' type='xml'>
-                <tree editable='bottom' colors='red:to_pay_currency&lt;amount_currency' string='Payment Line'>
-                    <field name='partner_id'/>
+        <record id="view_payment_line_tree" model="ir.ui.view">
+            <field name="name">Payment Lines</field>
+            <field name="model">payment.line</field>
+            <field name="type">tree</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:to_pay_currency&lt;amount_currency" editable="bottom" string="Payment Line">
+                    <field name="partner_id"/>
                     
-                    <field name='move_line_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id),(&apos;reconcile_id&apos;, &apos;=&apos;, False), (&apos;credit&apos;, &apos;>&apos;, 0)]' on_change='onchange_move_line(move_line_id,parent.mode)'/>
+                    <field domain="[('partner_id','=',partner_id),('reconcile_id', '=', False), ('credit', '&gt;', 0)]" name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
                     <!--domain="[('partner_id','=',partner_id),('reconcile_id', '=', False), ('credit', '>', 0),('amount_to_pay','>',0)]"/>-->
-                    <field name='bank_id' domain='[(&apos;partner_id&apos;, &apos;=&apos;, partner_id)]'/>
+                    <field domain="[('partner_id', '=', partner_id)]" name="bank_id"/>
                     
-                    <field name='amount_currency' sum='Total Amount'/>
-                    <field name='communication'/>
-                    <field name='state'/>
-                    <field name='date'/>
-                    <field name='to_pay_currency' invisible='1'/>
+                    <field name="amount_currency" sum="Total Amount"/>
+                    <field name="communication"/>
+                    <field name="state"/>
+                    <field name="date"/>
+                    <field invisible="1" name="to_pay_currency"/>
                     
                 </tree>
             </field>
         </record>
-        <record id='action_payment_line_form' model='ir.actions.act_window'>
-            <field name='name'>Payment Line</field>
-            <field name='res_model'>payment.line</field>
-            <field name='view_type'>tree</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="action_payment_line_form" model="ir.actions.act_window">
+            <field name="name">Payment Line</field>
+            <field name="res_model">payment.line</field>
+            <field name="view_type">tree</field>
+            <field name="view_mode">form,tree</field>
         </record>
         
-        <record id='view_bank_statement_form' model='ir.ui.view'>
-            <field name='name'>account.bank.statement.form.inherit</field>
-            <field name='model'>account.bank.statement</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='account.view_bank_statement_form'/>
-            <field name='arch' type='xml'>
-                <field name='period_id' position='after'>
-                    <button name='%(wizard_populate_statement)d' type='action' string='Import payment lines' colspan='2'/>
+        <record id="view_bank_statement_form" model="ir.ui.view">
+            <field name="name">account.bank.statement.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <field name="period_id" position="after">
+                    <button colspan="2" name="%(wizard_populate_statement)d" string="Import payment lines" type="action"/>
                 </field>
             </field>
         </record>
         
-        <act_window name='Payment Lines' domain='[(&apos;move_line_id.move_id.id&apos;, &apos;=&apos;, move_id)]' id='act_account_invoice_2_payment_line' src_model='account.invoice' res_model='payment.line'/>
+        <act_window domain="[('move_line_id.move_id.id', '=', move_id)]" id="act_account_invoice_2_payment_line" name="Payment Lines" res_model="payment.line" src_model="account.invoice"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_payment/payment_wizard.xml b/addons/account_payment/payment_wizard.xml
index ae01418b56b..dc1c0b2d2df 100644
--- a/addons/account_payment/payment_wizard.xml
+++ b/addons/account_payment/payment_wizard.xml
@@ -1,26 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard
-		string="Populate payment"
-		model="payment.order"
-		name="populate_payment"
-		menu="False"
-		id="wizard_populate_payment"/>
+        <wizard id="wizard_populate_payment" menu="False" model="payment.order" name="populate_payment" string="Populate payment"/>
         
-        <wizard
-		string="Pay"
-		model="payment.order"
-		name="pay_payment"
-		menu="False"
-		id="wizard_pay_payment"/>
+        <wizard id="wizard_pay_payment" menu="False" model="payment.order" name="pay_payment" string="Pay"/>
         
-        <wizard
-		string="Populate Statement with Payment lines"
-		model="account.bank.statement"
-		name="populate_statement"
-		menu="False"
-		id="wizard_populate_statement"/>
+        <wizard id="wizard_populate_statement" menu="False" model="account.bank.statement" name="populate_statement" string="Populate Statement with Payment lines"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_payment/payment_workflow.xml b/addons/account_payment/payment_workflow.xml
index 284fc4019bd..e7d441c3109 100644
--- a/addons/account_payment/payment_workflow.xml
+++ b/addons/account_payment/payment_workflow.xml
@@ -1,31 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="workflow" id="wkf_payment_order">
+        <record id="wkf_payment_order" model="workflow">
             <field name="name">Payment Order Workflow</field>
             <field name="osv">payment.order</field>
             <field name="on_create">True</field>
         </record>
         <!--Activity -->
-        <record model="workflow.activity" id="act_draft">
+        <record id="act_draft" model="workflow.activity">
             <field name="name">draft</field>
             <field name="wkf_id" ref="wkf_payment_order"/>
             <field name="flow_start">True</field>
             <field name="action">write({'state':'draft'})</field>
             <field name="kind">function</field>
         </record>
-        <record model="workflow.activity" id="act_open">
+        <record id="act_open" model="workflow.activity">
             <field name="name">open</field>
             <field name="wkf_id" ref="wkf_payment_order"/>
-            <field name="action">action_open()&#10;write({'state':'open'})</field>
+            <field name="action">action_open()
+write({'state':'open'})</field>
             <field name="kind">function</field>
         </record>
-        <record model="workflow.activity" id="act_done">
+        <record id="act_done" model="workflow.activity">
             <field name="name">done</field>
             <field name="wkf_id" ref="wkf_payment_order"/>
             <field name="flow_stop">True</field>
         </record>
-        <record model="workflow.activity" id="act_cancel">
+        <record id="act_cancel" model="workflow.activity">
             <field name="name">cancel</field>
             <field name="wkf_id" ref="wkf_payment_order"/>
             <field name="action">write({'state':'cancel'})</field>
@@ -34,27 +35,27 @@
         </record>
         
         <!-- Transition -->
-        <record model="workflow.transition" id="trans_draft_open">
+        <record id="trans_draft_open" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_open"/>
             <field name="signal">open</field>
         </record>
         
-        <record model="workflow.transition" id="trans_open_done">
+        <record id="trans_open_done" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_done"/>
             <field name="signal">done</field>
         </record>
-        <record model="workflow.transition" id="trans_draft_cancel">
+        <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_open_cancel">
+        <record id="trans_open_cancel" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_report/account_report.xml b/addons/account_report/account_report.xml
index d2373a3fae1..d7ba6cb2489 100755
--- a/addons/account_report/account_report.xml
+++ b/addons/account_report/account_report.xml
@@ -1,11 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report id="fiscal_statements"
-			string="Fiscal Statements"
-			model="account.report.report"
-			name="accounting.report"
-			rml="account_report/report/accounting_report.rml"
-			auto="False"/>
+        <report auto="False" id="fiscal_statements" model="account.report.report" name="accounting.report" rml="account_report/report/accounting_report.rml" string="Fiscal Statements"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index a792812438e..ba819588c65 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -1,144 +1,144 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='view_account_report_form' model='ir.ui.view'>
-            <field name='name'>account.report.report.form</field>
-            <field name='model'>account.report.report</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Accounting reporting'>
+        <record id="view_account_report_form" model="ir.ui.view">
+            <field name="name">account.report.report.form</field>
+            <field name="model">account.report.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Accounting reporting">
                     <notebook>
-                        <page string='General'>
-                            <field name='name' select='1' colspan='3'/>
-                            <field name='code' select='1'/>
-                            <field name='active' select='1'/>
-                            <field name='parent_id' on_change='onchange_parent_id(parent_id)'/>
-                            <field name='sequence'/>
-                            <field name='type' select='1'/>
-                            <field name='style'/>
-                            <field name='color_font'/>
-                            <field name='color_back'/>
+                        <page string="General">
+                            <field colspan="3" name="name" select="1"/>
+                            <field name="code" select="1"/>
+                            <field name="active" select="1"/>
+                            <field name="parent_id" on_change="onchange_parent_id(parent_id)"/>
+                            <field name="sequence"/>
+                            <field name="type" select="1"/>
+                            <field name="style"/>
+                            <field name="color_font"/>
+                            <field name="color_back"/>
                             <newline/>
-                            <field name='expression' colspan='4'/>
-                            <field name='expression_status' colspan='4'/>
-                            <separator string='Legend of operators' colspan='4'/>
-                            <label align='1.0' string='Account debit:'/>
-                            <label align='0.0' string='debit(&apos;ACCOUNT_CODE&apos;)'/>
-                            <label align='1.0' string='Account credit:'/>
-                            <label align='0.0' string='credit(&apos;ACCOUNT_CODE&apos;)'/>
-                            <label align='1.0' string='Account balance:'/>
-                            <label align='0.0' string='balance(&apos;ACCOUNT_CODE&apos;)'/>
-                            <label align='1.0' string='Report amount:'/>
-                            <label align='0.0' string='report(&apos;REPORT_CODE&apos;)'/>
-                            <label align='1.0' string='Operators:'/>
-                            <label align='0.0' string='+ - * / ( )'/>
-                            <label string='Exemple: (balance(&apos;6&apos;,&apos;45&apos;) - credit(&apos;7&apos;)) / report(&apos;RPT1&apos;)' colspan='4'/>
-                            <separator string='Return value for status' colspan='4'/>
-                            <group col='2' colspan='1'>
-                                <label align='1.0' string='&lt; -1:'/>
-                                <label align='0.0' string='Very bad'/>
-                                <label align='1.0' string='-1:'/>
-                                <label align='0.0' string='Bad'/>
-                                <label align='1.0' string='0:'/>
-                                <label align='0.0' string='Normal'/>
-                                <label align='1.0' string='1:'/>
-                                <label align='0.0' string='Good'/>
-                                <label align='1.0' string='&gt; 1:'/>
-                                <label align='0.0' string='Very Good'/>
+                            <field colspan="4" name="expression"/>
+                            <field colspan="4" name="expression_status"/>
+                            <separator colspan="4" string="Legend of operators"/>
+                            <label align="1.0" string="Account debit:"/>
+                            <label align="0.0" string="debit('ACCOUNT_CODE')"/>
+                            <label align="1.0" string="Account credit:"/>
+                            <label align="0.0" string="credit('ACCOUNT_CODE')"/>
+                            <label align="1.0" string="Account balance:"/>
+                            <label align="0.0" string="balance('ACCOUNT_CODE')"/>
+                            <label align="1.0" string="Report amount:"/>
+                            <label align="0.0" string="report('REPORT_CODE')"/>
+                            <label align="1.0" string="Operators:"/>
+                            <label align="0.0" string="+ - * / ( )"/>
+                            <label colspan="4" string="Exemple: (balance('6','45') - credit('7')) / report('RPT1')"/>
+                            <separator colspan="4" string="Return value for status"/>
+                            <group col="2" colspan="1">
+                                <label align="1.0" string="&lt; -1:"/>
+                                <label align="0.0" string="Very bad"/>
+                                <label align="1.0" string="-1:"/>
+                                <label align="0.0" string="Bad"/>
+                                <label align="1.0" string="0:"/>
+                                <label align="0.0" string="Normal"/>
+                                <label align="1.0" string="1:"/>
+                                <label align="0.0" string="Good"/>
+                                <label align="1.0" string="&gt; 1:"/>
+                                <label align="0.0" string="Very Good"/>
                             </group>
                         </page>
-                        <page string='Notes'>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
         
-        <record id='view_account_report_tree_simple' model='ir.ui.view'>
-            <field name='name'>account.report.report.tree.simple</field>
-            <field name='model'>account.report.report</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Accounting reporting'>
-                    <field name='code'/>
-                    <field name='name'/>
+        <record id="view_account_report_tree_simple" model="ir.ui.view">
+            <field name="name">account.report.report.tree.simple</field>
+            <field name="model">account.report.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Accounting reporting">
+                    <field name="code"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_account_report_tree' model='ir.actions.act_window'>
-            <field name='name'>Custom reporting</field>
-            <field name='res_model'>account.report.report</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'/>
-            <field name='view_id' ref='view_account_report_tree_simple'/>
+        <record id="action_account_report_tree" model="ir.actions.act_window">
+            <field name="name">Custom reporting</field>
+            <field name="res_model">account.report.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain"/>
+            <field name="view_id" ref="view_account_report_tree_simple"/>
         </record>
         
-        <menuitem name='Financial Management/Configuration/Custom Reporting' action='action_account_report_tree' id='menu_action_account_report_tree_define'/>
-        <record id='action_account_report_form' model='ir.actions.act_window'>
-            <field name='name'>New Reporting Item Formula</field>
-            <field name='res_model'>account.report.report</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
+        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account_payment.menu_main_configuration"/>
+        <record id="action_account_report_form" model="ir.actions.act_window">
+            <field name="name">New Reporting Item Formula</field>
+            <field name="res_model">account.report.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
         </record>
-        <menuitem name='Financial Management/Configuration/Custom Reporting/New Reporting Item Formula' action='action_account_report_form' id='menu_action_account_report_form'/>
+        <menuitem action="action_account_report_form" id="menu_action_account_report_form" parent="account_report.menu_action_account_report_tree_define"/>
         
-        <record id='view_account_report_tree' model='ir.ui.view'>
-            <field name='name'>account.report.report.tree</field>
-            <field name='model'>account.report.report</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='8'/>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree string='Accounting reporting'>
-                    <field name='code'/>
-                    <field name='name'/>
-                    <field name='status'/>
-                    <field name='amount'/>
+        <record id="view_account_report_tree" model="ir.ui.view">
+            <field name="name">account.report.report.tree</field>
+            <field name="model">account.report.report</field>
+            <field name="type">tree</field>
+            <field eval="8" name="priority"/>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Accounting reporting">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="status"/>
+                    <field name="amount"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_account_report_tree_view' model='ir.actions.act_window'>
-            <field name='name'>Custom reporting</field>
-            <field name='res_model'>account.fiscalyear</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_account_report_tree'/>
-            <field name='domain'>[('parent_id','=',False)]</field>
+        <record id="action_account_report_tree_view" model="ir.actions.act_window">
+            <field name="name">Custom reporting</field>
+            <field name="res_model">account.fiscalyear</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_report_tree"/>
+            <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Custom Reporting' action='action_account_report_tree_view' id='menu_action_account_report_tree_view'/>
+        <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_reporting"/>
         
         
-        <record id='action_account_report_tree_view_fiscal' model='ir.actions.act_window'>
-            <field name='name'>Fiscal Statements reporting</field>
-            <field name='res_model'>account.fiscalyear</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_account_report_tree'/>
-            <field name='domain'>[('type','=','fiscal'),('parent_id','=',False)]</field>
+        <record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window">
+            <field name="name">Fiscal Statements reporting</field>
+            <field name="res_model">account.fiscalyear</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_report_tree"/>
+            <field name="domain">[('type','=','fiscal'),('parent_id','=',False)]</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Custom Reporting/Fiscal Statements' action='action_account_report_tree_view_fiscal' id='menu_action_account_report_tree_view_fiscal'/>
+        <menuitem action="action_account_report_tree_view_fiscal" id="menu_action_account_report_tree_view_fiscal" parent="account_report.menu_action_account_report_tree_view"/>
         
-        <record id='action_account_report_tree_view_indicator' model='ir.actions.act_window'>
-            <field name='name'>Indicators reporting</field>
-            <field name='res_model'>account.fiscalyear</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_account_report_tree'/>
-            <field name='domain'>[('type','=','indicator'),('parent_id','=',False)]</field>
+        <record id="action_account_report_tree_view_indicator" model="ir.actions.act_window">
+            <field name="name">Indicators reporting</field>
+            <field name="res_model">account.fiscalyear</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_report_tree"/>
+            <field name="domain">[('type','=','indicator'),('parent_id','=',False)]</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Custom Reporting/Indicators' action='action_account_report_tree_view_indicator' id='menu_action_account_report_tree_view_indicator'/>
+        <menuitem action="action_account_report_tree_view_indicator" id="menu_action_account_report_tree_view_indicator" parent="account_report.menu_action_account_report_tree_view"/>
         
-        <record id='action_account_report_tree_view_other' model='ir.actions.act_window'>
-            <field name='name'>Others reportings</field>
-            <field name='res_model'>account.fiscalyear</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_account_report_tree'/>
-            <field name='domain'>[('type','=','other'),('parent_id','=',False)]</field>
+        <record id="action_account_report_tree_view_other" model="ir.actions.act_window">
+            <field name="name">Others reportings</field>
+            <field name="res_model">account.fiscalyear</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_account_report_tree"/>
+            <field name="domain">[('type','=','other'),('parent_id','=',False)]</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Custom Reporting/Others' action='action_account_report_tree_view_other' id='menu_action_account_report_tree_view_other'/>
+        <menuitem action="action_account_report_tree_view_other" id="menu_action_account_report_tree_view_other" parent="account_report.menu_action_account_report_tree_view"/>
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/account_tax_include/invoice_tax_incl.xml b/addons/account_tax_include/invoice_tax_incl.xml
index add707bc329..9dc8efadcfb 100644
--- a/addons/account_tax_include/invoice_tax_incl.xml
+++ b/addons/account_tax_include/invoice_tax_incl.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="ir.ui.view" id="account_tax_view_price">
+        <record id="account_tax_view_price" model="ir.ui.view">
             <field name="name">account.tax.exlcuded.view.form</field>
             <field name="type">form</field>
             <field name="model">account.tax</field>
-            <field name="inherit_id" ref="account.view_tax_form" />
+            <field name="inherit_id" ref="account.view_tax_form"/>
             <field name="arch" type="xml">
                 <field name="python_compute" position="after">
-                    <field name="python_compute_inv" colspan="4" nolabel="1"/>
-                    <separator string="Compute Code for Taxes included prices" colspan="4"/>
+                    <field colspan="4" name="python_compute_inv" nolabel="1"/>
+                    <separator colspan="4" string="Compute Code for Taxes included prices"/>
                 </field>
             </field>
         </record>
         
-        <record model="ir.ui.view" id="account_invoice_view_price">
+        <record id="account_invoice_view_price" model="ir.ui.view">
             <field name="name">account.invoice.vat.exlcuded.view.form</field>
             <field name="type">form</field>
             <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form" />
+            <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <field name="invoice_line" position="before">
                     <field name="price_type"/>
@@ -27,11 +27,11 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="invoice_supplier_form_tax_include">
+        <record id="invoice_supplier_form_tax_include" model="ir.ui.view">
             <field name="name">account.invoice.supplier.tax_include</field>
             <field name="type">form</field>
             <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form" />
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <field name="invoice_line" position="before">
                     <field name="price_type"/>
@@ -39,11 +39,11 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="invoice_supplier_form_tax_include2">
+        <record id="invoice_supplier_form_tax_include2" model="ir.ui.view">
             <field name="name">account.invoice.supplier.tax_include2</field>
             <field name="type">form</field>
             <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form" />
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <field name="price_subtotal" position="after">
                     <field name="price_subtotal_incl"/>
@@ -51,11 +51,11 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="invoice_supplier_form_tax_include3">
+        <record id="invoice_supplier_form_tax_include3" model="ir.ui.view">
             <field name="name">account.invoice.supplier.tax_include3</field>
             <field name="type">form</field>
             <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form" />
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <field name="product_id" position="replace">
                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, price_unit, parent.address_invoice_id, parent.price_type)"/>
@@ -63,11 +63,11 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="view_invoice_line_tree">
+        <record id="view_invoice_line_tree" model="ir.ui.view">
             <field name="name">account.invoice.line.tree</field>
             <field name="model">account.invoice.line</field>
             <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_invoice_line_tree" />
+            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
             <field name="arch" type="xml">
                 <field name="price_subtotal" position="after">
                     <field name="price_subtotal_incl"/>
@@ -76,5 +76,4 @@
         </record>
         
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index 2f3d7cfb5b3..7a2cb0db312 100644
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="ir.ui.view" id="view_partner_bank_iban_form">
+        <record id="view_partner_bank_iban_form" model="ir.ui.view">
             <field name="name">res.partner.bank.form.iban.inherit</field>
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
@@ -16,7 +16,7 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="view_partner_iban_form">
+        <record id="view_partner_iban_form" model="ir.ui.view">
             <field name="name">res.partner.form.iban.inherit</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
@@ -33,39 +33,39 @@
         <!--
 		Default bank account description
 		-->
-        <record model="res.partner.bank.type" id="bank_iban">
+        <record id="bank_iban" model="res.partner.bank.type">
             <field name="name">IBAN Account</field>
             <field name="code">iban</field>
         </record>
-        <record model="res.partner.bank.type.field" id="bank_iban_field">
+        <record id="bank_iban_field" model="res.partner.bank.type.field">
             <field name="name">iban</field>
             <field name="bank_type_id" ref="bank_iban"/>
-            <field name="required" eval="True"/>
-            <field name="readonly" eval="False"/>
+            <field eval="True" name="required"/>
+            <field eval="False" name="readonly"/>
         </record>
-        <record model="res.partner.bank.type.field" id="bank_swift_field">
+        <record id="bank_swift_field" model="res.partner.bank.type.field">
             <field name="name">bic</field>
             <field name="bank_type_id" ref="bank_iban"/>
-            <field name="required" eval="True"/>
-            <field name="readonly" eval="False"/>
+            <field eval="True" name="required"/>
+            <field eval="False" name="readonly"/>
         </record>
-        <record model="res.partner.bank.type.field" id="bank_country_field">
+        <record id="bank_country_field" model="res.partner.bank.type.field">
             <field name="name">country_id</field>
             <field name="bank_type_id" ref="bank_iban"/>
-            <field name="required" eval="False"/>
-            <field name="readonly" eval="False"/>
+            <field eval="False" name="required"/>
+            <field eval="False" name="readonly"/>
         </record>
-        <record model="res.partner.bank.type.field" id="bank_zip_field">
+        <record id="bank_zip_field" model="res.partner.bank.type.field">
             <field name="name">zip</field>
             <field name="bank_type_id" ref="bank_iban"/>
-            <field name="required" eval="False"/>
-            <field name="readonly" eval="False"/>
+            <field eval="False" name="required"/>
+            <field eval="False" name="readonly"/>
         </record>
-        <record model="res.partner.bank.type.field" id="bank_acc_number_field">
+        <record id="bank_acc_number_field" model="res.partner.bank.type.field">
             <field name="name">acc_number</field>
             <field name="bank_type_id" ref="bank_iban"/>
-            <field name="required" eval="False"/>
-            <field name="readonly" eval="True"/>
+            <field eval="False" name="required"/>
+            <field eval="True" name="readonly"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/base_module_publish/base_module_publish_wizard.xml b/addons/base_module_publish/base_module_publish_wizard.xml
index 91f15fe7654..1b293d395a0 100644
--- a/addons/base_module_publish/base_module_publish_wizard.xml
+++ b/addons/base_module_publish/base_module_publish_wizard.xml
@@ -1,25 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard
-			id="wizard_base_module_publish"
-			string="Publish module"
-			model="ir.module.module"
-			name="base_module_publish.module_publish"/>
+        <wizard id="wizard_base_module_publish" model="ir.module.module" name="base_module_publish.module_publish" string="Publish module"/>
         
-        <wizard
-			id="wizard_base_module_publish_all"
-			string="Publish all modules"
-			model="ir.module.module"
-			name="base_module_publish.module_publish_all"
-			client_action_multi="True"
-			/>
+        <wizard client_action_multi="True" id="wizard_base_module_publish_all" model="ir.module.module" name="base_module_publish.module_publish_all" string="Publish all modules"/>
         
-        <wizard
-			string="Export module"
-			model="ir.module.module"
-			name="base_module_publish.module_export"
-			id="wizard_base_module_export"/>
+        <wizard id="wizard_base_module_export" model="ir.module.module" name="base_module_publish.module_export" string="Export module"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 9c5c0a9e198..b8f940f8ad9 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="ir.actions.wizard" id="action_wizard_setup">
+        <record id="action_wizard_setup" model="ir.actions.wizard">
             <field name="name">Setup</field>
             <field name="type">ir.actions.wizard</field>
             <field name="wiz_name">base_setup.base_setup</field>
         </record>
         
-        <record model="res.users" id="base.user_admin">
+        <record id="base.user_admin" model="res.users">
             <field name="action_id" ref="action_wizard_setup"/>
             <field name="menu_id" ref="action_wizard_setup"/>
         </record>
@@ -16,4 +16,4 @@
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/base_setup/base_setup_demo.xml b/addons/base_setup/base_setup_demo.xml
index 856c0ab9c99..5e821d7d471 100644
--- a/addons/base_setup/base_setup_demo.xml
+++ b/addons/base_setup/base_setup_demo.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="res.users" id="base.user_demo">
+        <record id="base.user_demo" model="res.users">
             <field name="action_id" ref="action_wizard_setup"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/base_setup/base_setup_wizard.xml b/addons/base_setup/base_setup_wizard.xml
index 2acf7b4c9cf..1fb380757f3 100644
--- a/addons/base_setup/base_setup_wizard.xml
+++ b/addons/base_setup/base_setup_wizard.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard id="wizard_base_setup" string="Setup" model="base_setup.base_setup" name="base_setup.base_setup"/>
+        <wizard id="wizard_base_setup" model="base_setup.base_setup" name="base_setup.base_setup" string="Setup"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_data.xml
index 5fb1be9e9d8..df6980ba3c0 100644
--- a/addons/base_vat/base_vat_data.xml
+++ b/addons/base_vat/base_vat_data.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="ir.ui.view" id="view_partner_form">
+        <record id="view_partner_form" model="ir.ui.view">
             <field name="name">res.partner.vat.inherit</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
@@ -14,4 +14,4 @@
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 62888a6c812..39808dacd9f 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,92 +1,92 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem name='Dashboards' icon='terp-graph' id='dashboard_menu'/>
+        <menuitem icon="terp-graph" id="dashboard_menu" name="Dashboards"/>
         
-        <record id='view_board_note_tree' model='ir.ui.view'>
-            <field name='name'>board.note.tree</field>
-            <field name='model'>board.note</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Notes'>
-                    <field name='name'/>
+        <record id="view_board_note_tree" model="ir.ui.view">
+            <field name="name">board.note.tree</field>
+            <field name="model">board.note</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Notes">
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='view_board_note_form' model='ir.ui.view'>
-            <field name='name'>board.note.form</field>
-            <field name='model'>board.note</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Note'>
-                    <field name='name' select='1'/>
-                    <field name='type' select='1'/>
-                    <field name='user_id' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='note' colspan='4'/>
+        <record id="view_board_note_form" model="ir.ui.view">
+            <field name="name">board.note.form</field>
+            <field name="model">board.note</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Note">
+                    <field name="name" select="1"/>
+                    <field name="type" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field colspan="4" name="note"/>
                 </form>
             </field>
         </record>
-        <record id='action_view_board_note_form' model='ir.actions.act_window'>
-            <field name='name'>Publish a note</field>
-            <field name='res_model'>board.note</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="action_view_board_note_form" model="ir.actions.act_window">
+            <field name="name">Publish a note</field>
+            <field name="res_model">board.note</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
         </record>
         
-        <menuitem name='Dashboards/Notes' sequence='100' action='action_view_board_note_form' id='menu_view_board_note_form'/>
+        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="board.dashboard_menu" sequence="100"/>
         
-        <wizard name='board.board.menu.create' multi='True' id='wizard_board_create_menu' model='board.board' string='Create Board Menu'/>
+        <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu"/>
         
         
-        <record id='view_board_tree' model='ir.ui.view'>
-            <field name='name'>board.board.tree</field>
-            <field name='model'>board.board</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Dashboard'>
-                    <field name='name'/>
+        <record id="view_board_tree" model="ir.ui.view">
+            <field name="name">board.board.tree</field>
+            <field name="model">board.board</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Dashboard">
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='view_board_form' model='ir.ui.view'>
-            <field name='name'>board.board.form</field>
-            <field name='model'>board.board</field>
-            <field name='type'>form</field>
-            <field name='priority' eval='1'/>
-            <field name='arch' type='xml'>
-                <form string='Dashboard'>
-                    <field name='name' select='1'/>
-                    <button name='%(wizard_board_create_menu)d' type='action' string='Create Menu' colspan='2'/>
-                    <field name='line_ids' colspan='4'>
-                        <tree string='Dashboard View'>
-                            <field name='name'/>
-                            <field name='sequence'/>
-                            <field name='action_id'/>
-                            <field name='position'/>
+        <record id="view_board_form" model="ir.ui.view">
+            <field name="name">board.board.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field eval="1" name="priority"/>
+            <field name="arch" type="xml">
+                <form string="Dashboard">
+                    <field name="name" select="1"/>
+                    <button colspan="2" name="%(wizard_board_create_menu)d" string="Create Menu" type="action"/>
+                    <field colspan="4" name="line_ids">
+                        <tree string="Dashboard View">
+                            <field name="name"/>
+                            <field name="sequence"/>
+                            <field name="action_id"/>
+                            <field name="position"/>
                         </tree>
-                        <form string='Dashboard View'>
-                            <field name='name'/>
-                            <field name='sequence'/>
-                            <field name='width'/>
-                            <field name='height'/>
-                            <field name='action_id'/>
-                            <field name='position'/>
+                        <form string="Dashboard View">
+                            <field name="name"/>
+                            <field name="sequence"/>
+                            <field name="width"/>
+                            <field name="height"/>
+                            <field name="action_id"/>
+                            <field name="position"/>
                         </form>
                     </field>
                 </form>
             </field>
         </record>
-        <record id='action_view_board_list_form' model='ir.actions.act_window'>
-            <field name='name'>Dashboard Definition</field>
-            <field name='res_model'>board.board</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_view_board_list_form" model="ir.actions.act_window">
+            <field name="name">Dashboard Definition</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Dashboards/Configuration/Dashboard Definition' action='action_view_board_list_form' id='menu_view_board_form'/>
+        <menuitem id="next_id_50" name="Configuration" parent="board.dashboard_menu"/><menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="next_id_50"/>
         
         
-        <act_window name='Open Dashboard' multi='True' id='dashboard_open' src_model='board.board' context='{&apos;view&apos;: active_id}' res_model='board.board'/>
+        <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/board_account/board_account_demo.xml b/addons/board_account/board_account_demo.xml
index 247a6dfd046..7206fefc1d5 100644
--- a/addons/board_account/board_account_demo.xml
+++ b/addons/board_account/board_account_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -6,17 +6,16 @@
 			Administrator shortcut
 			Demo user startup menu
 		-->
-        <record model="ir.ui.view_sc" id="sc_account_dash">
+        <record id="sc_account_dash" model="ir.ui.view_sc">
             <field name="name">Accounting dashboard</field>
             <field name="user_id" ref="base.user_admin"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">0</field>
             <field name="res_id" ref="menu_board_account"/>
         </record>
-        <record model="res.users" id="base.user_admin">
+        <record id="base.user_admin" model="res.users">
             <field name="action_id" ref="open_board_account"/>
         </record>
         
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index aad51dcb2ae..bbf927364b9 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -1,61 +1,61 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='note_account_type' model='board.note.type'>
-            <field name='name'>Accountants</field>
+        <record id="note_account_type" model="board.note.type">
+            <field name="name">Accountants</field>
         </record>
         
-        <record id='action_account_analytic_line_to_invoice' model='ir.actions.act_window'>
-            <field name='name'>Costs to invoice</field>
-            <field name='res_model'>report.account.analytic.line.to.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
+            <field name="name">Costs to invoice</field>
+            <field name="res_model">report.account.analytic.line.to.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
         </record>
         
-        <record id='action_aged_receivable' model='ir.actions.act_window'>
-            <field name='name'>Receivable Accounts</field>
-            <field name='res_model'>report.account.receivable</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
-            <field name='domain'>[('type','=','receivable')]</field>
+        <record id="action_aged_receivable" model="ir.actions.act_window">
+            <field name="name">Receivable Accounts</field>
+            <field name="res_model">report.account.receivable</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('type','=','receivable')]</field>
         </record>
-        <record id='action_aged_income' model='ir.actions.act_window'>
-            <field name='name'>Income Accounts</field>
-            <field name='res_model'>report.account.receivable</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
-            <field name='domain'>[('type','=','income')]</field>
+        <record id="action_aged_income" model="ir.actions.act_window">
+            <field name="name">Income Accounts</field>
+            <field name="res_model">report.account.receivable</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('type','=','income')]</field>
         </record>
         
         
-        <act_window name='Accounts to invoice' view_type='form' domain='[(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;close&apos;),(&apos;partner_id&apos;,&apos;&lt;&gt;&apos;,False),(&apos;to_invoice&apos;, &apos;&lt;&gt;&apos;, False)]' id='act_my_account' src_model='res.users' view_mode='tree,form' res_model='account.analytic.account'/>
+        <act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
         
-        <record id='board_account_form' model='ir.ui.view'>
-            <field name='name'>board.account.form</field>
-            <field name='model'>board.board</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Account Board'>
+        <record id="board_account_form" model="ir.ui.view">
+            <field name="name">board.account.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Board">
                     <hpaned>
                         
                         <child1>
                             
-                            <action name='%(report_analytic.action_analytic_account_tree)d' height='160' string='Analytic accounts to close' colspan='4' width='510'/>
+                            <action colspan="4" height="160" name="%(report_analytic.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
                             
-                            <action name='%(act_my_account)d' height='160' string='Accounts to invoice' colspan='4' width='510'/>
+                            <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
                             
-                            <action name='%(account.action_invoice_tree5)d' height='160' string='Draft invoices' colspan='4'/>
+                            <action colspan="4" height="160" name="%(account.action_invoice_tree5)d" string="Draft invoices"/>
                         </child1>
                         
                         <child2>
-                            <button name='%(account_report.action_account_report_tree_view_indicator)d' icon='terp-purchase' type='action' string='My indicators' colspan='4'/>
+                            <button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
                             
-                            <action name='%(action_account_analytic_line_to_invoice)d' height='220' string='Costs to invoice' colspan='4'/>
+                            <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
                             
-                            <action name='%(action_aged_receivable)d' height='220' string='Aged receivables' colspan='4'/>
+                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
                             
-                            <action name='%(action_aged_income)d' height='220' string='Aged income' colspan='4'/>
+                            <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
                             
                         </child2>
                     </hpaned>
@@ -63,15 +63,15 @@
             </field>
         </record>
         
-        <record id='open_board_account' model='ir.actions.act_window'>
-            <field name='name'>Accounting Dashboard</field>
-            <field name='res_model'>board.board</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form</field>
-            <field name='usage'>menu</field>
-            <field name='view_id' ref='board_account_form'/>
+        <record id="open_board_account" model="ir.actions.act_window">
+            <field name="name">Accounting Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_account_form"/>
         </record>
         
-        <menuitem name='Dashboards/Accounting/' sequence='1' icon='terp-graph' action='open_board_account' id='menu_board_account'/>
+        <menuitem id="next_id_68" name="Accounting" parent="board.dashboard_menu"/><menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/board_manufacturing/board_manufacturing_demo.xml b/addons/board_manufacturing/board_manufacturing_demo.xml
index 327f2f1863d..f5a026adf1e 100644
--- a/addons/board_manufacturing/board_manufacturing_demo.xml
+++ b/addons/board_manufacturing/board_manufacturing_demo.xml
@@ -1,20 +1,19 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="ir.ui.view_sc" id="sc_manufacturing_dash">
+        <record id="sc_manufacturing_dash" model="ir.ui.view_sc">
             <field name="name">Production dashboard</field>
             <field name="user_id" ref="base.user_admin"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">4</field>
             <field name="res_id" ref="menu_board_manufacturing"/>
         </record>
-        <record model="res.users" id="base.user_admin">
+        <record id="base.user_admin" model="res.users">
             <field name="action_id" ref="open_board_manufacturing"/>
         </record>
-        <record model="res.users" id="base.user_demo">
+        <record id="base.user_demo" model="res.users">
             <field name="action_id" ref="open_board_manufacturing"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 6bf8446d7a6..45ac6e61cfa 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -1,43 +1,43 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id='note_sale_type' model='board.note.type'>
-            <field name='name'>Production</field>
+        <record id="note_sale_type" model="board.note.type">
+            <field name="name">Production</field>
         </record>
         
-        <record id='board_mrp_manager_form' model='ir.ui.view'>
-            <field name='name'>board.mrp.manager.form</field>
-            <field name='model'>board.board</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Manufacturing board'>
-                    <hpaned position='100'>
+        <record id="board_mrp_manager_form" model="ir.ui.view">
+            <field name="name">board.mrp.manager.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Manufacturing board">
+                    <hpaned position="100">
                         <child1>
-                            <action name='%(mrp.mrp_production_action2)d' height='200' string='Next production orders' colspan='4' width='510'/>
-                            <action name='%(stock.action_picking_tree2)d' string='Deliveries (Out packing)' colspan='4'/>
-                            <action name='%(mrp.mrp_procurement_action4)d' string='Procurement in Exception' colspan='4'/>
+                            <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
+                            <action colspan="4" name="%(stock.action_picking_tree2)d" string="Deliveries (Out packing)"/>
+                            <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="Procurement in Exception"/>
                         </child1>
                         
                         
                         <child2>
-                            <action name='%(report_mrp.action_report_workcenter_load_tree)d' string='Workcenter futur load' colspan='4'/>
+                            <action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Workcenter futur load"/>
                             
-                            <action name='%(report_mrp.action_report_in_out_picking_tree)d' string='Stock value variation' colspan='4'/>
+                            <action colspan="4" name="%(report_mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
                         </child2>
                     </hpaned>
                 </form>
             </field>
         </record>
         
-        <record id='open_board_manufacturing' model='ir.actions.act_window'>
-            <field name='name'>Production Dashboard</field>
-            <field name='res_model'>board.board</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='board_mrp_manager_form'/>
+        <record id="open_board_manufacturing" model="ir.actions.act_window">
+            <field name="name">Production Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
         
-        <menuitem name='Dashboards/Production/Production Dashboard' sequence='1' icon='terp-graph' action='open_board_manufacturing' id='menu_board_manufacturing'/>
+        <menuitem id="next_id_87" name="Production" parent="board.dashboard_menu"/><menuitem action="open_board_manufacturing" icon="terp-graph" id="menu_board_manufacturing" parent="next_id_87" sequence="1"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/board_project/board_project_demo.xml b/addons/board_project/board_project_demo.xml
index 0edb3af3a47..01268fa329d 100644
--- a/addons/board_project/board_project_demo.xml
+++ b/addons/board_project/board_project_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -7,22 +7,22 @@
 		 Administrator shortcut
 		 Demo user startup menu
 		 -->
-        <record model="ir.ui.view_sc" id="sc_account_dash">
+        <record id="sc_account_dash" model="ir.ui.view_sc">
             <field name="name">project dashboard</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">3</field>
             <field name="res_id" ref="menu_board_project"/>
         </record>
-        <record model="res.users" id="base.user_admin">
+        <record id="base.user_admin" model="res.users">
             <field name="action_id" ref="open_board_project"/>
         </record>
         
-        <record model="board.note" id="note_project">
+        <record id="note_project" model="board.note">
             <field name="name">Don't forget the new development policies.</field>
             <field name="user_id" ref="base.user_admin"/>
             <field name="type">Project</field>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index 263dfa3788d..2f3741d5274 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -1,72 +1,72 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='note_project_type' model='board.note.type'>
-            <field name='name'>Project managers</field>
+        <record id="note_project_type" model="board.note.type">
+            <field name="name">Project managers</field>
         </record>
         
         <!--
 		 Board for project managers
 		 -->
-        <act_window name='My projects' view_type='form' domain='[(&apos;manager&apos;, &apos;=&apos;, uid)]' id='act_my_project' view_mode='tree,form' res_model='project.project'/>
+        <act_window domain="[('manager', '=', uid)]" id="act_my_project" name="My projects" res_model="project.project" view_mode="tree,form" view_type="form"/>
         
-        <act_window name='My accounts to invoice' view_type='form' domain='[(&apos;user_id&apos;,&apos;=&apos;,uid),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;close&apos;)]' id='act_my_account' view_mode='tree,form' res_model='account.analytic.account' view_id='view_account_analytic_simplified'/>
+        <act_window domain="[('user_id','=',uid),('state','&lt;&gt;','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_id="view_account_analytic_simplified" view_mode="tree,form" view_type="form"/>
         
-        <record id='action_project_pipeline_user' model='ir.actions.act_window'>
-            <field name='name'>Pipeline of tasks</field>
-            <field name='res_model'>report.task.user.pipeline.open</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
-            <field name='domain'>[('user_id','in',department_users_get())]</field>
+        <record id="action_project_pipeline_user" model="ir.actions.act_window">
+            <field name="name">Pipeline of tasks</field>
+            <field name="res_model">report.task.user.pipeline.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('user_id','in',department_users_get())]</field>
         </record>
         
-        <record id='hr_timesheet_sheet_tree' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.sheet.tree.simplified.board</field>
-            <field name='model'>hr_timesheet_sheet.sheet</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Timesheets'>
-                    <field name='date_from'/>
-                    <field name='user_id'/>
-                    <field name='name'/>
-                    <field name='total_attendance'/>
-                    <field name='total_timesheet'/>
-                    <field name='state'/>
+        <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheets">
+                    <field name="date_from"/>
+                    <field name="user_id"/>
+                    <field name="name"/>
+                    <field name="total_attendance"/>
+                    <field name="total_timesheet"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='act_hr_timesheet_sheet' model='ir.actions.act_window'>
-            <field name='name'>Timesheets</field>
-            <field name='res_model'>hr_timesheet_sheet.sheet</field>
-            <field name='domain'>[('state','&lt;&gt;','done'),('user_id','in',department_users_get())]</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='hr_timesheet_sheet_tree'/>
+        <record id="act_hr_timesheet_sheet" model="ir.actions.act_window">
+            <field name="name">Timesheets</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('state','&lt;&gt;','done'),('user_id','in',department_users_get())]</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="hr_timesheet_sheet_tree"/>
         </record>
         
         
-        <record id='board_project_manager_form' model='ir.ui.view'>
-            <field name='name'>board.project.manager.form</field>
-            <field name='model'>board.board</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Project manager board'>
+        <record id="board_project_manager_form" model="ir.ui.view">
+            <field name="name">board.project.manager.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Project manager board">
                     <hpaned>
                         <child1>
-                            <action name='%(act_my_project)d' height='220' string='My projects' colspan='4' width='510'/>
+                            <action colspan="4" height="220" name="%(act_my_project)d" string="My projects" width="510"/>
                             
-                            <action name='%(act_my_account)d' height='150' string='My accounts to invoice' colspan='4'/>
+                            <action colspan="4" height="150" name="%(act_my_account)d" string="My accounts to invoice"/>
                             
-                            <action name='%(act_hr_timesheet_sheet)d' height='150' string='User&apos;s timesheets' colspan='4'/>
+                            <action colspan="4" height="150" name="%(act_hr_timesheet_sheet)d" string="User's timesheets"/>
                             
                         </child1>
                         <child2>
-                            <button name='%(open_board_project)d' icon='gtk-ok' type='action' string='My tasks board' colspan='4'/>
+                            <button colspan="4" icon="gtk-ok" name="%(open_board_project)d" string="My tasks board" type="action"/>
                             
                             
-                            <action name='%(report_analytic_planning.action_account_analytic_planning_stat_my_manager_form)d' string='My project&apos;s planning' colspan='4'/>
+                            <action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_my_manager_form)d" string="My project's planning"/>
                             
-                            <action name='%(action_project_pipeline_user)d' string='My user&apos;s pipeline' colspan='4'/>
+                            <action colspan="4" name="%(action_project_pipeline_user)d" string="My user's pipeline"/>
                             
                         </child2>
                     </hpaned>
@@ -74,19 +74,19 @@
             </field>
         </record>
         
-        <record id='open_board_project_manager' model='ir.actions.act_window'>
-            <field name='name'>Project Manager Dashboard</field>
-            <field name='res_model'>board.board</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form</field>
-            <field name='usage'>menu</field>
-            <field name='view_id' ref='board_project_manager_form'/>
+        <record id="open_board_project_manager" model="ir.actions.act_window">
+            <field name="name">Project Manager Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_project_manager_form"/>
         </record>
         
-        <menuitem name='Dashboards/Project/Project Manager' sequence='1' icon='terp-graph' action='open_board_project_manager' id='menu_board_project_manager'/>
+        <menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="board_project.next_id_86" sequence="1"/>
         
         
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 46b0071c3ca..72477c3e7d0 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -1,74 +1,74 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='note_project_manager_type' model='board.note.type'>
-            <field name='name'>Project</field>
+        <record id="note_project_manager_type" model="board.note.type">
+            <field name="name">Project</field>
         </record>
         
-        <record id='view_task_tree' model='ir.ui.view'>
-            <field name='name'>project.task.tree</field>
-            <field name='model'>project.task</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='99'/>
-            <field name='arch' type='xml'>
-                <tree colors='red:date_deadline&lt;current_date;blue:date_deadline==current_date' string='My Tasks'>
-                    <field name='name'/>
-                    <field name='project_id'/>
-                    <field name='date_deadline'/>
-                    <field name='planned_hours'/>
-                    <field name='effective_hours'/>
-                    <field name='priority'/>
+        <record id="view_task_tree" model="ir.ui.view">
+            <field name="name">project.task.tree</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field eval="99" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date" string="My Tasks">
+                    <field name="name"/>
+                    <field name="project_id"/>
+                    <field name="date_deadline"/>
+                    <field name="planned_hours"/>
+                    <field name="effective_hours"/>
+                    <field name="priority"/>
                 </tree>
             </field>
         </record>
-        <record id='action_view_task_tree' model='ir.actions.act_window'>
-            <field name='name'>My Open Tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid),('state','=','open')]</field>
-            <field name='view_id' ref='view_task_tree'/>
+        <record id="action_view_task_tree" model="ir.actions.act_window">
+            <field name="name">My Open Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+            <field name="view_id" ref="view_task_tree"/>
         </record>
-        <record id='action_view_task_tree_deadline' model='ir.actions.act_window'>
-            <field name='name'>My Task's Deadlines</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid),('state','=','open'),('date_deadline','&lt;&gt;',False)]</field>
-            <field name='view_id' ref='view_task_tree'/>
+        <record id="action_view_task_tree_deadline" model="ir.actions.act_window">
+            <field name="name">My Task's Deadlines</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','open'),('date_deadline','&lt;&gt;',False)]</field>
+            <field name="view_id" ref="view_task_tree"/>
         </record>
         
-        <record id='action_view_board_note_tree' model='ir.actions.act_window'>
-            <field name='name'>Public Notes</field>
-            <field name='res_model'>board.note</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('type','=','Project')]</field>
+        <record id="action_view_board_note_tree" model="ir.actions.act_window">
+            <field name="name">Public Notes</field>
+            <field name="res_model">board.note</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','=','Project')]</field>
         </record>
         
-        <record id='board_project_form' model='ir.ui.view'>
-            <field name='name'>board.project.form</field>
-            <field name='model'>board.board</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='My Board'>
+        <record id="board_project_form" model="ir.ui.view">
+            <field name="name">board.project.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="My Board">
                     <hpaned>
                         
                         <child1>
                             
-                            <action name='%(action_view_task_tree)d' height='220' string='My Open Tasks' colspan='4' width='510'/>
+                            <action colspan="4" height="220" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
                             
-                            <action name='%(action_view_task_tree_deadline)d' height='150' string='My Deadlines' colspan='4'/>
+                            <action colspan="4" height="150" name="%(action_view_task_tree_deadline)d" string="My Deadlines"/>
                             
-                            <action name='%(action_view_board_note_tree)d' height='150' string='Public Notes' colspan='4'/>
+                            <action colspan="4" height="150" name="%(action_view_board_note_tree)d" string="Public Notes"/>
                             
                         </child1>
                         
                         <child2>
-                            <action name='%(report_analytic_planning.action_account_analytic_planning_stat_my_form)d' string='My Planning' colspan='4'/>
+                            <action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_my_form)d" string="My Planning"/>
                             
-                            <action name='%(report_timesheet.action_timesheet_user_stat_my)d' string='My Timesheet' colspan='4'/>
+                            <action colspan="4" name="%(report_timesheet.action_timesheet_user_stat_my)d" string="My Timesheet"/>
                             
                         </child2>
                     </hpaned>
@@ -76,16 +76,16 @@
             </field>
         </record>
         
-        <record id='open_board_project' model='ir.actions.act_window'>
-            <field name='name'>Project Dashboard</field>
-            <field name='res_model'>board.board</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form</field>
-            <field name='usage'>menu</field>
-            <field name='view_id' ref='board_project_form'/>
+        <record id="open_board_project" model="ir.actions.act_window">
+            <field name="name">Project Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_project_form"/>
         </record>
         
-        <menuitem name='Dashboards/Project/Project Member' sequence='1' icon='terp-graph' action='open_board_project' id='menu_board_project'/>
+        <menuitem id="next_id_86" name="Project" parent="board.dashboard_menu"/><menuitem action="open_board_project" icon="terp-graph" id="menu_board_project" parent="next_id_86" sequence="1"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/board_sale/board_sale_demo.xml b/addons/board_sale/board_sale_demo.xml
index 6875ae19bb1..ad66d9cf758 100644
--- a/addons/board_sale/board_sale_demo.xml
+++ b/addons/board_sale/board_sale_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -6,16 +6,15 @@
 			Administrator shortcut
 			Demo user startup menu
 		-->
-        <record model="ir.ui.view_sc" id="sc_sale_dash">
+        <record id="sc_sale_dash" model="ir.ui.view_sc">
             <field name="name">Sales dashboard</field>
             <field name="user_id" ref="base.user_admin"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">1</field>
             <field name="res_id" ref="menu_board_sales_manager"/>
         </record>
-        <record model="res.users" id="base.user_demo">
+        <record id="base.user_demo" model="res.users">
             <field name="action_id" ref="open_board_sales_manager"/>
         </record>
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index 2c4c790bc2c..c18d0e2dd81 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -1,41 +1,41 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id='note_sale_type' model='board.note.type'>
-            <field name='name'>Sales</field>
+        <record id="note_sale_type" model="board.note.type">
+            <field name="name">Sales</field>
         </record>
         
-        <record id='board_sales_manager_form' model='ir.ui.view'>
-            <field name='name'>board.sales.manager.form</field>
-            <field name='model'>board.board</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Sales manager board'>
-                    <hpaned position='100'>
+        <record id="board_sales_manager_form" model="ir.ui.view">
+            <field name="name">board.sales.manager.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales manager board">
+                    <hpaned position="100">
                         <child1>
-                            <action name='%(sale.action_order_tree10)d' height='200' string='My open quotations' colspan='4' width='510'/>
-                            <action name='%(report_sale.action_order_sale_list)d' string='Top ten sales of the month' colspan='4'/>
-                            <action name='%(report_crm.action_report_crm_case_user_tree_month_my)d' string='Cases statistics' colspan='4'/>
+                            <action colspan="4" height="200" name="%(sale.action_order_tree10)d" string="My open quotations" width="510"/>
+                            <action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/>
+                            <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree_month_my)d" string="Cases statistics"/>
                         </child1>
                         
                         <child2>
-                            <action name='%(report_sale.action_order_category_tree_all)d' view_mode='graph,tree' string='Sales of the month' colspan='4'/>
-                            <action name='%(report_crm.action_report_crm_case_user_tree_month)d' view_mode='graph,tree' string='Cases of the month' colspan='4'/>
+                            <action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Sales of the month" view_mode="graph,tree"/>
+                            <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree_month)d" string="Cases of the month" view_mode="graph,tree"/>
                         </child2>
                     </hpaned>
                 </form>
             </field>
         </record>
         
-        <record id='open_board_sales_manager' model='ir.actions.act_window'>
-            <field name='name'>Sale Dashboard</field>
-            <field name='res_model'>board.board</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='board_sales_manager_form'/>
+        <record id="open_board_sales_manager" model="ir.actions.act_window">
+            <field name="name">Sale Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_sales_manager_form"/>
         </record>
         
-        <menuitem name='Dashboards/Sales/Sales Manager' sequence='1' icon='terp-graph' action='open_board_sales_manager' id='menu_board_sales_manager'/>
+        <menuitem id="next_id_88" name="Sales" parent="board.dashboard_menu"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 285c2141b8f..b356af526a7 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="res.request.link" id="req_link_case">
+        <record id="req_link_case" model="res.request.link">
             <field name="name">Case</field>
             <field name="object">crm.case</field>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_create">
+        <record id="event_type_case_create" model="res.partner.event.type">
             <field name="name">CRM: Create Case</field>
             <field name="key">crm_case_draft</field>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_open">
+        <record id="event_type_case_open" model="res.partner.event.type">
             <field name="name">CRM: Open Case</field>
             <field name="key">crm_case_open</field>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_pending">
+        <record id="event_type_case_pending" model="res.partner.event.type">
             <field name="name">CRM: Pending Case</field>
             <field name="key">crm_case_pending</field>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_cancel">
+        <record id="event_type_case_cancel" model="res.partner.event.type">
             <field name="name">CRM: Cancel Case</field>
             <field name="key">crm_case_cancel</field>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_close">
+        <record id="event_type_case_close" model="res.partner.event.type">
             <field name="name">CRM: Close Case</field>
             <field name="key">crm_case_done</field>
         </record>
@@ -36,36 +36,36 @@
     
     <data noupdate="1">
         
-        <record model="res.partner.event.type" id="event_type_case_create">
-            <field name="active" eval="False"/>
+        <record id="event_type_case_create" model="res.partner.event.type">
+            <field eval="False" name="active"/>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_open">
-            <field name="active" eval="True"/>
+        <record id="event_type_case_open" model="res.partner.event.type">
+            <field eval="True" name="active"/>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_pending">
-            <field name="active" eval="False"/>
+        <record id="event_type_case_pending" model="res.partner.event.type">
+            <field eval="False" name="active"/>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_close">
-            <field name="active" eval="True"/>
+        <record id="event_type_case_close" model="res.partner.event.type">
+            <field eval="True" name="active"/>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_case_cancel">
-            <field name="active" eval="False"/>
+        <record id="event_type_case_cancel" model="res.partner.event.type">
+            <field eval="False" name="active"/>
         </record>
         
-        <record model="ir.cron" id="ir_cron_crm_action">
+        <record id="ir_cron_crm_action" model="ir.cron">
             <field name="name">Check cases rules</field>
             <field name="interval_number">1</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <field name="model" eval="'crm.case.rule'"/>
-            <field name="function" eval="'_check'"/>
-            <field name="args" eval="'()'"/>
+            <field eval="False" name="doall"/>
+            <field eval="'crm.case.rule'" name="model"/>
+            <field eval="'_check'" name="function"/>
+            <field eval="'()'" name="args"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 19cb2748095..af02a985690 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -6,15 +6,15 @@
 	Case Sections
 	-->
         
-        <record model="crm.case.section" id="section_support">
+        <record id="section_support" model="crm.case.section">
             <field name="name">Helpdesk and Support</field>
             <field name="code">support</field>
         </record>
-        <record model="crm.case.section" id="section_sale">
+        <record id="section_sale" model="crm.case.section">
             <field name="name">Sales opportunities</field>
             <field name="code">sale</field>
         </record>
-        <record model="crm.case.section" id="section_purchase">
+        <record id="section_purchase" model="crm.case.section">
             <field name="name">Supplier complaints</field>
             <field name="code">purchase</field>
         </record>
@@ -23,27 +23,27 @@
 	Case Categories
 	-->
         
-        <record model="crm.case.categ" id="categ1">
+        <record id="categ1" model="crm.case.categ">
             <field name="name">Computer Crashed</field>
             <field name="section_id" ref="section_support"/>
         </record>
-        <record model="crm.case.categ" id="categ2">
+        <record id="categ2" model="crm.case.categ">
             <field name="name">Unknown</field>
             <field name="section_id" ref="section_support"/>
         </record>
-        <record model="crm.case.categ" id="categ3">
+        <record id="categ3" model="crm.case.categ">
             <field name="name">Bad Program Utilisation</field>
             <field name="section_id" ref="section_support"/>
         </record>
-        <record model="crm.case.categ" id="categ4">
+        <record id="categ4" model="crm.case.categ">
             <field name="name">Website Opportunity</field>
             <field name="section_id" ref="section_sale"/>
         </record>
-        <record model="crm.case.categ" id="categ5">
+        <record id="categ5" model="crm.case.categ">
             <field name="name">ERP Opportunity</field>
             <field name="section_id" ref="section_sale"/>
         </record>
-        <record model="crm.case.categ" id="categ6">
+        <record id="categ6" model="crm.case.categ">
             <field name="name">Furnitures</field>
             <field name="section_id" ref="section_purchase"/>
         </record>
@@ -61,10 +61,7 @@
 	<menuitem name="CRM &amp; SRM/Helpdesk/Helpdesk Cases" id="menu_crm_case_categ2-act" action="crm_case_categ2-act"/>
 	-->
         
-        <function
-		model="crm.case.section"
-		name="menu_create"
-		eval="([section_support], 'Helpdesk', ref('menu_crm'))"/>
+        <function eval="([section_support], 'Helpdesk', ref('menu_crm'))" model="crm.case.section" name="menu_create"/>
         
         <!-- Demo Cases -->
         
@@ -75,41 +72,41 @@
                 Send them a price.
             </field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="30000"/>
-            <field name="probability" eval="0.85"/>
-            <field name="date" eval="time.strftime('%Y-%m-01')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
+            <field eval="30000" name="planned_revenue"/>
+            <field eval="0.85" name="probability"/>
+            <field eval="time.strftime('%Y-%m-01')" name="date"/>
+            <field eval="time.strftime('%Y-%m-24')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
         </record>
         
-        <record model="crm.case" id="case1">
+        <record id="case1" model="crm.case">
             <field name="name">Need a new eCommerce Website</field>
             <field name="priority">4</field>
             <field name="description">Fabien think about a new EC website
                 Send them a price.
             </field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="som" ref="base.som_happy"/>
-            <field name="planned_revenue" eval="3000"/>
-            <field name="probability" eval="0.85"/>
-            <field name="date" eval="time.strftime('%Y-%m-10')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-20')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="3000" name="planned_revenue"/>
+            <field eval="0.85" name="probability"/>
+            <field eval="time.strftime('%Y-%m-10')" name="date"/>
+            <field eval="time.strftime('%Y-%m-20')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case1')]"/>
+            <value eval="[ref('case1')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case1')]"/>
+            <value eval="[ref('case1')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case2">
+        <record id="case2" model="crm.case">
             <field name="name">Hdd Crashed unexpectedly</field>
             <field name="priority">3</field>
             <field name="description">HDD Crashed
@@ -117,347 +114,347 @@
                 The CPU Cooler is down.
             </field>
             <field name="section_id" ref="section_support"/>
-            <field name="categ_id" eval="categ1"/>
+            <field eval="categ1" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_sednacom"/>
             <field name="som" ref="base.som_unhappy"/>
-            <field name="date" eval="time.strftime('%Y-%m-03')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-10')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
+            <field eval="time.strftime('%Y-%m-03')" name="date"/>
+            <field eval="time.strftime('%Y-%m-10')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
         </record>
         
-        <record model="crm.case" id="case3">
+        <record id="case3" model="crm.case">
             <field name="name">Need a new eCommerce Website</field>
             <field name="priority">3</field>
             <field name="description">Fabien think about a new EC website
                 Send them a price.
             </field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_thymbra"/>
             <field name="som" ref="base.som_very_happy"/>
-            <field name="planned_revenue" eval="2345"/>
-            <field name="probability" eval="0.60"/>
-            <field name="date" eval="time.strftime('%Y-%m-18')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="2345" name="planned_revenue"/>
+            <field eval="0.60" name="probability"/>
+            <field eval="time.strftime('%Y-%m-18')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case3')]"/>
+            <value eval="[ref('case3')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case3')]"/>
+            <value eval="[ref('case3')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case4">
+        <record id="case4" model="crm.case">
             <field name="name">Need a new eCommerce Website</field>
             <field name="priority">3</field>
             <field name="description">Fabien think about a new EC website
                 Send them a price.
             </field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
             <field name="som" ref="base.som_happy"/>
-            <field name="planned_revenue" eval="1000"/>
-            <field name="planned_cost" eval="79"/>
-            <field name="probability" eval="0.30"/>
-            <field name="date" eval="time.strftime('%Y-%m-05')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="1000" name="planned_revenue"/>
+            <field eval="79" name="planned_cost"/>
+            <field eval="0.30" name="probability"/>
+            <field eval="time.strftime('%Y-%m-05')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case4')]"/>
+            <value eval="[ref('case4')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case4')]"/>
+            <value eval="[ref('case4')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case5">
+        <record id="case5" model="crm.case">
             <field name="name">Bug in program</field>
             <field name="priority">3</field>
             <field name="description">There is a bug in the program</field>
             <field name="section_id" ref="section_support"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="8000"/>
-            <field name="probability" eval="0.30"/>
-            <field name="date" eval="time.strftime('%Y-%m-08')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-28')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','admin')]" model="res.users"/>
+            <field eval="8000" name="planned_revenue"/>
+            <field eval="0.30" name="probability"/>
+            <field eval="time.strftime('%Y-%m-08')" name="date"/>
+            <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case5')]"/>
+            <value eval="[ref('case5')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case6">
+        <record id="case6" model="crm.case">
             <field name="name">Server is down</field>
             <field name="priority">3</field>
             <field name="description">The web server is down</field>
             <field name="section_id" ref="section_support"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="4200"/>
-            <field name="probability" eval="0.90"/>
-            <field name="date" eval="time.strftime('%Y-%m-03')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-25')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="4200" name="planned_revenue"/>
+            <field eval="0.90" name="probability"/>
+            <field eval="time.strftime('%Y-%m-03')" name="date"/>
+            <field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case6')]"/>
+            <value eval="[ref('case6')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case6')]"/>
+            <value eval="[ref('case6')]" model="crm.case"/>
         </function>
-        <record model="crm.case" id="case6">
+        <record id="case6" model="crm.case">
             <field name="description">Have been rebooted</field>
         </record>
         <function model="crm.case" name="case_pending">
-            <value model="crm.case" eval="[ref('case6')]"/>
+            <value eval="[ref('case6')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case7">
+        <record id="case7" model="crm.case">
             <field name="name">Disk failure</field>
             <field name="priority">2</field>
             <field name="description">The new disk doesn't work</field>
             <field name="section_id" ref="section_purchase"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_maxtor"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="2000"/>
-            <field name="probability" eval="0.30"/>
-            <field name="date" eval="time.strftime('%Y-%m-06')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-18')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','admin')]" model="res.users"/>
+            <field eval="2000" name="planned_revenue"/>
+            <field eval="0.30" name="probability"/>
+            <field eval="time.strftime('%Y-%m-06')" name="date"/>
+            <field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case7')]"/>
+            <value eval="[ref('case7')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case7')]"/>
+            <value eval="[ref('case7')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case8">
+        <record id="case8" model="crm.case">
             <field name="name">Missing hardware</field>
             <field name="priority">3</field>
             <field name="description">Missing some hardwares in the packing</field>
             <field name="section_id" ref="section_support"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_seagate"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="2230"/>
-            <field name="probability" eval="0.80"/>
-            <field name="date" eval="time.strftime('%Y-%m-02')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-14')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="2230" name="planned_revenue"/>
+            <field eval="0.80" name="probability"/>
+            <field eval="time.strftime('%Y-%m-02')" name="date"/>
+            <field eval="time.strftime('%Y-%m-14')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case8')]"/>
+            <value eval="[ref('case8')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case8')]"/>
+            <value eval="[ref('case8')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case9">
+        <record id="case9" model="crm.case">
             <field name="name">Need a new eCommerce Website</field>
             <field name="priority">4</field>
             <field name="description">Fabien think about a new EC website
                 Send them a price.
             </field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field name="som" ref="base.som_happy"/>
-            <field name="planned_revenue" eval="1000"/>
-            <field name="probability" eval="0.40"/>
-            <field name="date" eval="time.strftime('%Y-%m-06')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','admin')]" model="res.users"/>
+            <field eval="1000" name="planned_revenue"/>
+            <field eval="0.40" name="probability"/>
+            <field eval="time.strftime('%Y-%m-06')" name="date"/>
+            <field eval="time.strftime('%Y-%m-24')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case9')]"/>
+            <value eval="[ref('case9')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case9')]"/>
+            <value eval="[ref('case9')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case10">
+        <record id="case10" model="crm.case">
             <field name="name">Need a new module</field>
             <field name="priority">3</field>
             <field name="description">Need a new module</field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ5"/>
+            <field eval="categ5" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_11"/>
             <field name="som" ref="base.som_unhappy"/>
-            <field name="planned_revenue" eval="3100"/>
-            <field name="planned_cost" eval="790"/>
-            <field name="probability" eval="0.90"/>
-            <field name="date" eval="time.strftime('%Y-%m-02')"/>
-            <field name="date_deadline" eval="time.strftime('%Y-%m-12')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="3100" name="planned_revenue"/>
+            <field eval="790" name="planned_cost"/>
+            <field eval="0.90" name="probability"/>
+            <field eval="time.strftime('%Y-%m-02')" name="date"/>
+            <field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case10')]"/>
+            <value eval="[ref('case10')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case10')]"/>
+            <value eval="[ref('case10')]" model="crm.case"/>
         </function>
-        <record model="crm.case" id="case10">
+        <record id="case10" model="crm.case">
             <field name="description">Module delivries</field>
         </record>
         <function model="crm.case" name="case_close">
-            <value model="crm.case" eval="[ref('case10')]"/>
+            <value eval="[ref('case10')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case11">
+        <record id="case11" model="crm.case">
             <field name="name">Need support on module</field>
             <field name="priority">1</field>
             <field name="description">Need some information on module ...</field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field name="som" ref="base.som_happy"/>
-            <field name="planned_revenue" eval="8000"/>
-            <field name="planned_cost" eval="1234"/>
-            <field name="probability" eval="0.50"/>
-            <field name="date" eval="time.strftime('%Y-%m-18')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="8000" name="planned_revenue"/>
+            <field eval="1234" name="planned_cost"/>
+            <field eval="0.50" name="probability"/>
+            <field eval="time.strftime('%Y-%m-18')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case11')]"/>
+            <value eval="[ref('case11')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case11')]"/>
+            <value eval="[ref('case11')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case12">
+        <record id="case12" model="crm.case">
             <field name="name">Bad packing</field>
             <field name="priority">2</field>
             <field name="description">We receive bad package</field>
             <field name="section_id" ref="section_purchase"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_14"/>
             <field name="som" ref="base.som_happy"/>
-            <field name="planned_revenue" eval="800"/>
-            <field name="probability" eval="0.90"/>
-            <field name="date" eval="time.strftime('%Y-%m-25')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="800" name="planned_revenue"/>
+            <field eval="0.90" name="probability"/>
+            <field eval="time.strftime('%Y-%m-25')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case12')]"/>
+            <value eval="[ref('case12')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case12')]"/>
+            <value eval="[ref('case12')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case13">
+        <record id="case13" model="crm.case">
             <field name="name">Need quotation</field>
             <field name="priority">3</field>
             <field name="description">Need quotation for new development</field>
             <field name="section_id" ref="section_support"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
             <field name="som" ref="base.som_happy"/>
-            <field name="planned_revenue" eval="300"/>
-            <field name="probability" eval="0.10"/>
-            <field name="date" eval="time.strftime('%Y-%m-26')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','admin')]" model="res.users"/>
+            <field eval="300" name="planned_revenue"/>
+            <field eval="0.10" name="probability"/>
+            <field eval="time.strftime('%Y-%m-26')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case13')]"/>
+            <value eval="[ref('case13')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case13')]"/>
+            <value eval="[ref('case13')]" model="crm.case"/>
         </function>
-        <record model="crm.case" id="case13">
+        <record id="case13" model="crm.case">
             <field name="description">Not interested</field>
         </record>
         <function model="crm.case" name="case_close">
-            <value model="crm.case" eval="[ref('case13')]"/>
+            <value eval="[ref('case13')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case14">
+        <record id="case14" model="crm.case">
             <field name="name">New server</field>
             <field name="priority">1</field>
             <field name="description">We need a new server</field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ5"/>
+            <field eval="categ5" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_4"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="8000"/>
-            <field name="probability" eval="0.90"/>
-            <field name="date" eval="time.strftime('%Y-%m-16')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="8000" name="planned_revenue"/>
+            <field eval="0.90" name="probability"/>
+            <field eval="time.strftime('%Y-%m-16')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case14')]"/>
+            <value eval="[ref('case14')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case14')]"/>
+            <value eval="[ref('case14')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case15">
+        <record id="case15" model="crm.case">
             <field name="name">Formation</field>
             <field name="priority">4</field>
             <field name="description">Provide a formation</field>
             <field name="section_id" ref="section_sale"/>
-            <field name="categ_id" eval="categ4"/>
+            <field eval="categ4" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_5"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="1000"/>
-            <field name="probability" eval="0.30"/>
-            <field name="date" eval="time.strftime('%Y-%m-17')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','admin')]" model="res.users"/>
+            <field eval="1000" name="planned_revenue"/>
+            <field eval="0.30" name="probability"/>
+            <field eval="time.strftime('%Y-%m-17')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case15')]"/>
+            <value eval="[ref('case15')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case15')]"/>
+            <value eval="[ref('case15')]" model="crm.case"/>
         </function>
-        <record model="crm.case" id="case15">
+        <record id="case15" model="crm.case">
             <field name="description">Information sended</field>
         </record>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case15')]"/>
+            <value eval="[ref('case15')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case16">
+        <record id="case16" model="crm.case">
             <field name="name">Need new specific reports</field>
             <field name="priority">3</field>
             <field name="description">Need some specific reports</field>
             <field name="section_id" ref="section_support"/>
-            <field name="categ_id" eval="categ5"/>
+            <field eval="categ5" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_thymbra"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="1300"/>
-            <field name="planned_cost" eval="79"/>
-            <field name="probability" eval="0.95"/>
-            <field name="date" eval="time.strftime('%Y-%m-13')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="1300" name="planned_revenue"/>
+            <field eval="79" name="planned_cost"/>
+            <field eval="0.95" name="probability"/>
+            <field eval="time.strftime('%Y-%m-13')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case16')]"/>
+            <value eval="[ref('case16')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case16')]"/>
+            <value eval="[ref('case16')]" model="crm.case"/>
         </function>
         
-        <record model="crm.case" id="case17">
+        <record id="case17" model="crm.case">
             <field name="name">Server down</field>
             <field name="priority">3</field>
             <field name="description">Server is down, doesn't answser to pingz
@@ -468,22 +465,22 @@
                 (btw : this is only demo data. no stress dear sysadmin :))
             </field>
             <field name="section_id" ref="section_support"/>
-            <field name="categ_id" eval="categ1"/>
+            <field eval="categ1" name="categ_id"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field name="som" ref="base.som_normal"/>
-            <field name="planned_revenue" eval="0"/>
-            <field name="planned_cost" eval="0"/>
-            <field name="probability" eval="0"/>
-            <field name="date" eval="time.strftime('%Y-%m-19')"/>
-            <field name="canal_id" search="[]" model="res.partner.canal"/>
-            <field name="user_id" search="[('login','=','demo')]" model="res.users"/>
+            <field eval="0" name="planned_revenue"/>
+            <field eval="0" name="planned_cost"/>
+            <field eval="0" name="probability"/>
+            <field eval="time.strftime('%Y-%m-19')" name="date"/>
+            <field model="res.partner.canal" name="canal_id" search="[]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
         </record>
         <function model="crm.case" name="case_open">
-            <value model="crm.case" eval="[ref('case17')]"/>
+            <value eval="[ref('case17')]" model="crm.case"/>
         </function>
         <function model="crm.case" name="case_log">
-            <value model="crm.case" eval="[ref('case17')]"/>
+            <value eval="[ref('case17')]" model="crm.case"/>
         </function>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/crm/crm_report.xml b/addons/crm/crm_report.xml
index 15e8c8f413f..1e4116aad28 100644
--- a/addons/crm/crm_report.xml
+++ b/addons/crm/crm_report.xml
@@ -1,14 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report
-			string="Business Opportunities"
-			model="crm.case"
-			name="crm.case"
-			auto="False"
-			keyword="client_print_multi"
-			multi="True"
-			menu="True"
-			id="crm_business_opportunities_report"/>
+        <report auto="False" id="crm_business_opportunities_report" keyword="client_print_multi" menu="True" model="crm.case" multi="True" name="crm.case" string="Business Opportunities"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/crm/crm_security.xml b/addons/crm/crm_security.xml
index 474de82f3c4..356e77e8318 100644
--- a/addons/crm/crm_security.xml
+++ b/addons/crm/crm_security.xml
@@ -1,117 +1,117 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="res.groups" id="group_crm_manager">
+        <record id="group_crm_manager" model="res.groups">
             <field name="name">Customer Executive - Manager</field>
         </record>
         
-        <record model="res.groups" id="group_crm_member">
+        <record id="group_crm_member" model="res.groups">
             <field name="name">Customer Executive</field>
         </record>
         
-        <record model="res.users" id="base.user_admin">
-            <field name="groups_id" eval="[ (4 ,ref('base.group_admin')), (4, ref('group_crm_manager')), (4, ref('group_crm_member')) ]"/>
+        <record id="base.user_admin" model="res.users">
+            <field eval="[ (4 ,ref('base.group_admin')), (4, ref('group_crm_manager')), (4, ref('group_crm_member')) ]" name="groups_id"/>
         </record>
         
         <!-- CRM Case security -->
-        <record model="ir.model.access" id="access_crm_case">
+        <record id="access_crm_case" model="ir.model.access">
             <field name="name">CRM Case</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.case')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.case')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_crm_case_member">
+        <record id="access_crm_case_member" model="ir.model.access">
             <field name="name">CRM Case</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.case')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.case')]"/>
             <field name="group_id" ref="group_crm_member"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- CRM Case Section security -->
-        <record model="ir.model.access" id="access_crm_case_section">
+        <record id="access_crm_case_section" model="ir.model.access">
             <field name="name">Case Section</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.case.section')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.case.section')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_crm_case_section_manager">
+        <record id="access_crm_case_section_manager" model="ir.model.access">
             <field name="name">Case Section</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.case.section')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.case.section')]"/>
             <field name="group_id" ref="group_crm_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- CRM Segmentation security -->
-        <record model="ir.model.access" id="access_crm_segmentation">
+        <record id="access_crm_segmentation" model="ir.model.access">
             <field name="name">Case Segmentation</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.segmentation')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.segmentation')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_crm_segmentatio_manager">
+        <record id="access_crm_segmentatio_manager" model="ir.model.access">
             <field name="name">Case Segmentation</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.segmentation')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.segmentation')]"/>
             <field name="group_id" ref="group_crm_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- CRM Segmentation Rules security -->
-        <record model="ir.model.access" id="access_crm_segmentation_rule">
+        <record id="access_crm_segmentation_rule" model="ir.model.access">
             <field name="name">Case Segmentation Rules</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.case.rule')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.case.rule')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_crm_segmentatio_rule_manager">
+        <record id="access_crm_segmentatio_rule_manager" model="ir.model.access">
             <field name="name">Case Segmentation Rules</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.case.rule')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.case.rule')]"/>
             <field name="group_id" ref="group_crm_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Case History security -->
-        <record model="ir.model.access" id="access_crm_segmentation_rule">
+        <record id="access_crm_segmentation_rule" model="ir.model.access">
             <field name="name">Case History</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.case.log')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.case.log')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_crm_segmentatio_rule_member">
+        <record id="access_crm_segmentatio_rule_member" model="ir.model.access">
             <field name="name">Case History</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'crm.case.log')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'crm.case.log')]"/>
             <field name="group_id" ref="group_crm_member"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="False"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index fccd416273e..7449f740452 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,355 +1,355 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem name='CRM &amp; SRM' icon='terp-crm' id='menu_crm'/>
-        <menuitem name='CRM &amp; SRM/Configuration' groups='base.group_admin' id='menu_crm_configuration'/>
+        <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>
+        <menuitem groups="base.group_admin" id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm"/>
         
-        <record id='res_partner_events-wopartner-view' model='ir.ui.view'>
-            <field name='name'>res.partner.events.form</field>
-            <field name='model'>res.partner.events</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Partner Events'>
-                    <separator string='General Description'/>
-                    <field name='date' select='1'/>
-                    <field name='name' select='1'/>
-                    <field name='som' select='2'/>
-                    <field name='type' select='2'/>
-                    <field name='partner_type' select='2'/>
+        <record id="res_partner_events-wopartner-view" model="ir.ui.view">
+            <field name="name">res.partner.events.form</field>
+            <field name="model">res.partner.events</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Partner Events">
+                    <separator string="General Description"/>
+                    <field name="date" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="som" select="2"/>
+                    <field name="type" select="2"/>
+                    <field name="partner_type" select="2"/>
                 </tree>
             </field>
         </record>
         
         <!-- Case Sections --> 
-        <record id='crm_case_section_view_form' model='ir.ui.view'>
-            <field name='name'>crm.case.section.form</field>
-            <field name='model'>crm.case.section</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Case Section'>
+        <record id="crm_case_section_view_form" model="ir.ui.view">
+            <field name="name">crm.case.section.form</field>
+            <field name="model">crm.case.section</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Case Section">
                     <notebook>
-                        <page string='Case section'>
-                            <field name='name' select='1'/>
-                            <field name='code' select='1'/>
-                            <field name='sequence'/>
-                            <field name='active' select='2'/>
-                            <field name='user_id' select='2'/>
-                            <field name='parent_id' select='2'/>
-                            <field name='reply_to' select='2'/>
-                            <label string='Complete this if you use the mail gateway.' colspan='2'/>
+                        <page string="Case section">
+                            <field name="name" select="1"/>
+                            <field name="code" select="1"/>
+                            <field name="sequence"/>
+                            <field name="active" select="2"/>
+                            <field name="user_id" select="2"/>
+                            <field name="parent_id" select="2"/>
+                            <field name="reply_to" select="2"/>
+                            <label colspan="2" string="Complete this if you use the mail gateway."/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='crm_case_section_view_tree' model='ir.ui.view'>
-            <field name='name'>crm.case.section.tree</field>
-            <field name='model'>crm.case.section</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree string='Case Section'>
-                    <field name='name' select='1'/>
-                    <field name='code' select='1'/>
-                    <field name='user_id' select='1'/>
+        <record id="crm_case_section_view_tree" model="ir.ui.view">
+            <field name="name">crm.case.section.tree</field>
+            <field name="model">crm.case.section</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Case Section">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1"/>
                 </tree>
             </field>
         </record>
         
-        <record id='crm_case_section_act' model='ir.actions.act_window'>
-            <field name='name'>Sections</field>
-            <field name='res_model'>crm.case.section</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='crm_case_section_view_tree'/>
+        <record id="crm_case_section_act" model="ir.actions.act_window">
+            <field name="name">Sections</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        <menuitem name='CRM &amp; SRM/Configuration/Cases/Sections' groups='base.group_admin' action='crm_case_section_act' id='menu_crm_case_section_act'/>
+        <menuitem id="next_id_51" name="Cases" parent="crm.menu_crm_configuration"/><menuitem action="crm_case_section_act" groups="base.group_admin" id="menu_crm_case_section_act" parent="next_id_51"/>
         
-        <record id='crm_case_section_act_tree' model='ir.actions.act_window'>
-            <field name='name'>Cases by section</field>
-            <field name='res_model'>crm.case.section</field>
-            <field name='domain'>[('parent_id','=',False)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='crm_case_section_view_tree'/>
+        <record id="crm_case_section_act_tree" model="ir.actions.act_window">
+            <field name="name">Cases by section</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        <menuitem name='CRM &amp; SRM/Cases/Cases by Section' groups='base.group_admin' action='crm_case_section_act_tree' id='menu_crm_case_section_act_tree'/>
+        <menuitem id="next_id_52" name="Cases" parent="crm.menu_crm"/><menuitem action="crm_case_section_act_tree" groups="base.group_admin" id="menu_crm_case_section_act_tree" parent="next_id_52"/>
         
         <!-- Case Categories -->
-        <record id='crm_case_categ-view' model='ir.ui.view'>
-            <field name='name'>crm.case.categ.form</field>
-            <field name='model'>crm.case.categ</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Case Category'>
-                    <field name='name' select='1'/>
-                    <field name='section_id' select='1'/>
-                    <field name='probability'/>
+        <record id="crm_case_categ-view" model="ir.ui.view">
+            <field name="name">crm.case.categ.form</field>
+            <field name="model">crm.case.categ</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Case Category">
+                    <field name="name" select="1"/>
+                    <field name="section_id" select="1"/>
+                    <field name="probability"/>
                 </form>
             </field>
         </record>
-        <record id='crm_case_categ_tree-view' model='ir.ui.view'>
-            <field name='name'>crm.case.categ.tree</field>
-            <field name='model'>crm.case.categ</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Case Category'>
-                    <field name='name'/>
-                    <field name='section_id'/>
-                    <field name='probability'/>
+        <record id="crm_case_categ_tree-view" model="ir.ui.view">
+            <field name="name">crm.case.categ.tree</field>
+            <field name="model">crm.case.categ</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Case Category">
+                    <field name="name"/>
+                    <field name="section_id"/>
+                    <field name="probability"/>
                 </tree>
             </field>
         </record>
         
-        <record id='crm_case_categ-act' model='ir.actions.act_window'>
-            <field name='name'>Categories</field>
-            <field name='res_model'>crm.case.categ</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='crm_case_categ_tree-view'/>
+        <record id="crm_case_categ-act" model="ir.actions.act_window">
+            <field name="name">Categories</field>
+            <field name="res_model">crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem name='CRM &amp; SRM/Configuration/Cases/Categories' groups='base.group_admin' action='crm_case_categ-act' id='menu_crm_case_categ-act'/>
+        <menuitem action="crm_case_categ-act" groups="base.group_admin" id="menu_crm_case_categ-act" parent="crm.next_id_51"/>
         
         <!-- Case rules -->
-        <record id='crm_case_rule-view' model='ir.ui.view'>
-            <field name='name'>crm.case.rule.form</field>
-            <field name='model'>crm.case.rule</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Case Rule'>
+        <record id="crm_case_rule-view" model="ir.ui.view">
+            <field name="name">crm.case.rule.form</field>
+            <field name="model">crm.case.rule</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Case Rule">
                     <notebook>
-                        <page string='Rule Information'>
-                            <separator string='General Information' colspan='4'/>
-                            <field name='name' select='1'/>
-                            <field name='active' select='2'/>
+                        <page string="Rule Information">
+                            <separator colspan="4" string="General Information"/>
+                            <field name="name" select="1"/>
+                            <field name="active" select="2"/>
                             
-                            <separator string='Criterions to be checked' colspan='4'/>
-                            <field name='trg_state_from' select='2'/>
-                            <field name='trg_state_to' select='2'/>
+                            <separator colspan="4" string="Criterions to be checked"/>
+                            <field name="trg_state_from" select="2"/>
+                            <field name="trg_state_to" select="2"/>
                             
-                            <field name='trg_section_id' select='1'/>
-                            <field name='trg_categ_id'/>
-                            <field name='trg_user_id' select='2'/>
+                            <field name="trg_section_id" select="1"/>
+                            <field name="trg_categ_id"/>
+                            <field name="trg_user_id" select="2"/>
                             
                             <newline/>
-                            <field name='trg_priority_from'/>
-                            <field name='trg_priority_to'/>
+                            <field name="trg_priority_from"/>
+                            <field name="trg_priority_to"/>
                             
-                            <field name='trg_partner_id'/>
-                            <field name='trg_partner_categ_id'/>
+                            <field name="trg_partner_id"/>
+                            <field name="trg_partner_categ_id"/>
                             
-                            <field name='trg_date_type'/>
-                            <label align='1.0' string='Delay after trigger date:'/>
-                            <group col='2' colspan='1'>
-                                <field name='trg_date_range' nolabel='1'/>
-                                <field name='trg_date_range_type' nolabel='1'/>
+                            <field name="trg_date_type"/>
+                            <label align="1.0" string="Delay after trigger date:"/>
+                            <group col="2" colspan="1">
+                                <field name="trg_date_range" nolabel="1"/>
+                                <field name="trg_date_range_type" nolabel="1"/>
                             </group>
                             
-                            <separator string='Actions to execute' colspan='4'/>
-                            <field name='act_state'/>
-                            <field name='act_section_id'/>
-                            <field name='act_user_id'/>
-                            <field name='act_priority'/>
-                            <field name='act_remind_user'/>
-                            <field name='act_remind_partner'/>
-                            <field name='act_remind_attach'/>
-                            <field name='act_email_cc' colspan='4'/>
+                            <separator colspan="4" string="Actions to execute"/>
+                            <field name="act_state"/>
+                            <field name="act_section_id"/>
+                            <field name="act_user_id"/>
+                            <field name="act_priority"/>
+                            <field name="act_remind_user"/>
+                            <field name="act_remind_partner"/>
+                            <field name="act_remind_attach"/>
+                            <field colspan="4" name="act_email_cc"/>
                             <!--
 					<field name="act_method" colspan="4" readonly="1"/>
 					-->
                             
                         </page>
-                        <page string='E-Mail Information'>
-                            <separator string='Email to send' colspan='4'/>
-                            <field name='act_mail_to_user'/>
-                            <field name='act_mail_to_partner'/>
-                            <field name='act_mail_to_watchers'/>
-                            <field name='act_mail_to_email' colspan='4'/>
-                            <field name='act_mail_body' colspan='4'/>
-                            <group col='2' colspan='4' string='Special Keywords'>
-                                <label align='0.0' string='%%(case_id)s = Case ID'/>
-                                <label align='0.0' string='%%(case_subject)s = Case subject'/>
-                                <label align='0.0' string='%%(case_date)s = Creation date'/>
-                                <label align='0.0' string='%%(email_from)s = Partner email'/>
-                                <label align='0.0' string='%%(partner)s = Partner name'/>
-                                <label align='0.0' string='%%(partner_email)s = Partner email'/>
-                                <label align='0.0' string='%%(case_user)s = Responsible name'/>
-                                <label align='0.0' string='%%(case_user_email)s = Responsible email'/>
-                                <label align='0.0' string='%%(case_user_phone)s = Responsible phone'/>
+                        <page string="E-Mail Information">
+                            <separator colspan="4" string="Email to send"/>
+                            <field name="act_mail_to_user"/>
+                            <field name="act_mail_to_partner"/>
+                            <field name="act_mail_to_watchers"/>
+                            <field colspan="4" name="act_mail_to_email"/>
+                            <field colspan="4" name="act_mail_body"/>
+                            <group col="2" colspan="4" string="Special Keywords">
+                                <label align="0.0" string="%%(case_id)s = Case ID"/>
+                                <label align="0.0" string="%%(case_subject)s = Case subject"/>
+                                <label align="0.0" string="%%(case_date)s = Creation date"/>
+                                <label align="0.0" string="%%(email_from)s = Partner email"/>
+                                <label align="0.0" string="%%(partner)s = Partner name"/>
+                                <label align="0.0" string="%%(partner_email)s = Partner email"/>
+                                <label align="0.0" string="%%(case_user)s = Responsible name"/>
+                                <label align="0.0" string="%%(case_user_email)s = Responsible email"/>
+                                <label align="0.0" string="%%(case_user_phone)s = Responsible phone"/>
                             </group>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='crm_case_rule_tree-view' model='ir.ui.view'>
-            <field name='name'>crm.case.rule.tree</field>
-            <field name='model'>crm.case.rule</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Case Rule'>
-                    <field name='name'/>
-                    <field name='active'/>
+        <record id="crm_case_rule_tree-view" model="ir.ui.view">
+            <field name="name">crm.case.rule.tree</field>
+            <field name="model">crm.case.rule</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Case Rule">
+                    <field name="name"/>
+                    <field name="active"/>
                 </tree>
             </field>
         </record>
-        <record id='crm_case_rule-act' model='ir.actions.act_window'>
-            <field name='name'>Rules</field>
-            <field name='res_model'>crm.case.rule</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='crm_case_rule_tree-view'/>
+        <record id="crm_case_rule-act" model="ir.actions.act_window">
+            <field name="name">Rules</field>
+            <field name="res_model">crm.case.rule</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_case_rule_tree-view"/>
         </record>
-        <menuitem name='CRM &amp; SRM/Configuration/Cases/Rules' groups='base.group_admin' action='crm_case_rule-act' id='menu_crm_case_rule-act'/>
+        <menuitem action="crm_case_rule-act" groups="base.group_admin" id="menu_crm_case_rule-act" parent="crm.next_id_51"/>
         
         
         <!-- Cases -->
-        <record id='crm_case_log_tree-view' model='ir.ui.view'>
-            <field name='name'>crm.case.log.tree</field>
-            <field name='model'>crm.case.log</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Case logs'>
-                    <field name='date'/>
-                    <field name='name'/>
-                    <field name='som'/>
-                    <field name='user_id'/>
-                    <field name='canal_id'/>
+        <record id="crm_case_log_tree-view" model="ir.ui.view">
+            <field name="name">crm.case.log.tree</field>
+            <field name="model">crm.case.log</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Case logs">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="som"/>
+                    <field name="user_id"/>
+                    <field name="canal_id"/>
                 </tree>
             </field>
         </record>
         
         
-        <record id='crm_case_history_tree-view' model='ir.ui.view'>
-            <field name='name'>crm.case.history.tree</field>
-            <field name='model'>crm.case.history</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Case History'>
-                    <field name='date'/>
-                    <field name='name'/>
-                    <field name='som'/>
-                    <field name='user_id'/>
-                    <field name='canal_id'/>
+        <record id="crm_case_history_tree-view" model="ir.ui.view">
+            <field name="name">crm.case.history.tree</field>
+            <field name="model">crm.case.history</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Case History">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="som"/>
+                    <field name="user_id"/>
+                    <field name="canal_id"/>
                 </tree>
             </field>
         </record>
         
-        <record id='crm_case_calendar-view' model='ir.ui.view'>
-            <field name='name'>crm.case.calendar</field>
-            <field name='model'>crm.case</field>
-            <field name='type'>calendar</field>
-            <field name='arch' type='xml'>
-                <calendar color='user_id' date_stop='date_deadline' day_length='12' string='Cases' date_start='date'>
-                    <field name='name'/>
-                    <field name='partner_id'/>
-                    <field name='state'/>
+        <record id="crm_case_calendar-view" model="ir.ui.view">
+            <field name="name">crm.case.calendar</field>
+            <field name="model">crm.case</field>
+            <field name="type">calendar</field>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_start="date" date_stop="date_deadline" day_length="12" string="Cases">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="state"/>
                 </calendar>
             </field>
         </record>
         
         
-        <record id='crm_case_tree-view' model='ir.ui.view'>
-            <field name='name'>crm.case.tree</field>
-            <field name='model'>crm.case</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree colors='red:date_deadline&lt;current_date and state==&apos;open&apos;' string='Cases'>
-                    <field name='id'/>
-                    <field name='date'/>
-                    <field name='date_deadline'/>
-                    <field name='name'/>
-                    <field name='partner_id'/>
-                    <field name='user_id'/>
-                    <field name='priority'/>
-                    <field name='planned_revenue' sum='Planned revenue'/>
-                    <field name='planned_cost' sum='Planned costs'/>
-                    <field name='state'/>
+        <record id="crm_case_tree-view" model="ir.ui.view">
+            <field name="name">crm.case.tree</field>
+            <field name="model">crm.case</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:date_deadline&lt;current_date and state=='open'" string="Cases">
+                    <field name="id"/>
+                    <field name="date"/>
+                    <field name="date_deadline"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <field name="priority"/>
+                    <field name="planned_revenue" sum="Planned revenue"/>
+                    <field name="planned_cost" sum="Planned costs"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='crm_case-view' model='ir.ui.view'>
-            <field name='name'>crm.case.form</field>
-            <field name='model'>crm.case</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Cases'>
+        <record id="crm_case-view" model="ir.ui.view">
+            <field name="name">crm.case.form</field>
+            <field name="model">crm.case</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cases">
                     <notebook>
-                        <page string='General'>
-                            <group col='8' colspan='4'>
-                                <field name='name' select='1' colspan='4'/>
-                                <field name='section_id' colspan='3'/>
-                                <field name='date' select='1'/>
-                                <field name='date_deadline' select='2'/>
-                                <field name='priority' colspan='3'/>
-                                <field name='partner_id' on_change='onchange_partner_id(partner_id, email_from)' select='1' colspan='4'/>
-                                <field name='partner_address_id' on_change='onchange_partner_address_id(partner_address_id, email_from)' select='2' colspan='3'/>
+                        <page string="General">
+                            <group col="8" colspan="4">
+                                <field colspan="4" name="name" select="1"/>
+                                <field colspan="3" name="section_id"/>
+                                <field name="date" select="1"/>
+                                <field name="date_deadline" select="2"/>
+                                <field colspan="3" name="priority"/>
+                                <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
+                                <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
                                 <newline/>
-                                <field name='email_from' select='2' colspan='3'/>
-                                <button name='remind_partner' type='object' states='open,pending' string='Send Reminder'/>
-                                <field name='user_id' select='1'/>
-                                <button name='remind_user' type='object' states='open,pending' string='Send Reminder'/>
+                                <field colspan="3" name="email_from" select="2"/>
+                                <button name="remind_partner" states="open,pending" string="Send Reminder" type="object"/>
+                                <field name="user_id" select="1"/>
+                                <button name="remind_user" states="open,pending" string="Send Reminder" type="object"/>
                             </group>
                             
-                            <separator colspan='4'/>
-                            <field name='history_line' mode='tree,form' nolabel='1' colspan='2'>
-                                <form string='Communication history'>
-                                    <group col='6' colspan='4'>
-                                        <field name='date' select='1'/>
-                                        <field name='email' select='1'/>
-                                        <field name='canal_id' select='2'/>
+                            <separator colspan="4"/>
+                            <field colspan="2" mode="tree,form" name="history_line" nolabel="1">
+                                <form string="Communication history">
+                                    <group col="6" colspan="4">
+                                        <field name="date" select="1"/>
+                                        <field name="email" select="1"/>
+                                        <field name="canal_id" select="2"/>
                                     </group>
                                     <newline/>
-                                    <field name='description' nolabel='1' colspan='4' select='2'/>
+                                    <field colspan="4" name="description" nolabel="1" select="2"/>
                                 </form>
-                                <tree string='Communication history'>
-                                    <field name='note'/>
+                                <tree string="Communication history">
+                                    <field name="note"/>
                                 </tree>
                             </field>
-                            <group col='2' expand='1' colspan='2'>
-                                <field name='canal_id'/>
-                                <button name='add_reply' type='object' states='open' string='Add Last Mail for Replying' colspan='2'/>
-                                <field name='description' nolabel='1' colspan='2' select='2'/>
-                                <button name='case_log_reply' type='object' states='open' string='Send Partner &amp; Historize'/>
-                                <button name='case_log' type='object' states='open' string='Historize'/>
+                            <group col="2" colspan="2" expand="1">
+                                <field name="canal_id"/>
+                                <button colspan="2" name="add_reply" states="open" string="Add Last Mail for Replying" type="object"/>
+                                <field colspan="2" name="description" nolabel="1" select="2"/>
+                                <button name="case_log_reply" states="open" string="Send Partner &amp; Historize" type="object"/>
+                                <button name="case_log" states="open" string="Historize" type="object"/>
                             </group>
                             
-                            <separator colspan='4'/>
-                            <group col='8' colspan='4'>
-                                <field name='state' select='1'/>
-                                <button name='case_close' type='object' states='open,draft,pending' string='Close'/>
-                                <button name='case_open' type='object' states='draft,pending' string='Open'/>
-                                <button name='case_cancel' type='object' states='draft,open,pending' string='Cancel'/>
-                                <button name='case_pending' type='object' states='draft,open' string='Pending'/>
-                                <button name='case_escalate' type='object' states='open,draft,pending' string='Escalate'/>
-                                <button name='case_reset' type='object' states='done,cancel' string='Reset to Draft'/>
+                            <separator colspan="4"/>
+                            <group col="8" colspan="4">
+                                <field name="state" select="1"/>
+                                <button name="case_close" states="open,draft,pending" string="Close" type="object"/>
+                                <button name="case_open" states="draft,pending" string="Open" type="object"/>
+                                <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object"/>
+                                <button name="case_pending" states="draft,open" string="Pending" type="object"/>
+                                <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object"/>
+                                <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object"/>
                             </group>
                         </page>
-                        <page string='Extra Info'>
-                            <field name='id' select='1'/>
-                            <field name='active' select='2'/>
-                            <field name='email_cc' colspan='4'/>
-                            <field name='categ_id' on_change='onchange_categ_id(categ_id)' select='2'/>
-                            <field name='som' select='2'/>
-                            <separator colspan='4' string='Dates'/>
-                            <field name='create_date'/>
-                            <field name='date_closed'/>
-                            <field name='date_action_last'/>
-                            <field name='date_action_next'/>
-                            <separator colspan='4' string='Estimates'/>
-                            <field name='planned_revenue'/>
-                            <field name='planned_cost'/>
-                            <field name='probability'/>
-                            <separator colspan='4' string='References'/>
-                            <field name='ref' colspan='4'/>
-                            <field name='ref2' colspan='4'/>
+                        <page string="Extra Info">
+                            <field name="id" select="1"/>
+                            <field name="active" select="2"/>
+                            <field colspan="4" name="email_cc"/>
+                            <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
+                            <field name="som" select="2"/>
+                            <separator colspan="4" string="Dates"/>
+                            <field name="create_date"/>
+                            <field name="date_closed"/>
+                            <field name="date_action_last"/>
+                            <field name="date_action_next"/>
+                            <separator colspan="4" string="Estimates"/>
+                            <field name="planned_revenue"/>
+                            <field name="planned_cost"/>
+                            <field name="probability"/>
+                            <separator colspan="4" string="References"/>
+                            <field colspan="4" name="ref"/>
+                            <field colspan="4" name="ref2"/>
                         </page>
-                        <page string='History'>
-                            <field name='log_ids' nolabel='1' colspan='4'>
-                                <form string='Actions'>
-                                    <separator string='Action Information' colspan='4'/>
-                                    <field name='name' colspan='4'/>
-                                    <field name='date' select='2'/>
-                                    <field name='user_id' select='2'/>
-                                    <field name='som' select='2'/>
-                                    <field name='canal_id'/>
+                        <page string="History">
+                            <field colspan="4" name="log_ids" nolabel="1">
+                                <form string="Actions">
+                                    <separator colspan="4" string="Action Information"/>
+                                    <field colspan="4" name="name"/>
+                                    <field name="date" select="2"/>
+                                    <field name="user_id" select="2"/>
+                                    <field name="som" select="2"/>
+                                    <field name="canal_id"/>
                                 </form>
                             </field>
                         </page>
@@ -358,202 +358,202 @@
             </field>
         </record>
         
-        <record id='crm_case_categ0-act' model='ir.actions.act_window'>
-            <field name='name'>All Cases</field>
-            <field name='res_model'>crm.case</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='crm_case_tree-view'/>
+        <record id="crm_case_categ0-act" model="ir.actions.act_window">
+            <field name="name">All Cases</field>
+            <field name="res_model">crm.case</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_case_tree-view"/>
         </record>
-        <menuitem name='CRM &amp; SRM/Cases/All Cases' action='crm_case_categ0-act' id='menu_crm_case_categ0-act'/>
+        <menuitem action="crm_case_categ0-act" id="menu_crm_case_categ0-act" parent="crm.next_id_52"/>
         
-        <record id='crm_case_categ0-act_open' model='ir.actions.act_window'>
-            <field name='name'>Open Cases</field>
-            <field name='res_model'>crm.case</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
+        <record id="crm_case_categ0-act_open" model="ir.actions.act_window">
+            <field name="name">Open Cases</field>
+            <field name="res_model">crm.case</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Cases/All Cases/' action='crm_case_categ0-act_open' id='menu_crm_case_categ0-act_open'/>
+        <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act"/>
         
         
-        <record id='crm_case_categ0-act_my' model='ir.actions.act_window'>
-            <field name='name'>My cases</field>
-            <field name='res_model'>crm.case</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form,calendar</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="crm_case_categ0-act_my" model="ir.actions.act_window">
+            <field name="name">My cases</field>
+            <field name="res_model">crm.case</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Cases/My Cases' action='crm_case_categ0-act_my' id='menu_crm_case_categ0-act_my'/>
-        <record id='crm_case_categ0-act_my_open' model='ir.actions.act_window'>
-            <field name='name'>My Open Cases</field>
-            <field name='res_model'>crm.case</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form,calendar</field>
-            <field name='domain'>[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
+        <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52"/>
+        <record id="crm_case_categ0-act_my_open" model="ir.actions.act_window">
+            <field name="name">My Open Cases</field>
+            <field name="res_model">crm.case</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Cases/My Cases/' action='crm_case_categ0-act_my_open' id='menu_crm_case_categ0-act_my_open'/>
+        <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my"/>
         
         
         
         
-        <record id='crm_case_section_open_act' model='ir.actions.act_window'>
-            <field name='name'>crm.case.section.open</field>
-            <field name='res_model'>crm.case</field>
-            <field name='domain'>[('section_id','child_of',[active_id])]</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form,calendar</field>
+        <record id="crm_case_section_open_act" model="ir.actions.act_window">
+            <field name="name">crm.case.section.open</field>
+            <field name="res_model">crm.case</field>
+            <field name="domain">[('section_id','child_of',[active_id])]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
         </record>
-        <record id='ir_open_section_case' model='ir.values'>
-            <field name='key2' eval='&apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;crm.case.section&apos;'/>
-            <field name='name'>Open Cases</field>
-            <field name='value' eval='&apos;ir.actions.act_window,%d&apos;%crm_case_section_open_act'/>
-            <field name='object' eval='True'/>
+        <record id="ir_open_section_case" model="ir.values">
+            <field eval="'tree_but_open'" name="key2"/>
+            <field eval="'crm.case.section'" name="model"/>
+            <field name="name">Open Cases</field>
+            <field eval="'ir.actions.act_window,%d'%crm_case_section_open_act" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         
-        <record id='crm_case_history-view' model='ir.ui.view'>
-            <field name='name'>crm.case.history.form</field>
-            <field name='model'>crm.case.history</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Cases'>
-                    <separator string='Case Description' colspan='4'/>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='user_id' select='1'/>
-                    <field name='case_id' select='2'/>
-                    <field name='som' select='2'/>
-                    <field name='canal_id' select='2'/>
-                    <field name='description' colspan='4' select='2'/>
+        <record id="crm_case_history-view" model="ir.ui.view">
+            <field name="name">crm.case.history.form</field>
+            <field name="model">crm.case.history</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cases">
+                    <separator colspan="4" string="Case Description"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="case_id" select="2"/>
+                    <field name="som" select="2"/>
+                    <field name="canal_id" select="2"/>
+                    <field colspan="4" name="description" select="2"/>
                 </form>
             </field>
         </record>
-        <record id='crm_case_history-act' model='ir.actions.act_window'>
-            <field name='name'>All Histories</field>
-            <field name='res_model'>crm.case.history</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='crm_case_history_tree-view'/>
+        <record id="crm_case_history-act" model="ir.actions.act_window">
+            <field name="name">All Histories</field>
+            <field name="res_model">crm.case.history</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="crm_case_history_tree-view"/>
         </record>
-        <menuitem name='CRM &amp; SRM/Cases/Cases Histories' groups='base.group_admin' id='menu_crm_case_history-act_main'/>
-        <menuitem name='CRM &amp; SRM/Cases/Cases Histories/All Histories' groups='base.group_admin' action='crm_case_history-act' id='menu_crm_case_history-act'/>
-        <record id='crm_case_history_my-act' model='ir.actions.act_window'>
-            <field name='name'>My Histories</field>
-            <field name='res_model'>crm.case.history</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <menuitem groups="base.group_admin" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>
+        <menuitem action="crm_case_history-act" groups="base.group_admin" id="menu_crm_case_history-act" parent="crm.menu_crm_case_history-act_main"/>
+        <record id="crm_case_history_my-act" model="ir.actions.act_window">
+            <field name="name">My Histories</field>
+            <field name="res_model">crm.case.history</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Cases/Cases Histories/' groups='base.group_admin' action='crm_case_history_my-act' id='menu_crm_case_history_my-act'/>
+        <menuitem action="crm_case_history_my-act" groups="base.group_admin" id="menu_crm_case_history_my-act" parent="crm.menu_crm_case_history-act_main"/>
         
-        <record id='crm_segmentation_line_tree-view' model='ir.ui.view'>
-            <field name='name'>crm.segmentation.line.tree</field>
-            <field name='model'>crm.segmentation.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Partner Segmentation Lines'>
-                    <field name='name'/>
-                    <field name='expr_name'/>
-                    <field name='expr_operator'/>
-                    <field name='expr_value'/>
-                    <field name='operator'/>
+        <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
+            <field name="name">crm.segmentation.line.tree</field>
+            <field name="model">crm.segmentation.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Partner Segmentation Lines">
+                    <field name="name"/>
+                    <field name="expr_name"/>
+                    <field name="expr_operator"/>
+                    <field name="expr_value"/>
+                    <field name="operator"/>
                 </tree>
             </field>
         </record>
         
-        <record id='crm_segmentation_line-view' model='ir.ui.view'>
-            <field name='name'>crm.segmentation.line.form</field>
-            <field name='model'>crm.segmentation.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Partner Segmentation Lines'>
-                    <field name='name' select='1' colspan='4'/>
-                    <group col='2' colspan='4'>
-                        <field name='expr_name' select='2'/>
-                        <field name='expr_operator' select='2'/>
-                        <field name='expr_value' select='2'/>
+        <record id="crm_segmentation_line-view" model="ir.ui.view">
+            <field name="name">crm.segmentation.line.form</field>
+            <field name="model">crm.segmentation.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Partner Segmentation Lines">
+                    <field colspan="4" name="name" select="1"/>
+                    <group col="2" colspan="4">
+                        <field name="expr_name" select="2"/>
+                        <field name="expr_operator" select="2"/>
+                        <field name="expr_value" select="2"/>
                     </group>
                     <newline/>
-                    <field name='operator'/>
+                    <field name="operator"/>
                 </form>
             </field>
         </record>
         
-        <record id='crm_segmentation-view' model='ir.ui.view'>
-            <field name='name'>crm.segmentation.form</field>
-            <field name='model'>crm.segmentation</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Partner Segmentation'>
+        <record id="crm_segmentation-view" model="ir.ui.view">
+            <field name="name">crm.segmentation.form</field>
+            <field name="model">crm.segmentation</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Partner Segmentation">
                     <notebook>
-                        <page string='Segmentation'>
-                            <separator string='Segmentation Description' colspan='4'/>
-                            <field name='name' select='1'/>
-                            <field name='exclusif'/>
+                        <page string="Segmentation">
+                            <separator colspan="4" string="Segmentation Description"/>
+                            <field name="name" select="1"/>
+                            <field name="exclusif"/>
                             <newline/>
-                            <field name='categ_id' select='2' colspan='2'/>
+                            <field colspan="2" name="categ_id" select="2"/>
                             <newline/>
-                            <field name='description' select='2' colspan='4'/>
-                            <field name='state'/>
-                            <group col='3' colspan='2'>
-                                <button name='process_start' type='object' states='not running' string='Compute Segmentation'/>
-                                <button name='process_stop' type='object' states='running' string='Stop Process'/>
-                                <button name='process_continue' type='object' states='running' string='Continue Process'/>
+                            <field colspan="4" name="description" select="2"/>
+                            <field name="state"/>
+                            <group col="3" colspan="2">
+                                <button name="process_start" states="not running" string="Compute Segmentation" type="object"/>
+                                <button name="process_stop" states="running" string="Stop Process" type="object"/>
+                                <button name="process_continue" states="running" string="Continue Process" type="object"/>
                             </group>
                         </page>
-                        <page string='Sales Purchase'>
-                            <field name='sales_purchase_active'/>
-                            <separator string='State of Mind Computation' colspan='4'/>
-                            <field name='som_interval'/>
-                            <field name='som_interval_max'/>
-                            <field name='som_interval_decrease'/>
-                            <field name='som_interval_default'/>
-                            <separator string='Segmentation Test' colspan='4'/>
-                            <field name='segmentation_line' widget='one2many_list' colspan='4'/>
+                        <page string="Sales Purchase">
+                            <field name="sales_purchase_active"/>
+                            <separator colspan="4" string="State of Mind Computation"/>
+                            <field name="som_interval"/>
+                            <field name="som_interval_max"/>
+                            <field name="som_interval_decrease"/>
+                            <field name="som_interval_default"/>
+                            <separator colspan="4" string="Segmentation Test"/>
+                            <field colspan="4" name="segmentation_line" widget="one2many_list"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='crm_segmentation_tree-view' model='ir.ui.view'>
-            <field name='name'>crm.segmentation.tree</field>
-            <field name='model'>crm.segmentation</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Partner Segmentations'>
-                    <field name='name'/>
-                    <field name='description'/>
-                    <field name='categ_id'/>
+        <record id="crm_segmentation_tree-view" model="ir.ui.view">
+            <field name="name">crm.segmentation.tree</field>
+            <field name="model">crm.segmentation</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Partner Segmentations">
+                    <field name="name"/>
+                    <field name="description"/>
+                    <field name="categ_id"/>
                 </tree>
             </field>
         </record>
         
-        <record id='crm_segmentation-act' model='ir.actions.act_window'>
-            <field name='name'>Segmentations</field>
-            <field name='res_model'>crm.segmentation</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='crm_segmentation-view'/>
+        <record id="crm_segmentation-act" model="ir.actions.act_window">
+            <field name="name">Segmentations</field>
+            <field name="res_model">crm.segmentation</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_segmentation-view"/>
         </record>
         
-        <record id='crm_segmentation_tree-act' model='ir.actions.act_window'>
-            <field name='name'>Segmentations</field>
-            <field name='res_model'>crm.segmentation</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="crm_segmentation_tree-act" model="ir.actions.act_window">
+            <field name="name">Segmentations</field>
+            <field name="res_model">crm.segmentation</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Configuration/Segmentations/Segmentation Rules' action='crm_segmentation_tree-act' id='menu_crm_segmentation-act'/>
-        <menuitem name='CRM &amp; SRM/Automatic Segmentations' action='crm_segmentation_tree-act' id='menu_crm_segmentation_tree-act'/>
+        <menuitem id="next_id_53" name="Segmentations" parent="crm.menu_crm_configuration"/><menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation-act" parent="next_id_53"/>
+        <menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation_tree-act" parent="crm.menu_crm"/>
         
-        <act_window name='Open cases' view_type='form' domain='[(&apos;section_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;done&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;cancel&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;pending&apos;)]' id='act_crm_case_section_crm_case_opened' src_model='crm.case.section' view_mode='tree,form,calendar' res_model='crm.case'/>
+        <act_window domain="[('section_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_section_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.section" view_mode="tree,form,calendar" view_type="form"/>
         
-        <act_window name='Open cases' view_type='form' domain='[(&apos;categ_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;done&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;cancel&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;pending&apos;)]' id='act_crm_case_categ_crm_case_opened' src_model='crm.case.categ' view_mode='tree,form,calendar' res_model='crm.case'/>
+        <act_window domain="[('categ_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_categ_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.categ" view_mode="tree,form,calendar" view_type="form"/>
         
-        <act_window name='Open cases' view_type='form' domain='[(&apos;partner_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;done&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;cancel&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;pending&apos;)]' id='act_res_partner_2_crm_case_opened' src_model='res.partner' view_mode='tree,form,calendar' res_model='crm.case'/>
+        <act_window domain="[('partner_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner" view_mode="tree,form,calendar" view_type="form"/>
         
-        <act_window name='Open cases' view_type='form' domain='[(&apos;canal_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;done&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;cancel&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;pending&apos;)]' id='act_res_partner_canal_2_crm_case_opened' src_model='res.partner.canal' view_mode='tree,form,calendar' res_model='crm.case'/>
+        <act_window domain="[('canal_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_canal_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner.canal" view_mode="tree,form,calendar" view_type="form"/>
         
-        <act_window name='Open cases' view_type='form' domain='[(&apos;user_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;done&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;cancel&apos;),(&apos;state&apos;,&apos;&lt;&gt;&apos;,&apos;pending&apos;)]' id='act_res_users_2_crm_case_opened' src_model='res.users' view_mode='tree,form,calendar' res_model='crm.case'/>
+        <act_window domain="[('user_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_users_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.users" view_mode="tree,form,calendar" view_type="form"/>
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
index 808178ccb60..d5c3ae1672d 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard name='crm.case.section.menu' id='wizard_case_section_menu' model='crm.case.section' string='Create menus for a case section'/>
-        <menuitem name='CRM &amp; SRM/Configuration/Create Menus For a New Section' action='wizard_case_section_menu' type='wizard' id='menu_wizard_case_section_menu'/>
+        <wizard id="wizard_case_section_menu" model="crm.case.section" name="crm.case.section.menu" string="Create menus for a case section"/>
+        <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/custom/custom_view.xml b/addons/custom/custom_view.xml
index 92a655a3007..8a08256ce74 100644
--- a/addons/custom/custom_view.xml
+++ b/addons/custom/custom_view.xml
@@ -1,11 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id='group_compta_user' model='res.groups'>
-            <field name='name'>grcompta</field>
+        <record id="group_compta_user" model="res.groups">
+            <field name="name">grcompta</field>
         </record>
-        <record id='group_compta_admin' model='res.groups'>
-            <field name='name'>grcomptaadmin</field>
+        <record id="group_compta_admin" model="res.groups">
+            <field name="name">grcomptaadmin</field>
         </record>
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index 1a22b0e123f..67c050de499 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="True">
-        <record model="ir.property" id="property_delivery_carrier" forcecreate="True">
+        <record forcecreate="True" id="property_delivery_carrier" model="ir.property">
             <field name="name">property_delivery_carrier</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index baed5f8ae06..bb9c6a5e89d 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!-- Create a transporter -->
         
-        <record model="res.partner" id="delivery_partner">
+        <record id="delivery_partner" model="res.partner">
             <field name="name">Default Transporter</field>
             <field name="website">http://tinyerp.com</field>
         </record>
@@ -15,10 +15,10 @@
         
         <!-- Create a partner -->
         
-        <record model="product.product" id="delivery_product">
+        <record id="delivery_product" model="product.product">
             <field name="name">Default Delivery</field>
             <field name="type">service</field>
-            <field name="categ_id" search="[]" model="product.category"/>
+            <field model="product.category" name="categ_id" search="[]"/>
         </record>
         
         <!-- Carrier -->
@@ -31,34 +31,34 @@
         
         <!-- Carrier Grids -->
         
-        <record model="delivery.grid" id="delivery_grid">
+        <record id="delivery_grid" model="delivery.grid">
             <field name="name">Default Delivery Grid</field>
             <field name="carrier_id" ref="delivery_carrier"/>
         </record>
-        <record model="delivery.grid.line" id="delivery_grid_line3">
+        <record id="delivery_grid_line3" model="delivery.grid.line">
             <field name="name">Franco, price &gt;= 300</field>
             <field name="grid_id" ref="delivery_grid"/>
-            <field name="max_value" eval="300"/>
+            <field eval="300" name="max_value"/>
             <field name="operator">&gt;=</field>
             <field name="type">price</field>
-            <field name="list_price" eval="0"/>
-            <field name="standard_price" eval="20"/>
+            <field eval="0" name="list_price"/>
+            <field eval="20" name="standard_price"/>
         </record>
-        <record model="delivery.grid.line" id="delivery_grid_line1">
+        <record id="delivery_grid_line1" model="delivery.grid.line">
             <field name="name">Weight &lt;= 250</field>
             <field name="grid_id" ref="delivery_grid"/>
-            <field name="max_value" eval="250"/>
-            <field name="list_price" eval="100"/>
-            <field name="standard_price" eval="80"/>
+            <field eval="250" name="max_value"/>
+            <field eval="100" name="list_price"/>
+            <field eval="80" name="standard_price"/>
         </record>
-        <record model="delivery.grid.line" id="delivery_grid_line2">
+        <record id="delivery_grid_line2" model="delivery.grid.line">
             <field name="name">Weight &gt; 250</field>
             <field name="grid_id" ref="delivery_grid"/>
             <field name="operator">&gt;=</field>
-            <field name="max_value" eval="250"/>
-            <field name="list_price" eval="120"/>
-            <field name="standard_price" eval="100"/>
+            <field eval="250" name="max_value"/>
+            <field eval="120" name="list_price"/>
+            <field eval="100" name="standard_price"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index fdbc9b0d5af..4aaced6c4f6 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -1,198 +1,198 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!-- Delivery Carriers -->
-        <menuitem name='Delivery' sequence='4' id='menu_delivery' parent='stock.menu_stock_configuration'/>
+        <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" sequence="4"/>
         
-        <record id='view_delivery_carrier_tree' model='ir.ui.view'>
-            <field name='name'>delivery.carrier.tree</field>
-            <field name='model'>delivery.carrier</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Carrier'>
-                    <field name='name'/>
-                    <field name='partner_id'/>
+        <record id="view_delivery_carrier_tree" model="ir.ui.view">
+            <field name="name">delivery.carrier.tree</field>
+            <field name="model">delivery.carrier</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Carrier">
+                    <field name="name"/>
+                    <field name="partner_id"/>
                 </tree>
             </field>
         </record>
-        <record id='view_delivery_carrier_form' model='ir.ui.view'>
-            <field name='name'>delivery.carrier.form</field>
-            <field name='model'>delivery.carrier</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Carrier'>
-                    <field name='name' select='1'/>
-                    <field name='active' select='1'/>
-                    <field name='partner_id' select='1'/>
-                    <field name='product_id' select='1'/>
+        <record id="view_delivery_carrier_form" model="ir.ui.view">
+            <field name="name">delivery.carrier.form</field>
+            <field name="model">delivery.carrier</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Carrier">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="product_id" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='action_delivery_carrier_form' model='ir.actions.act_window'>
-            <field name='name'>Delivery Method</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>delivery.carrier</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_delivery_carrier_form" model="ir.actions.act_window">
+            <field name="name">Delivery Method</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">delivery.carrier</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action='action_delivery_carrier_form' id='menu_action_delivery_carrier_form' parent='menu_delivery'/>
+        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery"/>
         
         <!-- Delivery Grids -->
-        <record id='view_delivery_grid_tree' model='ir.ui.view'>
-            <field name='name'>delivery.grid.tree</field>
-            <field name='model'>delivery.grid</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Delivery grids'>
-                    <field name='sequence'/>
-                    <field name='carrier_id'/>
-                    <field name='name'/>
+        <record id="view_delivery_grid_tree" model="ir.ui.view">
+            <field name="name">delivery.grid.tree</field>
+            <field name="model">delivery.grid</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Delivery grids">
+                    <field name="sequence"/>
+                    <field name="carrier_id"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_delivery_grid_form' model='ir.ui.view'>
-            <field name='name'>delivery.grid.form</field>
-            <field name='model'>delivery.grid</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Delivery grids'>
+        <record id="view_delivery_grid_form" model="ir.ui.view">
+            <field name="name">delivery.grid.form</field>
+            <field name="model">delivery.grid</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Delivery grids">
                     <notebook>
-                        <page string='Grid definition'>
-                            <field name='name' select='1'/>
-                            <field name='active' select='1'/>
-                            <field name='carrier_id' select='1'/>
-                            <field name='sequence' select='1'/>
-                            <separator colspan='4' string='Grid Lines'/>
-                            <field name='line_ids' nolabel='1' select='1' colspan='4'/>
+                        <page string="Grid definition">
+                            <field name="name" select="1"/>
+                            <field name="active" select="1"/>
+                            <field name="carrier_id" select="1"/>
+                            <field name="sequence" select="1"/>
+                            <separator colspan="4" string="Grid Lines"/>
+                            <field colspan="4" name="line_ids" nolabel="1" select="1"/>
                         </page>
-                        <page string='Destination'>
-                            <field name='country_ids' colspan='4'/>
-                            <field name='state_ids' colspan='4'/>
-                            <field name='zip_from'/>
-                            <field name='zip_to'/>
+                        <page string="Destination">
+                            <field colspan="4" name="country_ids"/>
+                            <field colspan="4" name="state_ids"/>
+                            <field name="zip_from"/>
+                            <field name="zip_to"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_delivery_grid_form' model='ir.actions.act_window'>
-            <field name='name'>Delivery Pricelist</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>delivery.grid</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_delivery_grid_form" model="ir.actions.act_window">
+            <field name="name">Delivery Pricelist</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">delivery.grid</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action='action_delivery_grid_form' id='menu_action_delivery_grid_form' parent='menu_delivery'/>
+        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
         
-        <record id='view_delivery_grid_line_form' model='ir.ui.view'>
-            <field name='name'>delivery.grid.line.form</field>
-            <field name='model'>delivery.grid.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Grid Lines'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='type' string='Condition'/>
-                    <field name='operator' nolabel='1'/>
-                    <field name='max_value' nolabel='1'/>
-                    <field name='list_price'/>
-                    <field name='standard_price'/>
-                    <field name='price_type'/>
-                    <field name='variable_factor'/>
+        <record id="view_delivery_grid_line_form" model="ir.ui.view">
+            <field name="name">delivery.grid.line.form</field>
+            <field name="model">delivery.grid.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Grid Lines">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="type" string="Condition"/>
+                    <field name="operator" nolabel="1"/>
+                    <field name="max_value" nolabel="1"/>
+                    <field name="list_price"/>
+                    <field name="standard_price"/>
+                    <field name="price_type"/>
+                    <field name="variable_factor"/>
                 </form>
             </field>
         </record>
-        <record id='view_delivery_grid_line_tree' model='ir.ui.view'>
-            <field name='name'>delivery.grid.line.tree</field>
-            <field name='model'>delivery.grid.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Grid Lines'>
-                    <field name='name'/>
-                    <field name='type'/>
-                    <field name='operator'/>
-                    <field name='max_value'/>
-                    <field name='list_price'/>
-                    <field name='standard_price'/>
+        <record id="view_delivery_grid_line_tree" model="ir.ui.view">
+            <field name="name">delivery.grid.line.tree</field>
+            <field name="model">delivery.grid.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Grid Lines">
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="operator"/>
+                    <field name="max_value"/>
+                    <field name="list_price"/>
+                    <field name="standard_price"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_order_withcarrier_form' model='ir.ui.view'>
-            <field name='name'>delivery.sale.order_withcarrier.form.view</field>
-            <field name='type'>form</field>
-            <field name='model'>sale.order</field>
-            <field name='inherit_id' ref='sale.view_order_form'/>
-            <field name='arch' type='xml'>
-                <field name='client_order_ref' position='after'>
-                    <field name='carrier_id'/>
+        <record id="view_order_withcarrier_form" model="ir.ui.view">
+            <field name="name">delivery.sale.order_withcarrier.form.view</field>
+            <field name="type">form</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <field name="client_order_ref" position="after">
+                    <field name="carrier_id"/>
                      
                 </field>
             </field>
         </record>
         
-        <record id='view_picking_withcarrier_form' model='ir.ui.view'>
-            <field name='name'>delivery.stock.picking_withcarrier.form.view</field>
-            <field name='type'>form</field>
-            <field name='model'>stock.picking</field>
-            <field name='inherit_id' ref='stock.view_picking_delivery_form'/>
-            <field name='arch' type='xml'>
-                <field name='address_id' position='after'>
-                    <field name='volume'/>
-                    <field name='weight'/>
-                    <field name='carrier_id'/>
+        <record id="view_picking_withcarrier_form" model="ir.ui.view">
+            <field name="name">delivery.stock.picking_withcarrier.form.view</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
+            <field name="arch" type="xml">
+                <field name="address_id" position="after">
+                    <field name="volume"/>
+                    <field name="weight"/>
+                    <field name="carrier_id"/>
                 </field>
             </field>
         </record>
-        <record id='view_picking_withcarrier_out_form' model='ir.ui.view'>
-            <field name='name'>delivery.stock.picking_withcarrier.out.form.view</field>
-            <field name='type'>form</field>
-            <field name='model'>stock.picking</field>
-            <field name='inherit_id' ref='stock.view_picking_out_form'/>
-            <field name='arch' type='xml'>
-                <field name='address_id' position='after'>
-                    <field name='volume'/>
-                    <field name='weight'/>
-                    <field name='carrier_id'/>
+        <record id="view_picking_withcarrier_out_form" model="ir.ui.view">
+            <field name="name">delivery.stock.picking_withcarrier.out.form.view</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="arch" type="xml">
+                <field name="address_id" position="after">
+                    <field name="volume"/>
+                    <field name="weight"/>
+                    <field name="carrier_id"/>
                 </field>
             </field>
         </record>
         
-        <record id='view_picking_withcarrier_delivery_form' model='ir.ui.view'>
-            <field name='name'>delivery.stock.picking_withcarrier.delivery.form.view</field>
-            <field name='type'>form</field>
-            <field name='model'>stock.picking</field>
-            <field name='inherit_id' ref='stock.view_picking_delivery_form'/>
-            <field name='arch' type='xml'>
-                <field name='address_id' position='after'>
-                    <field name='volume'/>
-                    <field name='weight'/>
-                    <field name='carrier_id'/>
+        <record id="view_picking_withcarrier_delivery_form" model="ir.ui.view">
+            <field name="name">delivery.stock.picking_withcarrier.delivery.form.view</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
+            <field name="arch" type="xml">
+                <field name="address_id" position="after">
+                    <field name="volume"/>
+                    <field name="weight"/>
+                    <field name="carrier_id"/>
                 </field>
             </field>
         </record>
         
-        <record id='action_picking_tree4' model='ir.actions.act_window'>
-            <field name='name'>Packings to be invoiced</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
+        <record id="action_picking_tree4" model="ir.actions.act_window">
+            <field name="name">Packings to be invoiced</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
         </record>
-        <menuitem action='action_picking_tree4' id='menu_action_picking_tree3' parent='stock.menu_action_picking_tree'/>
+        <menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree"/>
         
         
-        <record id='action_picking_tree5' model='ir.actions.act_window'>
-            <field name='name'>Generate Draft Invoices On Receptions</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]</field>
+        <record id="action_picking_tree5" model="ir.actions.act_window">
+            <field name="name">Generate Draft Invoices On Receptions</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]</field>
         </record>
-        <menuitem action='action_picking_tree5' id='menu_action_picking_tree5' parent='stock.menu_action_picking_tree4'/>
+        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4"/>
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/delivery/delivery_wizard.xml b/addons/delivery/delivery_wizard.xml
index de3eb54d024..7298b077142 100644
--- a/addons/delivery/delivery_wizard.xml
+++ b/addons/delivery/delivery_wizard.xml
@@ -1,13 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <wizard
-			string="Add delivery line"
-			model="sale.order"
-			name="delivery.sale.order"
-			id="wizard_deliver_line_add"
-			keyword="client_action_multi"/>
+        <wizard id="wizard_deliver_line_add" keyword="client_action_multi" model="sale.order" name="delivery.sale.order" string="Add delivery line"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_bel_holidays_2005.xml b/addons/hr/hr_bel_holidays_2005.xml
index c86dd04015f..b53b135348b 100644
--- a/addons/hr/hr_bel_holidays_2005.xml
+++ b/addons/hr/hr_bel_holidays_2005.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="hr.holidays.status" id="jf">
+        <record id="jf" model="hr.holidays.status">
             <field name="name">Public holidays</field>
         </record>
         
@@ -9,55 +9,55 @@
             <field name="name">New Year</field>
             <field name="date_from">2005-01-01 00:00</field>
             <field name="date_to">2005-01-02 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
         <record model="hr.holidays">
             <field name="name">Easter Monday</field>
             <field name="date_from">2005-03-28 00:00</field>
             <field name="date_to">2005-03-29 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
         <record model="hr.holidays">
             <field name="name">Labor Day</field>
             <field name="date_from">2005-05-01 00:00</field>
             <field name="date_to">2005-05-02 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
         <record model="hr.holidays">
             <field name="name">Ascension</field>
             <field name="date_from">2005-05-05 00:00</field>
             <field name="date_to">2005-05-06 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
         <record model="hr.holidays">
             <field name="name">Ascension Day</field>
             <field name="date_from">2005-05-16 00:00</field>
             <field name="date_to">2005-05-17 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
         <record model="hr.holidays">
             <field name="name">Pentecost Monday</field>
             <field name="date_from">2005-05-16 00:00</field>
             <field name="date_to">2005-05-17 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
         <record model="hr.holidays">
             <field name="name">National day</field>
             <field name="date_from">2005-07-21 00:00</field>
             <field name="date_to">2005-07-22 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
         <record model="hr.holidays">
             <field name="name">All Saints</field>
             <field name="date_from">2005-11-01 00:00</field>
             <field name="date_to">2005-11-02 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
         <record model="hr.holidays">
             <field name="name">Christmas</field>
             <field name="date_from">2005-12-25 00:00</field>
             <field name="date_to">2005-12-26 00:00</field>
-            <field name="holiday_status" ref="jf" />
+            <field name="holiday_status" ref="jf"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 1b43d22d975..db3e6119a8b 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!--		<record model="res.groups" id="hr_id">-->
@@ -30,35 +30,35 @@
             <field name="action_type">sign_out</field>
         </record>
         
-        <record model="hr.holidays.status" id="status_unpaid">
+        <record id="status_unpaid" model="hr.holidays.status">
             <field name="name">Unpaid holidays</field>
         </record>
-        <record model="hr.holidays.status" id="ca">
+        <record id="ca" model="hr.holidays.status">
             <field name="name">Annual holidays</field>
         </record>
-        <record model="hr.holidays.status" id="status_sick">
+        <record id="status_sick" model="hr.holidays.status">
             <field name="name">Sickness holidays</field>
         </record>
-        <record model="hr.holidays.status" id="ma">
+        <record id="ma" model="hr.holidays.status">
             <field name="name">Maternity holidays</field>
         </record>
-        <record model="hr.holidays.status" id="status_unauth">
+        <record id="status_unauth" model="hr.holidays.status">
             <field name="name">Unauthorised holidays</field>
         </record>
         
         
         <!-- Example employee -->
         
-        <record model="hr.timesheet.group" id="timesheet_group1">
+        <record id="timesheet_group1" model="hr.timesheet.group">
             <field name="name">Default timesheet</field>
         </record>
         
-        <record model="hr.employee" id="employee1">
+        <record id="employee1" model="hr.employee">
             <field name="name">Fabien Pinckaers</field>
             <field name="regime">45</field>
-            <field name="user_id" search="[('login','=','admin')]" model="res.users"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
             <field name="holiday_max">25</field>
-            <fields name="workgroups" ref="timesheet_group1" />
+            <fields name="workgroups" ref="timesheet_group1"/>
         </record>
         
         <record model="hr.timesheet">
@@ -66,186 +66,186 @@
             <field name="dayofweek">0</field>
             <field name="hour_from">08:00</field>
             <field name="hour_to">12:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Monday evening</field>
             <field name="dayofweek">0</field>
             <field name="hour_from">13:00</field>
             <field name="hour_to">18:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Tuesday morning</field>
             <field name="dayofweek">1</field>
             <field name="hour_from">08:00</field>
             <field name="hour_to">12:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Tuesday evening</field>
             <field name="dayofweek">1</field>
             <field name="hour_from">13:00</field>
             <field name="hour_to">18:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Wednesday morning</field>
             <field name="dayofweek">2</field>
             <field name="hour_from">08:00</field>
             <field name="hour_to">12:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Wednesday evening</field>
             <field name="dayofweek">2</field>
             <field name="hour_from">13:00</field>
             <field name="hour_to">18:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Thursday morning</field>
             <field name="dayofweek">3</field>
             <field name="hour_from">08:00</field>
             <field name="hour_to">12:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Thursday evening</field>
             <field name="hour_from">13:00</field>
             <field name="hour_to">18:00</field>
             <field name="dayofweek">3</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Friday morning</field>
             <field name="dayofweek">4</field>
             <field name="hour_from">08:00</field>
             <field name="hour_to">12:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         <record model="hr.timesheet">
             <field name="name">Friday evening</field>
             <field name="dayofweek">4</field>
             <field name="hour_from">13:00</field>
             <field name="hour_to">18:00</field>
-            <field name="tgroup_id" ref="timesheet_group1" />
+            <field name="tgroup_id" ref="timesheet_group1"/>
         </record>
         
         <record model="hr.holidays">
             <field name="name">Bali Trip</field>
             <field name="date_from">2005-05-11 08:00</field>
             <field name="date_to">2005-05-25 18:00</field>
-            <field name="holiday_status" ref="ca" />
-            <field name="employee_id" ref="employee1" />
+            <field name="holiday_status" ref="ca"/>
+            <field name="employee_id" ref="employee1"/>
         </record>
         <record model="hr.holidays">
             <field name="name">Paternity holiday</field>
             <field name="date_from">2005-06-02 08:00</field>
             <field name="date_to">2005-06-13 18:00</field>
-            <field name="holiday_status" ref="ma" />
-            <field name="employee_id" ref="employee1" />
+            <field name="holiday_status" ref="ma"/>
+            <field name="employee_id" ref="employee1"/>
         </record>
         
-        <record model="hr.attendance" id="attendance1">
-            <field name="name" eval="time.strftime('%Y-%m-01 08:21')"/>
+        <record id="attendance1" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-01 08:21')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance2">
-            <field name="name" eval="time.strftime('%Y-%m-01 11:51')"/>
+        <record id="attendance2" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance3">
-            <field name="name" eval="time.strftime('%Y-%m-02 12:47')"/>
+        <record id="attendance3" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance4">
-            <field name="name" eval="time.strftime('%Y-%m-02 19:53')"/>
+        <record id="attendance4" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance5">
-            <field name="name" eval="time.strftime('%Y-%m-03 07:32')"/>
+        <record id="attendance5" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance6">
-            <field name="name" eval="time.strftime('%Y-%m-03 12:32')"/>
+        <record id="attendance6" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance7">
-            <field name="name" eval="time.strftime('%Y-%m-04 14:01')"/>
+        <record id="attendance7" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance8">
-            <field name="name" eval="time.strftime('%Y-%m-04 17:21')"/>
+        <record id="attendance8" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance9">
-            <field name="name" eval="time.strftime('%Y-%m-05 09:10')"/>
+        <record id="attendance9" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance10">
-            <field name="name" eval="time.strftime('%Y-%m-05 12:42')"/>
+        <record id="attendance10" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance11">
-            <field name="name" eval="time.strftime('%Y-%m-06 13:10')"/>
+        <record id="attendance11" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance12">
-            <field name="name" eval="time.strftime('%Y-%m-06 18:34')"/>
+        <record id="attendance12" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance13">
-            <field name="name" eval="time.strftime('%Y-%m-07 08:21')"/>
+        <record id="attendance13" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance14">
-            <field name="name" eval="time.strftime('%Y-%m-07 18:21')"/>
+        <record id="attendance14" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance15">
-            <field name="name" eval="time.strftime('%Y-%m-08 08:21')"/>
+        <record id="attendance15" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance16">
-            <field name="name" eval="time.strftime('%Y-%m-08 12:54')"/>
+        <record id="attendance16" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance17">
-            <field name="name" eval="time.strftime('%Y-%m-09 13:32')"/>
+        <record id="attendance17" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance18">
-            <field name="name" eval="time.strftime('%Y-%m-09 19:31')"/>
+        <record id="attendance18" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance19">
-            <field name="name" eval="time.strftime('%Y-%m-10 07:10')"/>
+        <record id="attendance19" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
             <field name="action">sign_in</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
-        <record model="hr.attendance" id="attendance20">
-            <field name="name" eval="time.strftime('%Y-%m-10 12:34')"/>
+        <record id="attendance20" model="hr.attendance">
+            <field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
             <field name="action">sign_out</field>
-            <field name="employee_id" ref="employee1" />
+            <field name="employee_id" ref="employee1"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index 474c23622d3..f4b713b8e82 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="hr.department" id="dep_management">
+        <record id="dep_management" model="hr.department">
             <field name="name">Management</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin" />
+            <field name="manager_id" ref="base.user_admin"/>
         </record>
-        <record model="hr.department" id="dep_administration">
+        <record id="dep_administration" model="hr.department">
             <field name="name">Administration</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin" />
+            <field name="manager_id" ref="base.user_admin"/>
         </record>
         
-        <record model="hr.department" id="dep_technical">
+        <record id="dep_technical" model="hr.department">
             <field name="name">Technical department</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin" />
+            <field name="manager_id" ref="base.user_admin"/>
         </record>
         
-        <record model="hr.department" id="dep_it">
+        <record id="dep_it" model="hr.department">
             <field name="name">IT</field>
             <field name="parent_id" ref="dep_technical"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin" />
+            <field name="manager_id" ref="base.user_admin"/>
         </record>
         
-        <record model="hr.department" id="dep_marketing">
+        <record id="dep_marketing" model="hr.department">
             <field name="name">Marketing</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin" />
+            <field name="manager_id" ref="base.user_admin"/>
         </record>
         
-        <record model="hr.department" id="dep_sales">
+        <record id="dep_sales" model="hr.department">
             <field name="name">Sales</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin" />
+            <field name="manager_id" ref="base.user_admin"/>
             <field name="parent_id" ref="dep_management"/>
         </record>
         
-        <record model="hr.department" id="dep_sales_europe">
+        <record id="dep_sales_europe" model="hr.department">
             <field name="name">Sales Europe</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin" />
+            <field name="manager_id" ref="base.user_admin"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
         
-        <record model="hr.department" id="dep_sales_america">
+        <record id="dep_sales_america" model="hr.department">
             <field name="name">Sales America</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin" />
+            <field name="manager_id" ref="base.user_admin"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
         
@@ -60,4 +60,4 @@
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 1e4ab74a433..199a072cc4a 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
@@ -7,55 +7,55 @@
 	department
 	======================
 	-->
-        <record id='view_department_form' model='ir.ui.view'>
-            <field name='name'>hr.department.form</field>
-            <field name='model'>hr.department</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='department'>
+        <record id="view_department_form" model="ir.ui.view">
+            <field name="name">hr.department.form</field>
+            <field name="model">hr.department</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="department">
                     <notebook>
-                        <page string='Department'>
-                            <field name='name' colspan='4' select='1'/>
-                            <field name='company_id' select='1'/>
-                            <field name='parent_id' select='2'/>
-                            <field name='manager_id' select='1' colspan='4'/>
-                            <field name='member_ids' colspan='4'/>
+                        <page string="Department">
+                            <field colspan="4" name="name" select="1"/>
+                            <field name="company_id" select="1"/>
+                            <field name="parent_id" select="2"/>
+                            <field colspan="4" name="manager_id" select="1"/>
+                            <field colspan="4" name="member_ids"/>
                         </page>
-                        <page string='Notes'>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='view_department_tree' model='ir.ui.view'>
-            <field name='name'>hr.department.tree</field>
-            <field name='model'>hr.department</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree string='Companies'>
-                    <field name='name'/>
-                    <field name='company_id'/>
-                    <field name='manager_id'/>
+        <record id="view_department_tree" model="ir.ui.view">
+            <field name="name">hr.department.tree</field>
+            <field name="model">hr.department</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Companies">
+                    <field name="name"/>
+                    <field name="company_id"/>
+                    <field name="manager_id"/>
                 </tree>
             </field>
         </record>
-        <record id='open_module_tree_department_tree' model='ir.actions.act_window'>
-            <field name='name'>Departments</field>
-            <field name='res_model'>hr.department</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('parent_id','=',False)]</field>
+        <record id="open_module_tree_department_tree" model="ir.actions.act_window">
+            <field name="name">Departments</field>
+            <field name="res_model">hr.department</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem name='Administration/Users/Departments Structure' action='open_module_tree_department_tree' id='menu_department_tree'/>
+        <menuitem action="open_module_tree_department_tree" id="menu_department_tree" parent="base.menu_users"/>
         
-        <record id='open_module_tree_department' model='ir.actions.act_window'>
-            <field name='name'>Departments</field>
-            <field name='res_model'>hr.department</field>
-            <field name='view_type'>form</field>
+        <record id="open_module_tree_department" model="ir.actions.act_window">
+            <field name="name">Departments</field>
+            <field name="res_model">hr.department</field>
+            <field name="view_type">form</field>
         </record>
         
-        <menuitem name='Administration/Users/Departments Structure/Define Departments' action='open_module_tree_department' id='menu_department_def'/>
+        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_report.xml b/addons/hr/hr_report.xml
index 2eb59d76bae..ad52de20cbf 100644
--- a/addons/hr/hr_report.xml
+++ b/addons/hr/hr_report.xml
@@ -1,15 +1,6 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report
-			string="Attendance Error Report"
-			model="hr.employee"
-			name="hr.timesheet.attendance.error"
-			auto="False"
-			keyword="client_print_multi"
-			multi="True"
-			menu="False"
-			rml="hr/report/attendance_errors.rml"
-			id="attendance_error_report"/>
+        <report auto="False" id="attendance_error_report" keyword="client_print_multi" menu="False" model="hr.employee" multi="True" name="hr.timesheet.attendance.error" rml="hr/report/attendance_errors.rml" string="Attendance Error Report"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_security.xml b/addons/hr/hr_security.xml
index de6ce2cd25f..3f630c51eca 100644
--- a/addons/hr/hr_security.xml
+++ b/addons/hr/hr_security.xml
@@ -1,199 +1,199 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="res.groups" id="group_hr_manager">
+        <record id="group_hr_manager" model="res.groups">
             <field name="name">HR Manager</field>
             <field eval="[(4, ref('hr.menu_open_view_employee_tree')), (4, ref('hr.menu_open_view_employee_list')), (4, ref('hr.menu_open_view_employee_new')), (4, ref('hr.menu_view_employee_category_form'))]" name="menu_access"/>
         </record>
         
-        <record model="res.groups" id="group_hr_employee">
+        <record id="group_hr_employee" model="res.groups">
             <field name="name">Employee</field>
             <field eval="[(4, ref('hr.menu_open_view_employee_tree')), (4, ref('hr.menu_open_view_employee_list')),(4, ref('hr.menu_open_view_employee_new')), (4, ref('hr.menu_view_employee_category_form'))]" name="menu_access"/>
         </record>
         
-        <record model="res.users" id="base.user_admin">
-            <field name="groups_id" eval="[(4, ref('group_hr_employee')),(4, ref('group_hr_manager'))]"/>
+        <record id="base.user_admin" model="res.users">
+            <field eval="[(4, ref('group_hr_employee')),(4, ref('group_hr_manager'))]" name="groups_id"/>
         </record>
         
         <!-- Department security -->
-        <record model="ir.model.access" id="access_hr_department">
+        <record id="access_hr_department" model="ir.model.access">
             <field name="name">HR Department</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.department')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.department')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_department_manager">
+        <record id="access_hr_department_manager" model="ir.model.access">
             <field name="name">HR Department</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.department')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.department')]"/>
             <field name="group_id" ref="group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Timesheet Group security -->
-        <record model="ir.model.access" id="access_hr_timesheet">
+        <record id="access_hr_timesheet" model="ir.model.access">
             <field name="name">HR Timesheet Group</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.timesheet.group')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.timesheet.group')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_timesheet_manager">
+        <record id="access_hr_timesheet_manager" model="ir.model.access">
             <field name="name">HR Timesheet Group</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.timesheet.group')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.timesheet.group')]"/>
             <field name="group_id" ref="group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Employee Category security -->
-        <record model="ir.model.access" id="access_hr_employee_category">
+        <record id="access_hr_employee_category" model="ir.model.access">
             <field name="name">HR Employee Category</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.employee.category')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee.category')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_employee_category_manager">
+        <record id="access_hr_employee_category_manager" model="ir.model.access">
             <field name="name">HR Employee Category</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.employee.category')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee.category')]"/>
             <field name="group_id" ref="group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Employee security -->
-        <record model="ir.model.access" id="access_hr_employee">
+        <record id="access_hr_employee" model="ir.model.access">
             <field name="name">HR Employee</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.employee')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_employee_employee">
+        <record id="access_hr_employee_employee" model="ir.model.access">
             <field name="name">HR Employee</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.employee')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee')]"/>
             <field name="group_id" ref="group_hr_employee"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Employee security -->
-        <record model="ir.model.access" id="access_hr_timesheet">
+        <record id="access_hr_timesheet" model="ir.model.access">
             <field name="name">HR Employee Timesheet</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.timesheet')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.timesheet')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_timesheet_employee">
+        <record id="access_hr_timesheet_employee" model="ir.model.access">
             <field name="name">HR Employee Timesheet</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.timesheet')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.timesheet')]"/>
             <field name="group_id" ref="group_hr_employee"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Action Reason security -->
-        <record model="ir.model.access" id="access_hr_action_reason">
+        <record id="access_hr_action_reason" model="ir.model.access">
             <field name="name">HR Timesheet Action Reason</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.action.reason')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.action.reason')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_action_reason_manager">
+        <record id="access_hr_action_reason_manager" model="ir.model.access">
             <field name="name">HR Timesheet Action Reason</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.action.reason')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.action.reason')]"/>
             <field name="group_id" ref="group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Timesheet Attendance security -->
-        <record model="ir.model.access" id="access_hr_attendance">
+        <record id="access_hr_attendance" model="ir.model.access">
             <field name="name">HR Attendance</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.attendance')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.attendance')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_attendance_employee">
+        <record id="access_hr_attendance_employee" model="ir.model.access">
             <field name="name">HR Attendance</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.attendance')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.attendance')]"/>
             <field name="group_id" ref="group_hr_employee"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Holiday Status security -->
-        <record model="ir.model.access" id="access_hr_holiday_status">
+        <record id="access_hr_holiday_status" model="ir.model.access">
             <field name="name">HR Holiday Status</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.holidays.status')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.holidays.status')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_holiday_status_manager">
+        <record id="access_hr_holiday_status_manager" model="ir.model.access">
             <field name="name">HR Holiday Status</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.holidays.status')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.holidays.status')]"/>
             <field name="group_id" ref="group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Holidays security -->
-        <record model="ir.model.access" id="access_hr_holiday">
+        <record id="access_hr_holiday" model="ir.model.access">
             <field name="name">HR Holidays</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.holidays')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.holidays')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_holiday_employee">
+        <record id="access_hr_holiday_employee" model="ir.model.access">
             <field name="name">HR Holidays</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.holidays')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.holidays')]"/>
             <field name="group_id" ref="group_hr_employee"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f1d7bd4cc55..78b9101c2bc 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -1,104 +1,104 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem name='Human Resources' icon='terp-hr' id='menu_hr_root'/>
-        <menuitem name='Human Resources/Reporting' sequence='40' id='menu_hr_reporting'/>
-        <menuitem name='Human Resources/Configuration' groups='base.group_admin' id='menu_hr_configuration'/>
+        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
+        <menuitem id="menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="40"/>
+        <menuitem groups="base.group_admin" id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root"/>
         
         <!--
 		==========
 		Employee 
 		==========
 		-->
-        <record id='view_employee_form' model='ir.ui.view'>
-            <field name='name'>hr.employee.form</field>
-            <field name='model'>hr.employee</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Employee'>
+        <record id="view_employee_form" model="ir.ui.view">
+            <field name="name">hr.employee.form</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee">
                     <notebook>
-                        <page string='Information'>
-                            <separator string='General Information' colspan='4'/>
-                            <field name='name' select='1'/>
-                            <field name='company_id'/>
-                            <field name='user_id'/>
-                            <field name='address_id'/>
-                            <field name='notes' colspan='4'/>
-                            <separator string='Working Data' colspan='4'/>
-                            <field name='regime'/>
-                            <field name='active' select='1'/>
-                            <field name='holiday_max'/>
-                            <field name='started' select='1'/>
-                            <field name='parent_id' select='1'/>
-                            <field name='category_id'/>
-                            <field name='workgroups' colspan='4'/>
-                            <field name='state'/>
-                            <group col='2' colspan='2'>
-                                <button name='sign_in' type='object' states='absent' string='Sign in !'/>
-                                <button name='sign_out' type='object' states='present' string='Sign out !'/>
+                        <page string="Information">
+                            <separator colspan="4" string="General Information"/>
+                            <field name="name" select="1"/>
+                            <field name="company_id"/>
+                            <field name="user_id"/>
+                            <field name="address_id"/>
+                            <field colspan="4" name="notes"/>
+                            <separator colspan="4" string="Working Data"/>
+                            <field name="regime"/>
+                            <field name="active" select="1"/>
+                            <field name="holiday_max"/>
+                            <field name="started" select="1"/>
+                            <field name="parent_id" select="1"/>
+                            <field name="category_id"/>
+                            <field colspan="4" name="workgroups"/>
+                            <field name="state"/>
+                            <group col="2" colspan="2">
+                                <button name="sign_in" states="absent" string="Sign in !" type="object"/>
+                                <button name="sign_out" states="present" string="Sign out !" type="object"/>
                             </group>
                         </page>
-                        <page string='Holidays'>
-                            <field name='holidays' widget='one2many_list' nolabel='1' colspan='4'/>
+                        <page string="Holidays">
+                            <field colspan="4" name="holidays" nolabel="1" widget="one2many_list"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='view_employee_tree' model='ir.ui.view'>
-            <field name='name'>hr.employee.tree</field>
-            <field name='model'>hr.employee</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree string='Employees'>
-                    <field name='name'/>
-                    <field name='user_id'/>
-                    <field name='address_id'/>
-                    <field name='state'/>
+        <record id="view_employee_tree" model="ir.ui.view">
+            <field name="name">hr.employee.tree</field>
+            <field name="model">hr.employee</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Employees">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="address_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='open_view_employee_tree' model='ir.actions.act_window'>
-            <field name='name'>Employees Structure</field>
-            <field name='res_model'>hr.employee</field>
-            <field name='view_type'>tree</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='view_employee_tree'/>
-            <field name='domain'>[('parent_id','=',False)]</field>
+        <record id="open_view_employee_tree" model="ir.actions.act_window">
+            <field name="name">Employees Structure</field>
+            <field name="res_model">hr.employee</field>
+            <field name="view_type">tree</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_employee_tree"/>
+            <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem name='Human Resources/Employees' groups='base.group_admin' action='open_view_employee_tree' id='menu_open_view_employee_tree'/>
+        <menuitem action="open_view_employee_tree" groups="base.group_admin" id="menu_open_view_employee_tree" parent="hr.menu_hr_root"/>
         
-        <record id='view_employee_list' model='ir.ui.view'>
-            <field name='name'>hr.employee.tree</field>
-            <field name='model'>hr.employee</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Employees'>
-                    <field name='name'/>
-                    <field name='user_id'/>
-                    <field name='address_id'/>
-                    <field name='state'/>
-                    <field name='parent_id'/>
+        <record id="view_employee_list" model="ir.ui.view">
+            <field name="name">hr.employee.tree</field>
+            <field name="model">hr.employee</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Employees">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="address_id"/>
+                    <field name="state"/>
+                    <field name="parent_id"/>
                 </tree>
             </field>
         </record>
-        <record id='open_view_employee_list' model='ir.actions.act_window'>
-            <field name='name'>Employees</field>
-            <field name='res_model'>hr.employee</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='view_employee_list'/>
+        <record id="open_view_employee_list" model="ir.actions.act_window">
+            <field name="name">Employees</field>
+            <field name="res_model">hr.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_employee_list"/>
         </record>
-        <menuitem name='Human Resources/Employees/Employees' groups='base.group_admin' action='open_view_employee_list' id='menu_open_view_employee_list'/>
+        <menuitem action="open_view_employee_list" groups="base.group_admin" id="menu_open_view_employee_list" parent="hr.menu_open_view_employee_tree"/>
         
-        <record id='open_view_employee_new' model='ir.actions.act_window'>
-            <field name='name'>New Employee</field>
-            <field name='res_model'>hr.employee</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="open_view_employee_new" model="ir.actions.act_window">
+            <field name="name">New Employee</field>
+            <field name="res_model">hr.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
         </record>
-        <menuitem name='Human Resources/Employees/New Employee' groups='base.group_admin' action='open_view_employee_new' id='menu_open_view_employee_new'/>
+        <menuitem action="open_view_employee_new" groups="base.group_admin" id="menu_open_view_employee_new" parent="hr.menu_open_view_employee_tree"/>
         
         
         <!--
@@ -106,36 +106,36 @@
 		Employee architecture
 		=======================
 		-->
-        <record id='view_partner_tree2' model='ir.ui.view'>
-            <field name='name'>hr.employee.tree</field>
-            <field name='model'>hr.employee</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree string='Employees'>
-                    <field name='name'/>
-                    <field name='user_id'/>
-                    <field name='address_id'/>
-                    <field name='state'/>
+        <record id="view_partner_tree2" model="ir.ui.view">
+            <field name="name">hr.employee.tree</field>
+            <field name="model">hr.employee</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Employees">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="address_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='action2' model='ir.actions.act_window'>
-            <field name='name'>Hierarchical view of this employee</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr.employee</field>
-            <field name='domain'>[('id','in',active_ids)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_partner_tree2'/>
+        <record id="action2" model="ir.actions.act_window">
+            <field name="name">Hierarchical view of this employee</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.employee</field>
+            <field name="domain">[('id','in',active_ids)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_partner_tree2"/>
         </record>
         <ir_set>
-            <field name='key' eval='&apos;action&apos;'/>
-            <field name='key2' eval='&apos;client_action_multi&apos;'/>
-            <field name='models' eval='[&apos;hr.employee&apos;]'/>
-            <field name='name'>Employees Hierarchy</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(action2)'/>
-            <field name='isobject' eval='True'/>
-            <field name='replace' eval='True'/>
+            <field eval="'action'" name="key"/>
+            <field eval="'client_action_multi'" name="key2"/>
+            <field eval="['hr.employee']" name="models"/>
+            <field name="name">Employees Hierarchy</field>
+            <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
+            <field eval="True" name="isobject"/>
+            <field eval="True" name="replace"/>
         </ir_set>
         
         
@@ -144,274 +144,274 @@
 		Timesheets 
 		============
 		-->
-        <record id='create_group' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.group.form</field>
-            <field name='model'>hr.timesheet.group</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet category'>
-                    <field name='name' select='1'/>
-                    <field name='manager' select='1'/>
+        <record id="create_group" model="ir.ui.view">
+            <field name="name">hr.timesheet.group.form</field>
+            <field name="model">hr.timesheet.group</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet category">
+                    <field name="name" select="1"/>
+                    <field name="manager" select="1"/>
                     <newline/>
-                    <separator string='Timesheets' colspan='4'/>
+                    <separator colspan="4" string="Timesheets"/>
                     <newline/>
-                    <field name='timesheet_id' widget='one2many_list' nolabel='1' colspan='4'/>
+                    <field colspan="4" name="timesheet_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
-        <record id='edit_workgroup' model='ir.actions.act_window'>
-            <field name='name'>Timesheet Categories</field>
-            <field name='res_model'>hr.timesheet.group</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='create_group'/>
+        <record id="edit_workgroup" model="ir.actions.act_window">
+            <field name="name">Timesheet Categories</field>
+            <field name="res_model">hr.timesheet.group</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="create_group"/>
         </record>
-        <menuitem name='Human Resources/Configuration/Timesheet Categories' groups='base.group_admin' action='edit_workgroup' id='menu_edit_workgroup'/>
+        <menuitem action="edit_workgroup" groups="base.group_admin" id="menu_edit_workgroup" parent="hr.menu_hr_configuration"/>
         
-        <record id='view_timesheet_tree' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.tree</field>
-            <field name='model'>hr.timesheet</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Timesheet'>
-                    <field name='name'/>
-                    <field name='dayofweek'/>
-                    <field name='hour_from'/>
-                    <field name='hour_to'/>
+        <record id="view_timesheet_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.tree</field>
+            <field name="model">hr.timesheet</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheet">
+                    <field name="name"/>
+                    <field name="dayofweek"/>
+                    <field name="hour_from"/>
+                    <field name="hour_to"/>
                 </tree>
             </field>
         </record>
-        <record id='view_timesheet_form' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.form</field>
-            <field name='model'>hr.timesheet</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet'>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='date_from'/>
-                    <field name='dayofweek' select='1'/>
-                    <field name='hour_from'/>
-                    <field name='hour_to'/>
+        <record id="view_timesheet_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.form</field>
+            <field name="model">hr.timesheet</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date_from"/>
+                    <field name="dayofweek" select="1"/>
+                    <field name="hour_from"/>
+                    <field name="hour_to"/>
                 </form>
             </field>
         </record>
         
         <!-- Attendance -->
-        <record id='view_attendance_form' model='ir.ui.view'>
-            <field name='name'>hr.attendance.form</field>
-            <field name='model'>hr.attendance</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Employee attendance'>
-                    <field name='employee_id' select='1'/>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='action' select='1'/>
-                    <field name='action_desc' select='1'/>
+        <record id="view_attendance_form" model="ir.ui.view">
+            <field name="name">hr.attendance.form</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee attendance">
+                    <field name="employee_id" select="1"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="action" select="1"/>
+                    <field name="action_desc" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='view_attendance_tree' model='ir.ui.view'>
-            <field name='name'>hr.attendance.tree</field>
-            <field name='model'>hr.attendance</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Employee attendances'>
-                    <field name='name'/>
-                    <field name='action'/>
-                    <field name='action_desc'/>
+        <record id="view_attendance_tree" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Employee attendances">
+                    <field name="name"/>
+                    <field name="action"/>
+                    <field name="action_desc"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_employee_category_form' model='ir.ui.view'>
-            <field name='name'>hr.employee.category.form</field>
-            <field name='model'>hr.employee.category</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Employee Category'>
-                    <field name='name' select='1'/>
-                    <field name='parent_id' select='1'/>
+        <record id="view_employee_category_form" model="ir.ui.view">
+            <field name="name">hr.employee.category.form</field>
+            <field name="model">hr.employee.category</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee Category">
+                    <field name="name" select="1"/>
+                    <field name="parent_id" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='view_employee_category_list' model='ir.ui.view'>
-            <field name='name'>hr.employee.category.list</field>
-            <field name='model'>hr.employee.category</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='8'/>
-            <field name='arch' type='xml'>
-                <tree string='Employees Categories'>
-                    <field name='name'/>
-                    <field name='parent_id'/>
+        <record id="view_employee_category_list" model="ir.ui.view">
+            <field name="name">hr.employee.category.list</field>
+            <field name="model">hr.employee.category</field>
+            <field name="type">tree</field>
+            <field eval="8" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Employees Categories">
+                    <field name="name"/>
+                    <field name="parent_id"/>
                 </tree>
             </field>
         </record>
-        <record id='view_employee_category_tree' model='ir.ui.view'>
-            <field name='name'>hr.employee.category.tree</field>
-            <field name='model'>hr.employee.category</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree string='Employees Categories'>
-                    <field name='name'/>
+        <record id="view_employee_category_tree" model="ir.ui.view">
+            <field name="name">hr.employee.category.tree</field>
+            <field name="model">hr.employee.category</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Employees Categories">
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='open_view_categ_form' model='ir.actions.act_window'>
-            <field name='name'>Categories of Employee</field>
-            <field name='res_model'>hr.employee.category</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="open_view_categ_form" model="ir.actions.act_window">
+            <field name="name">Categories of Employee</field>
+            <field name="res_model">hr.employee.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
         </record>
-        <menuitem name='Human Resources/Configuration/Categories of Employee' groups='base.group_admin' action='open_view_categ_form' id='menu_view_employee_category_form'/>
+        <menuitem action="open_view_categ_form" groups="base.group_admin" id="menu_view_employee_category_form" parent="hr.menu_hr_configuration"/>
         
-        <record id='open_view_categ_tree' model='ir.actions.act_window'>
-            <field name='name'>Categories structure</field>
-            <field name='res_model'>hr.employee.category</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_employee_category_tree'/>
-            <field name='domain'>[('parent_id','=',False)]</field>
+        <record id="open_view_categ_tree" model="ir.actions.act_window">
+            <field name="name">Categories structure</field>
+            <field name="res_model">hr.employee.category</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_employee_category_tree"/>
+            <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem name='Human Resources/Configuration/Categories of Employee/Categories Structure' groups='base.group_admin' action='open_view_categ_tree' id='menu_view_employee_category_tree'/>
+        <menuitem action="open_view_categ_tree" groups="base.group_admin" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
         
-        <record id='view_attendance_who' model='ir.ui.view'>
-            <field name='name'>hr.attendance.tree</field>
-            <field name='model'>hr.attendance</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='3'/>
-            <field name='arch' type='xml'>
-                <tree string='Employee attendance'>
-                    <field name='employee_id'/>
-                    <field name='name'/>
-                    <field name='action'/>
-                    <field name='action_desc'/>
+        <record id="view_attendance_who" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field eval="3" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Employee attendance">
+                    <field name="employee_id"/>
+                    <field name="name"/>
+                    <field name="action"/>
+                    <field name="action_desc"/>
                 </tree>
             </field>
         </record>
-        <record id='open_view_attendance' model='ir.actions.act_window'>
-            <field name='name'>Attendances</field>
-            <field name='res_model'>hr.attendance</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="open_view_attendance" model="ir.actions.act_window">
+            <field name="name">Attendances</field>
+            <field name="res_model">hr.attendance</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Human Resources/Attendances' id='menu_hr_attendance'/>
-        <menuitem name='Human Resources/Attendances/Attendances' groups='base.group_admin' action='open_view_attendance' id='menu_open_view_attendance'/>
+        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"/>
+        <menuitem action="open_view_attendance" groups="base.group_admin" id="menu_open_view_attendance" parent="hr.menu_hr_attendance"/>
         
         
         <!-- Holidays -->
-        <record id='edit_holiday' model='ir.ui.view'>
-            <field name='name'>hr.holidays.form</field>
-            <field name='model'>hr.holidays</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Employee holidays'>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='date_from' select='1'/>
-                    <field name='date_to' select='1'/>
+        <record id="edit_holiday" model="ir.ui.view">
+            <field name="name">hr.holidays.form</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee holidays">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date_from" select="1"/>
+                    <field name="date_to" select="1"/>
                     <newline/>
-                    <field name='holiday_status' select='1'/>
+                    <field name="holiday_status" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='view_holiday' model='ir.ui.view'>
-            <field name='name'>hr.holidays.tree</field>
-            <field name='model'>hr.holidays</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Employee holidays'>
-                    <field name='name'/>
-                    <field name='date_from'/>
-                    <field name='date_to'/>
-                    <field name='holiday_status'/>
+        <record id="view_holiday" model="ir.ui.view">
+            <field name="name">hr.holidays.tree</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Employee holidays">
+                    <field name="name"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="holiday_status"/>
                 </tree>
             </field>
         </record>
         
-        <record id='ask_holiday' model='ir.ui.view'>
-            <field name='name'>hr.holidays.ask_form</field>
-            <field name='model'>hr.holidays</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Vacations requests'>
-                    <field name='name' select='1'/>
-                    <field name='holiday_status'/>
-                    <field name='employee_id' colspan='4' select='1'/>
+        <record id="ask_holiday" model="ir.ui.view">
+            <field name="name">hr.holidays.ask_form</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Vacations requests">
+                    <field name="name" select="1"/>
+                    <field name="holiday_status"/>
+                    <field colspan="4" name="employee_id" select="1"/>
                     <newline/>
-                    <field name='date_from' select='1'/>
-                    <field name='date_to' select='1'/>
+                    <field name="date_from" select="1"/>
+                    <field name="date_to" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='open_ask_holidays' model='ir.actions.act_window'>
-            <field name='name'>Vacation Request</field>
-            <field name='res_model'>hr.holidays</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_holiday'/>
+        <record id="open_ask_holidays" model="ir.actions.act_window">
+            <field name="name">Vacation Request</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_holiday"/>
         </record>
-        <menuitem name='Human Resources/Attendances/Vacation Request' groups='base.group_admin' action='open_ask_holidays' id='menu_open_ask_holidays'/>
+        <menuitem action="open_ask_holidays" groups="base.group_admin" id="menu_open_ask_holidays" parent="hr.menu_hr_attendance"/>
         
         <!-- Some Configuration (holiday type, attendance reasons) -->
         
-        <record id='edit_holiday_status' model='ir.ui.view'>
-            <field name='name'>hr.holidays.status.form</field>
-            <field name='model'>hr.holidays.status</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Define holiday status'>
-                    <field name='name' colspan='4' select='1'/>
+        <record id="edit_holiday_status" model="ir.ui.view">
+            <field name="name">hr.holidays.status.form</field>
+            <field name="model">hr.holidays.status</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Define holiday status">
+                    <field colspan="4" name="name" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='view_holiday_status' model='ir.ui.view'>
-            <field name='name'>hr.holidays.status.tree</field>
-            <field name='model'>hr.holidays.status</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Holiday status'>
-                    <field name='name'/>
+        <record id="view_holiday_status" model="ir.ui.view">
+            <field name="name">hr.holidays.status.tree</field>
+            <field name="model">hr.holidays.status</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Holiday status">
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='open_view_holiday_status' model='ir.actions.act_window'>
-            <field name='name'>Holiday Status</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr.holidays.status</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='view_holiday_status'/>
+        <record id="open_view_holiday_status" model="ir.actions.act_window">
+            <field name="name">Holiday Status</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.holidays.status</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_holiday_status"/>
         </record>
-        <menuitem name='Human Resources/Configuration/Holiday Status' groups='base.group_admin' action='open_view_holiday_status' id='menu_open_view_holiday_status'/>
+        <menuitem action="open_view_holiday_status" groups="base.group_admin" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
         
-        <record id='edit_attendance_reason' model='ir.ui.view'>
-            <field name='name'>hr.action.reason.form</field>
-            <field name='model'>hr.action.reason</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Define attendance reason'>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='action_type' select='1'/>
+        <record id="edit_attendance_reason" model="ir.ui.view">
+            <field name="name">hr.action.reason.form</field>
+            <field name="model">hr.action.reason</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Define attendance reason">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="action_type" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='view_attendance_reason' model='ir.ui.view'>
-            <field name='name'>hr.action.reason.tree</field>
-            <field name='model'>hr.action.reason</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Attendance reasons'>
-                    <field name='name'/>
-                    <field name='action_type'/>
+        <record id="view_attendance_reason" model="ir.ui.view">
+            <field name="name">hr.action.reason.tree</field>
+            <field name="model">hr.action.reason</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Attendance reasons">
+                    <field name="name"/>
+                    <field name="action_type"/>
                 </tree>
             </field>
         </record>
-        <record id='open_view_attendance_reason' model='ir.actions.act_window'>
-            <field name='name'>Attendance Reasons</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr.action.reason</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='view_attendance_reason'/>
+        <record id="open_view_attendance_reason" model="ir.actions.act_window">
+            <field name="name">Attendance Reasons</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.action.reason</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_attendance_reason"/>
         </record>
-        <menuitem name='Human Resources/Configuration/Attendance Reasons' groups='base.group_admin' action='open_view_attendance_reason' id='menu_open_view_attendance_reason'/>
+        <menuitem action="open_view_attendance_reason" groups="base.group_admin" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr/hr_wizard.xml b/addons/hr/hr_wizard.xml
index 789e00f461b..c0b24a2fb84 100644
--- a/addons/hr/hr_wizard.xml
+++ b/addons/hr/hr_wizard.xml
@@ -1,16 +1,16 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
 
-        <wizard name='hr.si_so' id='si_so' model='hr.employee' string='Sign in / Sign out'/>
+        <wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
 
-        <menuitem name='Human Resources/Attendances/Sign in &amp; Out' action='si_so' type='wizard' id='menu_si_so'/>
+        <menuitem action="si_so" id="menu_si_so" parent="hr.menu_hr_attendance" type="wizard"/>
 
-        <wizard name='hr.print_week' id='print_week' model='hr.employee' keyword='client_print_multi' string='Print Timesheet by week'/>
+        <wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.print_week" string="Print Timesheet by week"/>
 
-        <wizard name='hr.print_month' id='print_month' model='hr.employee' keyword='client_print_multi' string='Print Timesheet by month'/>
+        <wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.print_month" string="Print Timesheet by month"/>
 
-        <wizard name='hr.timesheet.attendance.report' id='wizard_attendance_error' model='hr.employee' keyword='client_print_multi' string='Print Attendance Error Report'/>
+        <wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.timesheet.attendance.report" string="Print Attendance Error Report"/>
 
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/hr_contract_data.xml
index 01349e749b3..903529cd080 100644
--- a/addons/hr_contract/hr_contract_data.xml
+++ b/addons/hr_contract/hr_contract_data.xml
@@ -1,41 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
         <!-- Contract Period Names -->
-        <record model="hr.contract.wage.type.period" id="hr_contract_wage_type_period_daily">
+        <record id="hr_contract_wage_type_period_daily" model="hr.contract.wage.type.period">
             <field name="name">daily</field>
         </record>
-        <record model="hr.contract.wage.type.period" id="hr_contract_wage_type_period_weekly">
+        <record id="hr_contract_wage_type_period_weekly" model="hr.contract.wage.type.period">
             <field name="name">weekly</field>
         </record>
-        <record model="hr.contract.wage.type.period" id="hr_contract_wage_type_period_monthly">
+        <record id="hr_contract_wage_type_period_monthly" model="hr.contract.wage.type.period">
             <field name="name">monthly</field>
         </record>
         
         <!-- Contract Wage Types -->
-        <record model="hr.contract.wage.type" id="hr_contract_monthly_gross">
+        <record id="hr_contract_monthly_gross" model="hr.contract.wage.type">
             <field name="name">Monthly Gross Wage</field>
             <field name="type">gross</field>
             <field name="period_id" ref="hr_contract_wage_type_period_monthly"/>
         </record>
-        <record model="hr.contract.wage.type" id="hr_contract_monthly_net">
+        <record id="hr_contract_monthly_net" model="hr.contract.wage.type">
             <field name="name">Monthly Net Wage</field>
             <field name="type">net</field>
             <field name="period_id" ref="hr_contract_wage_type_period_monthly"/>
         </record>
         
         <!-- Employee Marital Statusses -->
-        <record model="hr.employee.marital.status" id="hr_employee_marital_status_single">
+        <record id="hr_employee_marital_status_single" model="hr.employee.marital.status">
             <field name="name">Single</field>
         </record>
-        <record model="hr.employee.marital.status" id="hr_employee_marital_status_married">
+        <record id="hr_employee_marital_status_married" model="hr.employee.marital.status">
             <field name="name">Married</field>
         </record>
-        <record model="hr.employee.marital.status" id="hr_employee_marital_status_divorced">
+        <record id="hr_employee_marital_status_divorced" model="hr.employee.marital.status">
             <field name="name">Divorced</field>
         </record>
-        <record model="hr.employee.marital.status" id="hr_employee_marital_status_widower">
+        <record id="hr_employee_marital_status_widower" model="hr.employee.marital.status">
             <field name="name">Widower</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_contract/hr_contract_security.xml b/addons/hr_contract/hr_contract_security.xml
index a15b7c1784b..8e8889dd730 100644
--- a/addons/hr_contract/hr_contract_security.xml
+++ b/addons/hr_contract/hr_contract_security.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
         <!-- Department security -->
-        <record model="ir.model.access" id="access_hr_contract_period">
+        <record id="access_hr_contract_period" model="ir.model.access">
             <field name="name">HR Contract Period</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.contract.wage.type.period')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.contract.wage.type.period')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_contract_period_manager">
+        <record id="access_hr_contract_period_manager" model="ir.model.access">
             <field name="name">HR Contract Period</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.contract.wage.type.period')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.contract.wage.type.period')]"/>
             <field name="group_id" ref="hr.group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Wages Type security -->
-        <record model="ir.model.access" id="access_hr_wagestype">
+        <record id="access_hr_wagestype" model="ir.model.access">
             <field name="name">HR Wages Type</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.contract.wage.type')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.contract.wage.type')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_wagestype_manager">
+        <record id="access_hr_wagestype_manager" model="ir.model.access">
             <field name="name">HR Wages Type</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.contract.wage.type')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.contract.wage.type')]"/>
             <field name="group_id" ref="hr.group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- HR Contract security -->
-        <record model="ir.model.access" id="access_hr_contract">
+        <record id="access_hr_contract" model="ir.model.access">
             <field name="name">HR Contract</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.contract')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.contract')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_contract_manager">
+        <record id="access_hr_contract_manager" model="ir.model.access">
             <field name="name">HR Contract</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.contract')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.contract')]"/>
             <field name="group_id" ref="hr.group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Marital Status security -->
-        <record model="ir.model.access" id="access_hr_marital_status">
+        <record id="access_hr_marital_status" model="ir.model.access">
             <field name="name">HR Contract</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.employee.marital.status')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee.marital.status')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_hr_marital_status_manager">
+        <record id="access_hr_marital_status_manager" model="ir.model.access">
             <field name="name">HR Contract</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'hr.employee.marital.status')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee.marital.status')]"/>
             <field name="group_id" ref="hr.group_hr_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 5618b84e574..266cbdc0372 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -1,214 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='hr_contract_wage_type_period_view_form' model='ir.ui.view'>
-            <field name='name'>hr.contract.wage.type.period.view.form</field>
-            <field name='model'>hr.contract.wage.type.period</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Wage period'>
-                    <field name='name' colspan='4'/>
-                    <field name='factor_days'/>
+        <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.period.view.form</field>
+            <field name="model">hr.contract.wage.type.period</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Wage period">
+                    <field colspan="4" name="name"/>
+                    <field name="factor_days"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='hr_hr_employee_marital_status_form' model='ir.ui.view'>
-            <field name='name'>hr.hr.employee.marital.status</field>
-            <field name='model'>hr.employee.marital.status</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Marital Status'>
-                    <field name='name' nolabel='1' select='1' colspan='4'/>
-                    <field name='description' nolabel='1' colspan='4'/>
+        <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
+            <field name="name">hr.hr.employee.marital.status</field>
+            <field name="model">hr.employee.marital.status</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Marital Status">
+                    <field colspan="4" name="name" nolabel="1" select="1"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='hr_contract_wage_type_view_form' model='ir.ui.view'>
-            <field name='name'>hr.contract.wage.type.view.form</field>
-            <field name='model'>hr.contract.wage.type</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Wage Type'>
-                    <field name='name' colspan='4'/>
-                    <field name='period_id'/>
-                    <field name='type'/>
-                    <separator string='Hourly cost computation' colspan='4'/>
-                    <field name='factor_type'/>
+        <record id="hr_contract_wage_type_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.view.form</field>
+            <field name="model">hr.contract.wage.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Wage Type">
+                    <field colspan="4" name="name"/>
+                    <field name="period_id"/>
+                    <field name="type"/>
+                    <separator colspan="4" string="Hourly cost computation"/>
+                    <field name="factor_type"/>
                 </form>
             </field>
         </record>
         
-        <record id='hr_contract_wage_type_view_tree' model='ir.ui.view'>
-            <field name='name'>hr.contract.wage.type.view.tree</field>
-            <field name='model'>hr.contract.wage.type</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Wage Types'>
-                    <field name='name'/>
-                    <field name='type'/>
+        <record id="hr_contract_wage_type_view_tree" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.view.tree</field>
+            <field name="model">hr.contract.wage.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Wage Types">
+                    <field name="name"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
-        <record id='action_hr_contract_wage_type' model='ir.actions.act_window'>
-            <field name='name'>Contract Wage Type</field>
-            <field name='res_model'>hr.contract.wage.type</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[]</field>
+        <record id="action_hr_contract_wage_type" model="ir.actions.act_window">
+            <field name="name">Contract Wage Type</field>
+            <field name="res_model">hr.contract.wage.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[]</field>
         </record>
-        <menuitem name='Human Resources/Configuration/Contract/Contract Wage Type' action='action_hr_contract_wage_type' id='hr_menu_contract_wage_type'/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration"/><menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
         
-        <record id='action_hr_contract_wage_type_period' model='ir.actions.act_window'>
-            <field name='name'>Wage period</field>
-            <field name='res_model'>hr.contract.wage.type.period</field>
-            <field name='view_type'>form</field>
+        <record id="action_hr_contract_wage_type_period" model="ir.actions.act_window">
+            <field name="name">Wage period</field>
+            <field name="res_model">hr.contract.wage.type.period</field>
+            <field name="view_type">form</field>
         </record>
-        <menuitem name='Human Resources/Configuration/Contract/Contract Wage Period' action='action_hr_contract_wage_type_period' id='hr_menu_contract_wage_type_period'/>
+        <menuitem action="action_hr_contract_wage_type_period" id="hr_menu_contract_wage_type_period" parent="hr_contract.next_id_56"/>
         
         
-        <record id='hr_hr_employee_view_form2' model='ir.ui.view'>
-            <field name='name'>hr.hr.employee.view.form2</field>
-            <field name='model'>hr.employee</field>
-            <field name='inherit_id' ref='hr.view_employee_form'/>
-            <field name='arch' type='xml'>
-                <notebook position='inside'>
-                    <page string='Contracts'>
-                        <field name='contract_ids' nolabel='1' colspan='4'>
-                            <tree string='Contracts'>
-                                <field name='name'/>
-                                <field name='function'/>
-                                <field name='date_start'/>
-                                <field name='date_end'/>
-                                <field name='working_hours_per_day'/>
-                                <field name='wage_type_id'/>
-                                <field name='wage'/>
+        <record id="hr_hr_employee_view_form2" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form2</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Contracts">
+                        <field colspan="4" name="contract_ids" nolabel="1">
+                            <tree string="Contracts">
+                                <field name="name"/>
+                                <field name="function"/>
+                                <field name="date_start"/>
+                                <field name="date_end"/>
+                                <field name="working_hours_per_day"/>
+                                <field name="wage_type_id"/>
+                                <field name="wage"/>
                             </tree>
                             
-                            <form string='Contract'>
-                                <separator string='Generalities' colspan='4'/>
-                                <field name='name' colspan='4' select='1'/>
+                            <form string="Contract">
+                                <separator colspan="4" string="Generalities"/>
+                                <field colspan="4" name="name" select="1"/>
                                 <newline/>
-                                <separator string='Contract Duration' colspan='4'/>
-                                <field name='function'/>
-                                <field name='working_hours_per_day'/>
-                                <field name='date_start' select='1'/>
-                                <field name='date_end' select='1'/>
+                                <separator colspan="4" string="Contract Duration"/>
+                                <field name="function"/>
+                                <field name="working_hours_per_day"/>
+                                <field name="date_start" select="1"/>
+                                <field name="date_end" select="1"/>
                                 
-                                <separator string='Salary' colspan='4'/>
-                                <field name='wage_type_id'/>
-                                <field name='wage'/>
+                                <separator colspan="4" string="Salary"/>
+                                <field name="wage_type_id"/>
+                                <field name="wage"/>
                                 
-                                <separator string='Notes' colspan='4'/>
-                                <field name='notes' nolabel='1' colspan='4'/>
+                                <separator colspan="4" string="Notes"/>
+                                <field colspan="4" name="notes" nolabel="1"/>
                             </form>
                         </field>
                     </page>
-                    <page string='Miscelleanous'>
-                        <field name='manager' select='1'/>
-                        <field name='soc_security' select='1'/>
-                        <field name='medic_exam' select='1'/>
-                        <field name='audiens_num'/>
-                        <field name='nationality'/>
-                        <field name='birth_date'/>
-                        <field name='place_of_birth'/>
-                        <field name='marital_status'/>
-                        <field name='children'/>
+                    <page string="Miscelleanous">
+                        <field name="manager" select="1"/>
+                        <field name="soc_security" select="1"/>
+                        <field name="medic_exam" select="1"/>
+                        <field name="audiens_num"/>
+                        <field name="nationality"/>
+                        <field name="birth_date"/>
+                        <field name="place_of_birth"/>
+                        <field name="marital_status"/>
+                        <field name="children"/>
                     </page>
                 </notebook>
             </field>
         </record>
         
-        <record id='hr_contract_type_view_form' model='ir.ui.view'>
-            <field name='name'>hr.contract.type.view.form</field>
-            <field name='model'>hr.contract.type</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Contract Type'>
-                    <field name='name' colspan='4'/>
-                    <field name='description' colspan='4'/>
+        <record id="hr_contract_type_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.form</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Contract Type">
+                    <field colspan="4" name="name"/>
+                    <field colspan="4" name="description"/>
                 </form>
             </field>
         </record>
         
-        <record id='action_hr_marital_status' model='ir.actions.act_window'>
-            <field name='name'>Marital Status</field>
-            <field name='res_model'>hr.employee.marital.status</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_hr_marital_status" model="ir.actions.act_window">
+            <field name="name">Marital Status</field>
+            <field name="res_model">hr.employee.marital.status</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
         
-        <menuitem name='Human Resources/Configuration/Marital Status' action='action_hr_marital_status' id='hr_menu_marital_status'/>
+        <menuitem action="action_hr_marital_status" id="hr_menu_marital_status" parent="hr.menu_hr_configuration"/>
         
-        <record id='hr_contract_view_form' model='ir.ui.view'>
-            <field name='name'>hr.contract.view.form</field>
-            <field name='model'>hr.contract</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Contract'>
-                    <separator string='Generalities' colspan='4'/>
-                    <field name='name' select='1'/>
-                    <field name='employee_id' select='1'/>
-                    <field name='function'/>
+        <record id="hr_contract_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.view.form</field>
+            <field name="model">hr.contract</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Contract">
+                    <separator colspan="4" string="Generalities"/>
+                    <field name="name" select="1"/>
+                    <field name="employee_id" select="1"/>
+                    <field name="function"/>
                     <newline/>
                     
-                    <separator string='Contract Duration' colspan='4'/>
-                    <field name='date_start' select='1'/>
-                    <field name='date_end' select='1'/>
-                    <field name='working_hours_per_day'/>
+                    <separator colspan="4" string="Contract Duration"/>
+                    <field name="date_start" select="1"/>
+                    <field name="date_end" select="1"/>
+                    <field name="working_hours_per_day"/>
                     <newline/>
                     
-                    <separator string='Remuneration' colspan='4'/>
-                    <field name='wage_type_id'/>
-                    <field name='wage'/>
-                    <separator string='Notes' colspan='4'/>
-                    <field name='notes' nolabel='1' colspan='4'/>
+                    <separator colspan="4" string="Remuneration"/>
+                    <field name="wage_type_id"/>
+                    <field name="wage"/>
+                    <separator colspan="4" string="Notes"/>
+                    <field colspan="4" name="notes" nolabel="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='hr_contract_type_view_tree' model='ir.ui.view'>
-            <field name='name'>hr.contract.type.view.tree</field>
-            <field name='model'>hr.contract.type</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Contract Type'>
-                    <field name='name' colspan='4'/>
+        <record id="hr_contract_type_view_tree" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.tree</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Contract Type">
+                    <field colspan="4" name="name"/>
                 </tree>
             </field>
         </record>
         
-        <record id='hr_contract_view_tree' model='ir.ui.view'>
-            <field name='name'>hr.contract.view.tree</field>
-            <field name='model'>hr.contract</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Contracts'>
-                    <field name='name'/>
-                    <field name='employee_id'/>
-                    <field name='function'/>
-                    <field name='date_start'/>
-                    <field name='date_end'/>
-                    <field name='working_hours_per_day'/>
-                    <field name='wage_type_id'/>
-                    <field name='wage'/>
+        <record id="hr_contract_view_tree" model="ir.ui.view">
+            <field name="name">hr.contract.view.tree</field>
+            <field name="model">hr.contract</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Contracts">
+                    <field name="name"/>
+                    <field name="employee_id"/>
+                    <field name="function"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="working_hours_per_day"/>
+                    <field name="wage_type_id"/>
+                    <field name="wage"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_hr_contract' model='ir.actions.act_window'>
-            <field name='name'>Contract</field>
-            <field name='res_model'>hr.contract</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
-            <field name='domain'>[]</field>
+        <record id="action_hr_contract" model="ir.actions.act_window">
+            <field name="name">Contract</field>
+            <field name="res_model">hr.contract</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="domain">[]</field>
         </record>
         
-        <menuitem name='Human Resources/Contract' action='action_hr_contract' id='hr_menu_contract'/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root"/>
         
     </data>
-</terp>
-
-
+</terp>
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 4851082a489..4ec63b343e9 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_report.xml b/addons/hr_expense/hr_expense_report.xml
index 6ca989ac418..a8c96ad2b79 100644
--- a/addons/hr_expense/hr_expense_report.xml
+++ b/addons/hr_expense/hr_expense_report.xml
@@ -1,11 +1,6 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report id="hr_expenses"
-			string="Print HR expenses"
-			model="hr.expense.expense"
-			name="hr.expense"
-			rml="hr_expense/report/expense.rml"
-			auto="False"/>
+        <report auto="False" id="hr_expenses" model="hr.expense.expense" name="hr.expense" rml="hr_expense/report/expense.rml" string="Print HR expenses"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_sequence.xml b/addons/hr_expense/hr_expense_sequence.xml
index fae63797084..fdb11e04b7e 100644
--- a/addons/hr_expense/hr_expense_sequence.xml
+++ b/addons/hr_expense/hr_expense_sequence.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="ir.sequence.type" id="seq_type_hr_expense_invoice">
+        <record id="seq_type_hr_expense_invoice" model="ir.sequence.type">
             <field name="name">Expense invoice</field>
             <field name="code">hr.expense.invoice</field>
         </record>
-        <record model="ir.sequence" id="seq_hr_expense_invoice">
+        <record id="seq_hr_expense_invoice" model="ir.sequence">
             <field name="name">Expense invoice</field>
             <field name="code">hr.expense.invoice</field>
             <field name="prefix">EXP/</field>
             <field name="padding">3</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 01d8955fa86..8f28adb1929 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -1,161 +1,161 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!-- Expenses -->
-        <record id='view_expenses_line_tree' model='ir.ui.view'>
-            <field name='name'>hr.expense.line.tree</field>
-            <field name='type'>tree</field>
-            <field name='model'>hr.expense.line</field>
-            <field name='arch' type='xml'>
-                <tree string='Expense Lines'>
-                    <field name='date_value'/>
-                    <field name='name'/>
-                    <field name='ref'/>
-                    <field name='analytic_account' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;normal&apos;)]'/>
-                    <field name='unit_amount'/>
-                    <field name='unit_quantity'/>
-                    <field name='total_amount'/>
+        <record id="view_expenses_line_tree" model="ir.ui.view">
+            <field name="name">hr.expense.line.tree</field>
+            <field name="type">tree</field>
+            <field name="model">hr.expense.line</field>
+            <field name="arch" type="xml">
+                <tree string="Expense Lines">
+                    <field name="date_value"/>
+                    <field name="name"/>
+                    <field name="ref"/>
+                    <field domain="[('type','=','normal')]" name="analytic_account"/>
+                    <field name="unit_amount"/>
+                    <field name="unit_quantity"/>
+                    <field name="total_amount"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_expenses_tree' model='ir.ui.view'>
-            <field name='name'>hr.expense.expense.tree</field>
-            <field name='model'>hr.expense.expense</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Expenses'>
-                    <field name='date'/>
-                    <field name='employee_id'/>
-                    <field name='name'/>
-                    <field name='ref'/>
-                    <field name='amount'/>
-                    <field name='state'/>
+        <record id="view_expenses_tree" model="ir.ui.view">
+            <field name="name">hr.expense.expense.tree</field>
+            <field name="model">hr.expense.expense</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Expenses">
+                    <field name="date"/>
+                    <field name="employee_id"/>
+                    <field name="name"/>
+                    <field name="ref"/>
+                    <field name="amount"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='view_expenses_form' model='ir.ui.view'>
-            <field name='name'>hr.expense.form</field>
-            <field name='type'>form</field>
-            <field name='model'>hr.expense.expense</field>
-            <field name='arch' type='xml'>
-                <form string='Expenses Sheet'>
+        <record id="view_expenses_form" model="ir.ui.view">
+            <field name="name">hr.expense.form</field>
+            <field name="type">form</field>
+            <field name="model">hr.expense.expense</field>
+            <field name="arch" type="xml">
+                <form string="Expenses Sheet">
                     <notebook>
-                        <page string='Expense Sheet'>
-                            <field name='name' select='1'/>
-                            <field name='id' select='2'/>
-                            <field name='employee_id' select='1'/>
-                            <field name='date' select='1'/>
-                            <field name='ref' select='2'/>
+                        <page string="Expense Sheet">
+                            <field name="name" select="1"/>
+                            <field name="id" select="2"/>
+                            <field name="employee_id" select="1"/>
+                            <field name="date" select="1"/>
+                            <field name="ref" select="2"/>
                             <newline/>
-                            <field name='amount'/>
-                            <field name='currency_id'/>
-                            <field name='line_ids' nolabel='1' colspan='4'>
-                                <form string='Expense Lines'>
-                                    <field name='name' select='1'/>
-                                    <field name='date_value' select='1'/>
-                                    <field name='product_id' on_change='onchange_product_id(product_id, uom_id)' select='2'/>
-                                    <field name='uom_id' on_change='onchange_product_id(product_id, uom_id)' select='2'/>
-                                    <field name='unit_quantity' select='2'/>
-                                    <field name='unit_amount' select='2'/>
-                                    <field name='ref' select='2'/>
-                                    <field name='sequence'/>
-                                    <field name='analytic_account' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;normal&apos;)]'/>
+                            <field name="amount"/>
+                            <field name="currency_id"/>
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <form string="Expense Lines">
+                                    <field name="name" select="1"/>
+                                    <field name="date_value" select="1"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, uom_id)" select="2"/>
+                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id)" select="2"/>
+                                    <field name="unit_quantity" select="2"/>
+                                    <field name="unit_amount" select="2"/>
+                                    <field name="ref" select="2"/>
+                                    <field name="sequence"/>
+                                    <field domain="[('type','=','normal')]" name="analytic_account"/>
                                     <newline/>
-                                    <field name='total_amount'/>
+                                    <field name="total_amount"/>
                                 </form>
                             </field>
-                            <field name='state' select='2'/>
-                            <group col='6' colspan='2'>
-                                <button name='confirm' type='workflow' states='draft' string='Confirm'/>
-                                <button name='cancel' type='workflow' states='cancel' string='Cancel'/>
-                                <button name='validate' type='workflow' states='confirm' string='Accept'/>
-                                <button name='invoice' type='workflow' states='accepted' string='Invoice'/>
-                                <button name='draft' type='workflow' states='confirm' string='Set to Draft'/>
-                                <button name='refuse' type='workflow' states='confirm,draft,accepted' string='Refuse'/>
+                            <field name="state" select="2"/>
+                            <group col="6" colspan="2">
+                                <button name="confirm" states="draft" string="Confirm" type="workflow"/>
+                                <button name="cancel" states="cancel" string="Cancel" type="workflow"/>
+                                <button name="validate" states="confirm" string="Accept" type="workflow"/>
+                                <button name="invoice" states="accepted" string="Invoice" type="workflow"/>
+                                <button name="draft" states="confirm" string="Set to Draft" type="workflow"/>
+                                <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow"/>
                             </group>
                         </page>
-                        <page string='Other Info'>
-                            <separator string='Accounting data' colspan='4'/>
-                            <field name='journal_id'/>
-                            <separator string='Validation' colspan='4'/>
-                            <field name='date_confirm' select='2'/>
-                            <field name='date_valid' select='2'/>
-                            <field name='user_valid' select='2'/>
-                            <field name='invoice_id' select='2'/>
-                            <separator string='Notes' colspan='4'/>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Other Info">
+                            <separator colspan="4" string="Accounting data"/>
+                            <field name="journal_id"/>
+                            <separator colspan="4" string="Validation"/>
+                            <field name="date_confirm" select="2"/>
+                            <field name="date_valid" select="2"/>
+                            <field name="user_valid" select="2"/>
+                            <field name="invoice_id" select="2"/>
+                            <separator colspan="4" string="Notes"/>
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='expense_all' model='ir.actions.act_window'>
-            <field name='name'>All expenses</field>
-            <field name='res_model'>hr.expense.expense</field>
-            <field name='view_type'>form</field>
+        <record id="expense_all" model="ir.actions.act_window">
+            <field name="name">All expenses</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
         </record>
-        <menuitem name='Human Resources/Expenses/All Expenses' action='expense_all' id='menu_expense_all'/>
-        <record id='expense_all_draft' model='ir.actions.act_window'>
-            <field name='name'>Draft expenses</field>
-            <field name='res_model'>hr.expense.expense</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft')]</field>
+        <menuitem id="next_id_49" name="Expenses" parent="hr.menu_hr_root"/><menuitem action="expense_all" id="menu_expense_all" parent="next_id_49"/>
+        <record id="expense_all_draft" model="ir.actions.act_window">
+            <field name="name">Draft expenses</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
         </record>
-        <menuitem name='Human Resources/Expenses/All Expenses/Draft Expenses' action='expense_all_draft' id='menu_expense_all_draft'/>
-        <record id='expense_all_confirm' model='ir.actions.act_window'>
-            <field name='name'>Expenses waiting validation</field>
-            <field name='res_model'>hr.expense.expense</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','confirm')]</field>
+        <menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all"/>
+        <record id="expense_all_confirm" model="ir.actions.act_window">
+            <field name="name">Expenses waiting validation</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','confirm')]</field>
         </record>
-        <menuitem name='Human Resources/Expenses/All Expenses/Expenses Waiting Validation' action='expense_all_confirm' id='menu_expense_all_confirm'/>
-        <record id='expense_all_valid' model='ir.actions.act_window'>
-            <field name='name'>Expenses waiting invoice</field>
-            <field name='res_model'>hr.expense.expense</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','accepted')]</field>
+        <menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all"/>
+        <record id="expense_all_valid" model="ir.actions.act_window">
+            <field name="name">Expenses waiting invoice</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','accepted')]</field>
         </record>
-        <menuitem name='Human Resources/Expenses/All Expenses/Expenses Waiting Invoice' action='expense_all_valid' id='menu_expense_all_valid'/>
-        <record id='expense_all_invoiced' model='ir.actions.act_window'>
-            <field name='name'>Expenses waiting payment</field>
-            <field name='res_model'>hr.expense.expense</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','invoiced')]</field>
+        <menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all"/>
+        <record id="expense_all_invoiced" model="ir.actions.act_window">
+            <field name="name">Expenses waiting payment</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','invoiced')]</field>
         </record>
-        <menuitem name='Human Resources/Expenses/All Expenses/Expenses Waiting Payment' action='expense_all_invoiced' id='menu_expense_all_invoiced'/>
+        <menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all"/>
         
         <!--
 		My expenses menu
 		-->
-        <record id='expense_my' model='ir.actions.act_window'>
-            <field name='name'>My Expenses</field>
-            <field name='res_model'>hr.expense.expense</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="expense_my" model="ir.actions.act_window">
+            <field name="name">My Expenses</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Human Resources/Expenses/My Expenses' action='expense_my' id='menu_expense_my'/>
-        <record id='expense_my_draft' model='ir.actions.act_window'>
-            <field name='name'>My Draft expenses</field>
-            <field name='res_model'>hr.expense.expense</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid),('state','=','draft')]</field>
+        <menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49"/>
+        <record id="expense_my_draft" model="ir.actions.act_window">
+            <field name="name">My Draft expenses</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','draft')]</field>
         </record>
-        <menuitem name='Human Resources/Expenses/My Expenses/My Draft Expenses' action='expense_my_draft' id='menu_expense_my_draft'/>
-        <record id='expense_my_confirm' model='ir.actions.act_window'>
-            <field name='name'>My expenses waiting validation</field>
-            <field name='res_model'>hr.expense.expense</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid),('state','=','confirm')]</field>
+        <menuitem action="expense_my_draft" id="menu_expense_my_draft" parent="hr_expense.menu_expense_my"/>
+        <record id="expense_my_confirm" model="ir.actions.act_window">
+            <field name="name">My expenses waiting validation</field>
+            <field name="res_model">hr.expense.expense</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','confirm')]</field>
         </record>
-        <menuitem name='Human Resources/Expenses/My Expenses/My Expenses Waiting Validation' action='expense_my_confirm' id='menu_expense_my_confirm'/>
+        <menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 34a37ba7f58..f4687aca7de 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
         <!-- Roles definition -->
         
-        <record model="res.roles" id="HR">
+        <record id="HR" model="res.roles">
             <field name="name">Human Resources - Expenses</field>
         </record>
         
-        <record model="res.roles" id="HR_INV">
+        <record id="HR_INV" model="res.roles">
             <field name="name">Human Resources - Expenses invoice</field>
         </record>
         
         <!-- Workflow definition -->
         
-        <record model="workflow" id="wkf_expenses">
+        <record id="wkf_expenses" model="workflow">
             <field name="name">hr.wkf.expenses</field>
             <field name="osv">hr.expense.expense</field>
             <field name="on_create">True</field>
         </record>
         
-        <record model="workflow.activity" id="act_draft">
-            <field name="wkf_id" ref="wkf_expenses" />
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">draft</field>
             <field name="flow_start">True</field>
             <field name="kind">function</field>
             <field name="action">write({'state': 'draft'})</field>
         </record>
-        <record model="workflow.activity" id="act_confirm">
-            <field name="wkf_id" ref="wkf_expenses" />
+        <record id="act_confirm" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">confirm</field>
             <field name="kind">function</field>
             <field name="action">expense_confirm()</field>
         </record>
-        <record model="workflow.activity" id="act_accepted">
-            <field name="wkf_id" ref="wkf_expenses" />
+        <record id="act_accepted" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">accepted</field>
             <field name="kind">function</field>
             <field name="action">expense_accept()</field>
         </record>
-        <record model="workflow.activity" id="act_paid">
-            <field name="wkf_id" ref="wkf_expenses" />
+        <record id="act_paid" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">paid</field>
             <field name="kind">function</field>
             <field name="action">expense_paid()</field>
             <field name="flow_stop">True</field>
         </record>
-        <record model="workflow.activity" id="act_refused">
-            <field name="wkf_id" ref="wkf_expenses" />
+        <record id="act_refused" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">refused</field>
             <field name="kind">function</field>
             <field name="action">expense_canceled()</field>
             <field name="flow_stop">True</field>
         </record>
-        <record model="workflow.activity" id="act_invoice">
+        <record id="act_invoice" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">invoice</field>
             <field name="kind">subflow</field>
@@ -61,14 +61,14 @@
             <field name="action">action_invoice_create()</field>
         </record>
         
-        <record model="workflow.transition" id="t1">
-            <field name="act_from" ref="act_draft" />
-            <field name="act_to" ref="act_confirm" />
+        <record id="t1" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_confirm"/>
             <field name="signal">confirm</field>
         </record>
-        <record model="workflow.transition" id="t2">
-            <field name="act_from" ref="act_confirm" />
-            <field name="act_to" ref="act_accepted" />
+        <record id="t2" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_accepted"/>
             <field name="signal">validate</field>
             <field name="role_id" ref="HR"/>
         </record>
@@ -78,46 +78,46 @@
 			<field name="signal">paid</field>
 			<field name="role_id" ref="HR"/>
 		</record-->
-        <record model="workflow.transition" id="t4">
-            <field name="act_from" ref="act_confirm" />
-            <field name="act_to" ref="act_refused" />
+        <record id="t4" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
             <field name="role_id" ref="HR"/>
         </record>
-        <record model="workflow.transition" id="t5">
-            <field name="act_from" ref="act_draft" />
-            <field name="act_to" ref="act_refused" />
+        <record id="t5" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
         </record>
         
-        <record model="workflow.transition" id="t6">
-            <field name="act_from" ref="act_accepted" />
-            <field name="act_to" ref="act_refused" />
+        <record id="t6" model="workflow.transition">
+            <field name="act_from" ref="act_accepted"/>
+            <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
             <field name="role_id" ref="HR"/>
         </record>
-        <record model="workflow.transition" id="t7">
-            <field name="act_from" ref="act_confirm" />
-            <field name="act_to" ref="act_draft" />
+        <record id="t7" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
             <field name="role_id" ref="HR"/>
         </record>
-        <record model="workflow.transition" id="t8">
-            <field name="act_from" ref="act_accepted" />
-            <field name="act_to" ref="act_invoice" />
+        <record id="t8" model="workflow.transition">
+            <field name="act_from" ref="act_accepted"/>
+            <field name="act_to" ref="act_invoice"/>
             <field name="signal">invoice</field>
             <field name="role_id" ref="HR_INV"/>
         </record>
-        <record model="workflow.transition" id="t9">
-            <field name="act_from" ref="act_invoice" />
-            <field name="act_to" ref="act_paid" />
+        <record id="t9" model="workflow.transition">
+            <field name="act_from" ref="act_invoice"/>
+            <field name="act_to" ref="act_paid"/>
             <field name="signal">subflow.paid</field>
         </record>
-        <record model="workflow.transition" id="t10">
-            <field name="act_from" ref="act_invoice" />
-            <field name="act_to" ref="act_refused" />
+        <record id="t10" model="workflow.transition">
+            <field name="act_from" ref="act_invoice"/>
+            <field name="act_to" ref="act_refused"/>
             <field name="signal">subflow.cancel</field>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index 18c8acb257a..1ace31ecffa 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="account.analytic.journal" id="analytic_journal">
+        <record id="analytic_journal" model="account.analytic.journal">
             <field name="code">TS</field>
             <field name="name">Timesheet Journal</field>
             <field name="type">general</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index f4b0d733635..f5f098ceba7 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="product.uom.categ" id="uom_categ_wtime">
+        <record id="uom_categ_wtime" model="product.uom.categ">
             <field name="name">Working Time</field>
         </record>
-        <record model="product.uom" id="uom_hour">
+        <record id="uom_hour" model="product.uom">
             <field name="name">Hour</field>
-            <field name="category_id" eval="uom_categ_wtime"/>
+            <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor">8.0</field>
         </record>
-        <record model="product.uom" id="uom_day">
+        <record id="uom_day" model="product.uom">
             <field name="name">Day</field>
-            <field name="category_id" eval="uom_categ_wtime"/>
+            <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor">1.0</field>
         </record>
         
@@ -27,117 +27,117 @@
             <field name="type">service</field>
             <field name="supply_method">produce</field>
             <field name="procure_method">make_to_order</field>
-            <field name="purchase_ok" eval="False"/>
+            <field eval="False" name="purchase_ok"/>
         </record>
         
         <!-- complete our example employee -->
-        <record model="hr.employee" id="hr.employee1">
+        <record id="hr.employee1" model="hr.employee">
             <field name="product_id" ref="product_consultant"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
         
-        <record model="hr.analytic.timesheet" id="analytic_timesheet1">
+        <record id="analytic_timesheet1" model="hr.analytic.timesheet">
             <field name="amount">-240.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-%d')"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field name="name">Letters</field>
             <field name="unit_amount">8.0</field>
-            <field name="account_id" search="[('name','=', 'Administratif')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="account_id" search="[('name','=', 'Administratif')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
-        <record model="hr.analytic.timesheet" id="analytic_timesheet2">
+        <record id="analytic_timesheet2" model="hr.analytic.timesheet">
             <field name="amount">-120.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-01')"/>
+            <field eval="time.strftime('%Y-%m-01')" name="date"/>
             <field name="name">Support by phone</field>
             <field name="unit_amount">4.0</field>
-            <field name="account_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="account_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
-        <record model="hr.analytic.timesheet" id="analytic_timesheet3">
+        <record id="analytic_timesheet3" model="hr.analytic.timesheet">
             <field name="amount">-120.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-01')"/>
+            <field eval="time.strftime('%Y-%m-01')" name="date"/>
             <field name="name">Support</field>
             <field name="unit_amount">4.0</field>
-            <field name="account_id" search="[('name','=', 'Seagate P2')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="account_id" search="[('name','=', 'Seagate P2')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
-        <record model="hr.analytic.timesheet" id="analytic_timesheet4">
+        <record id="analytic_timesheet4" model="hr.analytic.timesheet">
             <field name="amount">-240.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-02')"/>
+            <field eval="time.strftime('%Y-%m-02')" name="date"/>
             <field name="name">Repport on this</field>
             <field name="unit_amount">8.0</field>
-            <field name="account_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="account_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
-        <record model="hr.analytic.timesheet" id="analytic_timesheet5">
+        <record id="analytic_timesheet5" model="hr.analytic.timesheet">
             <field name="amount">-240.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-03')"/>
+            <field eval="time.strftime('%Y-%m-03')" name="date"/>
             <field name="name">Repport on that</field>
             <field name="unit_amount">8.0</field>
-            <field name="account_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="account_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
-        <record model="hr.analytic.timesheet" id="analytic_timesheet6">
+        <record id="analytic_timesheet6" model="hr.analytic.timesheet">
             <field name="amount">-240.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-04')"/>
+            <field eval="time.strftime('%Y-%m-04')" name="date"/>
             <field name="name">Phone support</field>
             <field name="unit_amount">8.0</field>
-            <field name="account_id" search="[('name','=', 'Sednacom')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="account_id" search="[('name','=', 'Sednacom')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
-        <record model="hr.analytic.timesheet" id="analytic_timesheet7">
+        <record id="analytic_timesheet7" model="hr.analytic.timesheet">
             <field name="amount">-210.0</field>
             <field name="name">Phone support on reporting engine</field>
-            <field name="date" eval="time.strftime('%Y-%m-05')"/>
+            <field eval="time.strftime('%Y-%m-05')" name="date"/>
             <field name="unit_amount">7.0</field>
-            <field name="account_id" ref="base.res_partner_c2c" />
+            <field name="account_id" ref="base.res_partner_c2c"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
-        <record model="hr.analytic.timesheet" id="analytic_timesheet8">
+        <record id="analytic_timesheet8" model="hr.analytic.timesheet">
             <field name="amount">-210.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-06')"/>
+            <field eval="time.strftime('%Y-%m-06')" name="date"/>
             <field name="name">Quotation 234 done</field>
             <field name="unit_amount">8.0</field>
-            <field name="account_id" search="[('name','=', 'Agrolait')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="account_id" search="[('name','=', 'Agrolait')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
-        <record model="hr.analytic.timesheet" id="analytic_timesheet9">
+        <record id="analytic_timesheet9" model="hr.analytic.timesheet">
             <field name="amount">-210.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-07')"/>
+            <field eval="time.strftime('%Y-%m-07')" name="date"/>
             <field name="name">Quotation 356</field>
             <field name="unit_amount">8.0</field>
-            <field name="account_id" search="[('name','=', 'Agrolait')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="account_id" search="[('name','=', 'Agrolait')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
             <field name="user_id" ref="base.user_admin"/>
@@ -145,9 +145,9 @@
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
         
-        <record model="hr.analytic.timesheet" id="analytic_timesheet10">
+        <record id="analytic_timesheet10" model="hr.analytic.timesheet">
             <field name="amount">-210.0</field>
-            <field name="date" eval="time.strftime('%Y-%m-08', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))"/>
+            <field eval="time.strftime('%Y-%m-08', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date"/>
             <field name="name">Quotation 42</field>
             <field name="unit_amount">5.0</field>
             <field name="account_id" ref="account.analytic_agrolait"/>
@@ -158,4 +158,4 @@
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index a4dac217ed6..dfaac9c8f23 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,19 +1,18 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report name='hr.analytical.timesheet' id='report_user_timesheet' xsl='hr_timesheet/report/user_timesheet.xsl' auto='False' model='hr.employee' menu='False' string='Employee timesheet'/>
+        <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
         
-        <wizard name='hr.analytical.timesheet' id='wizard_hr_timesheet' model='hr.employee' menu='False' string='Employee timesheet'/>
-        <menuitem name='Human Resources/Reporting/Timesheet/Print a User Timesheet' action='wizard_hr_timesheet' type='wizard' id='menu_wizard_hr_timesheet'/>
+        <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet"/>
+        <menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/><menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"/>
         
-        <wizard name='hr.analytical.timesheet.my' id='wizard_hr_timesheet_my' model='hr.employee' menu='False' string='Print my timesheet'/>
-        <menuitem name='Human Resources/Reporting/Timesheet/Print My Timesheet' action='wizard_hr_timesheet_my' type='wizard' id='menu_wizard_hr_timesheet_my'/>
+        <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print my timesheet"/>
+        <menuitem action="wizard_hr_timesheet_my" id="menu_wizard_hr_timesheet_my" parent="hr_timesheet.next_id_48" type="wizard"/>
         
-        <report name='hr.analytical.timesheet_users' id='report_users_timesheet' xsl='hr_timesheet/report/users_timesheet.xsl' auto='False' model='hr.employee' menu='False' string='Employees timesheet'/>
+        <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
         
-        <wizard name='hr.analytical.timesheet_users' id='wizard_hr_timesheet_users' model='hr.employee' menu='False' string='Employees timesheet'/>
-        <menuitem name='Human Resources/Reporting/Timesheet/Print Summary Timesheet' action='wizard_hr_timesheet_users' type='wizard' id='menu_wizard_hr_timesheet_users'/>
+        <wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees timesheet"/>
+        <menuitem action="wizard_hr_timesheet_users" id="menu_wizard_hr_timesheet_users" parent="hr_timesheet.next_id_48" type="wizard"/>
         
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 845dcb1c8d3..a9ebd1cedd1 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -1,104 +1,104 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id='hr_timesheet_line_tree' model='ir.ui.view'>
-            <field name='name'>hr.analytic.timesheet.tree</field>
-            <field name='model'>hr.analytic.timesheet</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree editable='bottom' string='Timesheet Line'>
-                    <field name='user_id' on_change='on_change_user_id(user_id)' required='1'/>
-                    <field name='date'/>
-                    <field name='account_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;normal&apos;),(&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;close&apos;)]'/>
-                    <field name='name'/>
-                    <field name='unit_amount' sum='Total time' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                    <field name='product_id' required='1'/>
-                    <field name='product_uom_id' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                    <field name='amount' sum='Total cost'/>
-                    <field name='general_account_id'/>
+        <record id="hr_timesheet_line_tree" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.tree</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Timesheet Line">
+                    <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
+                    <field name="date"/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
+                    <field name="name"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
+                    <field name="product_id" required="1"/>
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field name="amount" sum="Total cost"/>
+                    <field name="general_account_id"/>
                 </tree>
             </field>
         </record>
-        <record id='hr_timesheet_line_form' model='ir.ui.view'>
-            <field name='name'>hr.analytic.timesheet.form</field>
-            <field name='model'>hr.analytic.timesheet</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet Lines'>
-                    <field name='name' colspan='4'/>
-                    <field name='user_id' on_change='on_change_user_id(user_id)' required='1' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='unit_amount' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
+        <record id="hr_timesheet_line_form" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.form</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet Lines">
+                    <field colspan="4" name="name"/>
+                    <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                     <newline/>
-                    <field name='product_id' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)' required='1'/>
-                    <field name='product_uom_id' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1"/>
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                     
-                    <field name='account_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;normal&apos;),(&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;close&apos;)]' select='1'/>
-                    <field name='amount' select='2'/>
-                    <field name='general_account_id' select='2'/>
-                    <field name='journal_id'/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
+                    <field name="amount" select="2"/>
+                    <field name="general_account_id" select="2"/>
+                    <field name="journal_id"/>
                 </form>
             </field>
         </record>
         
-        <record id='act_hr_timesheet_line_today_form' model='ir.actions.act_window'>
-            <field name='name'>Hours Encoding</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr.analytic.timesheet</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='hr_timesheet_line_tree'/>
+        <record id="act_hr_timesheet_line_today_form" model="ir.actions.act_window">
+            <field name="name">Hours Encoding</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.analytic.timesheet</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="hr_timesheet_line_tree"/>
         </record>
-        <menuitem name='Human Resources/Hours Encoding' action='act_hr_timesheet_line_today_form' id='menu_act_hr_timesheet_line_today_form'/>
+        <menuitem action="act_hr_timesheet_line_today_form" id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root"/>
         
-        <record id='act_hr_timesheet_line_me_today_form' model='ir.actions.act_window'>
-            <field name='name'>My works of the day</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr.analytic.timesheet</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('date', '=', time.strftime('%Y-%m-%d')),('user_id','=',uid)]</field>
+        <record id="act_hr_timesheet_line_me_today_form" model="ir.actions.act_window">
+            <field name="name">My works of the day</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.analytic.timesheet</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('date', '=', time.strftime('%Y-%m-%d')),('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Human Resources/Hours Encoding/For me/My Works of the Day' action='act_hr_timesheet_line_me_today_form' id='menu_act_hr_timesheet_line_me_today_form'/>
+        <menuitem id="next_id_46" name="For me" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/><menuitem action="act_hr_timesheet_line_me_today_form" id="menu_act_hr_timesheet_line_me_today_form" parent="next_id_46"/>
         
-        <record id='act_hr_timesheet_line_me_all_form' model='ir.actions.act_window'>
-            <field name='name'>All my works</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr.analytic.timesheet</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="act_hr_timesheet_line_me_all_form" model="ir.actions.act_window">
+            <field name="name">All my works</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.analytic.timesheet</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Human Resources/Hours Encoding/For me/All My Works' action='act_hr_timesheet_line_me_all_form' id='menu_act_hr_timesheet_line_me_all_form'/>
+        <menuitem action="act_hr_timesheet_line_me_all_form" id="menu_act_hr_timesheet_line_me_all_form" parent="hr_timesheet.next_id_46"/>
         
-        <record id='act_hr_timesheet_line_evry1_today_form' model='ir.actions.act_window'>
-            <field name='name'>All works of the day</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr.analytic.timesheet</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('date', '=',	time.strftime('%Y-%m-%d'))]</field>
+        <record id="act_hr_timesheet_line_evry1_today_form" model="ir.actions.act_window">
+            <field name="name">All works of the day</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.analytic.timesheet</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('date', '=',	time.strftime('%Y-%m-%d'))]</field>
         </record>
-        <menuitem name='Human Resources/Hours Encoding/For Everyone/All Works of the Day' action='act_hr_timesheet_line_evry1_today_form' id='menu_act_hr_timesheet_line_evry1_today_form'/>
+        <menuitem id="next_id_47" name="For Everyone" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/><menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="next_id_47"/>
         
-        <record id='act_hr_timesheet_line_evry1_all_form' model='ir.actions.act_window'>
-            <field name='name'>All works</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr.analytic.timesheet</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
+            <field name="name">All works</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.analytic.timesheet</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Human Resources/Hours Encoding/For Everyone/All Works' action='act_hr_timesheet_line_evry1_all_form' id='menu_act_hr_timesheet_line_evry1_all_form'/>
+        <menuitem action="act_hr_timesheet_line_evry1_all_form" id="menu_act_hr_timesheet_line_evry1_all_form" parent="hr_timesheet.next_id_47"/>
         
-        <record id='hr_timesheet_employee_extd_form' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.employee.extd_form</field>
-            <field name='model'>hr.employee</field>
-            <field name='inherit_id' ref='hr.view_employee_form'/>
-            <field name='arch' type='xml'>
-                <field name='notes' position='after'>
-                    <field name='product_id'/>
-                    <field name='journal_id'/>
+        <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.employee.extd_form</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="notes" position="after">
+                    <field name="product_id"/>
+                    <field name="journal_id"/>
                 </field>
             </field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index 3e468bb327a..3b39fd49b32 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard name='hr_timesheet.si_so' id='si_so' model='hr.employee' string='Sign in / Sign out by project'/>
-        <menuitem name='Human Resources/Attendances/Sign in &amp; Out by Project' groups='base.group_admin' action='si_so' type='wizard' id='menu_si_so'/>
+        <wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
+        <menuitem action="si_so" groups="base.group_admin" id="menu_si_so" parent="hr.menu_hr_attendance" type="wizard"/>
 
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index 58ecd29d3d0..1c2543c2c1b 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="hr_timesheet_invoice.factor" id="timesheet_invoice_factor1">
+        <record id="timesheet_invoice_factor1" model="hr_timesheet_invoice.factor">
             <field name="name">100%</field>
-            <field name="customer_name"></field>
+            <field name="customer_name"/>
             <field name="factor">0.0</field>
         </record>
         
-        <record model="hr_timesheet_invoice.factor" id="timesheet_invoice_factor2">
+        <record id="timesheet_invoice_factor2" model="hr_timesheet_invoice.factor">
             <field name="name">50%</field>
             <field name="customer_name">50% Discount</field>
             <field name="factor">50.0</field>
         </record>
         
-        <record model="hr_timesheet_invoice.factor" id="timesheet_invoice_factor3">
+        <record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
             <field name="name">Gratis</field>
             <field name="customer_name">Offered developments</field>
             <field name="factor">100.0</field>
         </record>
         
-        <record model="account.analytic.account" id="account.analytic_sednacom">
-            <field name="to_invoice" ref="timesheet_invoice_factor1" />
+        <record id="account.analytic_sednacom" model="account.analytic.account">
+            <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
         
-        <record model="account.analytic.account" id="account.analytic_thymbra">
-            <field name="to_invoice" ref="timesheet_invoice_factor1" />
+        <record id="account.analytic_thymbra" model="account.analytic.account">
+            <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
         
-        <record model="account.analytic.account" id="account.analytic_partners_camp_to_camp">
-            <field name="to_invoice" ref="timesheet_invoice_factor1" />
+        <record id="account.analytic_partners_camp_to_camp" model="account.analytic.account">
+            <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 3da805bc885..ff353bff60d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -1,16 +1,15 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <report name='hr.timesheet.invoice.account.analytic.account.cost_ledger' id='account_analytic_account_cost_ledger' rml='account/project/report/cost_ledger.rml' auto='False' model='account.analytic.account' menu='False' string='Cost Ledger'/>
+        <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
         
-        <wizard name='hr.timesheet.invoice.account.analytic.account.cost_ledger.report' id='account_analytic_account_cost_ledger_report' model='account.analytic.account' keyword='client_print_multi' string='Cost Ledger'/>
+        <wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>
         
-        <report name='account.analytic.profit' id='report_analytical_profit' rml='hr_timesheet_invoice/report/account_analytic_profit.rml' auto='False' model='account.analytic.line' menu='False' string='Timesheet profit'/>
+        <report auto="False" id="report_analytical_profit" menu="False" model="account.analytic.line" name="account.analytic.profit" rml="hr_timesheet_invoice/report/account_analytic_profit.rml" string="Timesheet profit"/>
         
-        <wizard name='account.analytic.profit' id='account_analytic_profit' model='account.analytic.line' menu='False' string='Timesheet profit'/>
-        <menuitem name='Human Resources/Reporting/Invoice Rate by User' action='account_analytic_profit' type='wizard' id='print_account_analytic_profit'/>
+        <wizard id="account_analytic_profit" menu="False" model="account.analytic.line" name="account.analytic.profit" string="Timesheet profit"/>
+        <menuitem action="account_analytic_profit" id="print_account_analytic_profit" parent="hr.menu_hr_reporting" type="wizard"/>
         
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b8910a9b400..6b151d6a9df 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -1,209 +1,209 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id='account_analytic_account_form_form' model='ir.ui.view'>
-            <field name='name'>account.analytic.account.invoice.form</field>
-            <field name='model'>account.analytic.account</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='account.view_account_analytic_account_form'/>
-            <field name='arch' type='xml'>
-                <field name='quantity_max' position='before'>
-                    <separator string='Invoicing Data' colspan='4'/>
-                    <field name='pricelist_id'/>
-                    <field name='to_invoice'/>
-                    <field name='amount_max'/>
-                    <field name='amount_invoiced'/>
-                    <field name='state'/>
+        <record id="account_analytic_account_form_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.invoice.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <field name="quantity_max" position="before">
+                    <separator colspan="4" string="Invoicing Data"/>
+                    <field name="pricelist_id"/>
+                    <field name="to_invoice"/>
+                    <field name="amount_max"/>
+                    <field name="amount_invoiced"/>
+                    <field name="state"/>
                 </field>
             </field>
         </record>
         
-        <record id='hr_timesheet_line_form' model='ir.ui.view'>
-            <field name='name'>hr.analytic.timesheet.form</field>
-            <field name='model'>hr.analytic.timesheet</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='hr_timesheet.hr_timesheet_line_form'/>
-            <field name='arch' type='xml'>
-                <field name='journal_id' position='after'>
-                    <field name='to_invoice' select='2'/>
-                    <field name='invoice_id'/>
+        <record id="hr_timesheet_line_form" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.form</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+            <field name="arch" type="xml">
+                <field name="journal_id" position="after">
+                    <field name="to_invoice" select="2"/>
+                    <field name="invoice_id"/>
                 </field>
             </field>
         </record>
         
-        <record id='hr_timesheet_line_form2' model='ir.ui.view'>
-            <field name='name'>hr.analytic.timesheet.form2</field>
-            <field name='model'>hr.analytic.timesheet</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='hr_timesheet.hr_timesheet_line_form'/>
-            <field name='arch' type='xml'>
-                <field name='account_id' position='replace'>
-                    <field name='account_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;normal&apos;),(&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;close&apos;)]' on_change='on_change_account_id(account_id)' select='1'/>
+        <record id="hr_timesheet_line_form2" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.form2</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+            <field name="arch" type="xml">
+                <field name="account_id" position="replace">
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)" select="1"/>
                 </field>
             </field>
         </record>
         
-        <record id='hr_timesheet_line_tree' model='ir.ui.view'>
-            <field name='name'>hr.analytic.timesheet.tree</field>
-            <field name='model'>hr.analytic.timesheet</field>
-            <field name='type'>tree</field>
-            <field name='inherit_id' ref='hr_timesheet.hr_timesheet_line_tree'/>
-            <field name='arch' type='xml'>
-                <field name='amount' position='after'>
-                    <field name='to_invoice'/>
+        <record id="hr_timesheet_line_tree" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.tree</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="amount" position="after">
+                    <field name="to_invoice"/>
                 </field>
             </field>
         </record>
         
-        <record id='hr_timesheet_line_tree2' model='ir.ui.view'>
-            <field name='name'>hr.analytic.timesheet.tree2</field>
-            <field name='model'>hr.analytic.timesheet</field>
-            <field name='type'>tree</field>
-            <field name='inherit_id' ref='hr_timesheet.hr_timesheet_line_tree'/>
-            <field name='arch' type='xml'>
+        <record id="hr_timesheet_line_tree2" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.tree2</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+            <field name="arch" type="xml">
                 
-                <field name='account_id' position='replace'>
-                    <field name='account_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;normal&apos;),(&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;close&apos;)]' on_change='on_change_account_id(account_id)'/>
+                <field name="account_id" position="replace">
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>
         
         <!-- Inherits for account analytic lines -->
         
-        <record id='view_account_analytic_line_tree_inherit' model='ir.ui.view'>
-            <field name='name'>account.analytic.line.tree.to_invoice</field>
-            <field name='model'>account.analytic.line</field>
-            <field name='type'>tree</field>
-            <field name='inherit_id' ref='account.view_account_analytic_line_tree'/>
-            <field name='arch' type='xml'>
-                <field name='journal_id' position='after'>
-                    <field name='to_invoice'/>
+        <record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
+            <field name="name">account.analytic.line.tree.to_invoice</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="journal_id" position="after">
+                    <field name="to_invoice"/>
                 </field>
             </field>
         </record>
         
-        <record id='view_account_analytic_line_form_inherit' model='ir.ui.view'>
-            <field name='name'>account.analytic.line.form.to_invoice</field>
-            <field name='model'>account.analytic.line</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='account.view_account_analytic_line_form'/>
-            <field name='arch' type='xml'>
-                <field name='product_uom_id' position='after'>
-                    <field name='to_invoice'/>
+        <record id="view_account_analytic_line_form_inherit" model="ir.ui.view">
+            <field name="name">account.analytic.line.form.to_invoice</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
+            <field name="arch" type="xml">
+                <field name="product_uom_id" position="after">
+                    <field name="to_invoice"/>
                 </field>
             </field>
         </record>
         
         <!-- Menus -->
-        <record id='action_hr_analytic_timesheet_open_tree' model='ir.actions.act_window'>
-            <field name='name'>Entries to invoice</field>
-            <field name='res_model'>account.analytic.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('to_invoice','&lt;&gt;',False)]</field>
+        <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
+            <field name="name">Entries to invoice</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
         </record>
-        <menuitem name='Financial Management/Periodical Processing/Invoice on Entries' action='action_hr_analytic_timesheet_open_tree' id='menu_hr_analytic_timesheet_tree'/>
+        <menuitem action="action_hr_analytic_timesheet_open_tree" id="menu_hr_analytic_timesheet_tree" parent="account.menu_finance_periodical_processing"/>
          
         
         
-        <record id='action_hr_analytic_timesheet_tree_invoiced' model='ir.actions.act_window'>
-            <field name='name'>Uninvoiced Entries</field>
-            <field name='res_model'>account.analytic.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('invoice_id','=',False),('to_invoice','!=',False)]</field>
+        <record id="action_hr_analytic_timesheet_tree_invoiced" model="ir.actions.act_window">
+            <field name="name">Uninvoiced Entries</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
         </record>
-        <menuitem name='Financial Management/Periodical Processing/Invoice on Entries/Uninvoiced Entries' action='action_hr_analytic_timesheet_tree_invoiced' id='menu_hr_analytic_timesheet_tree_invoiced'/>
+        <menuitem action="action_hr_analytic_timesheet_tree_invoiced" id="menu_hr_analytic_timesheet_tree_invoiced" parent="hr_timesheet_invoice.menu_hr_analytic_timesheet_tree"/>
          
         
         
-        <record id='action_hr_analytic_timesheet_tree_invoiced_my' model='ir.actions.act_window'>
-            <field name='name'>My uninvoiced Entries</field>
-            <field name='res_model'>account.analytic.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
+        <record id="action_hr_analytic_timesheet_tree_invoiced_my" model="ir.actions.act_window">
+            <field name="name">My uninvoiced Entries</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Financial Management/Periodical Processing/Invoice on Entries/Uninvoiced Entries/My Uninvoiced Entries' action='action_hr_analytic_timesheet_tree_invoiced_my' id='menu_hr_analytic_timesheet_tree_invoiced_my'/>
+        <menuitem action="action_hr_analytic_timesheet_tree_invoiced_my" id="menu_hr_analytic_timesheet_tree_invoiced_my" parent="hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced"/>
          
         
-        <record id='action_open_analytic_accounts' model='ir.actions.act_window'>
-            <field name='name'>Open analytic accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','&lt;&gt;','close'),('type','&lt;&gt;','view')]</field>
+        <record id="action_open_analytic_accounts" model="ir.actions.act_window">
+            <field name="name">Open analytic accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem name='Financial Management/Charts/Analytic Charts of Accounts/Unclosed Accounts' action='action_open_analytic_accounts' id='menu_action_open_analytic_accounts'/>
+        <menuitem id="next_id_59" name="Analytic Charts of Accounts" parent="account.menu_finance_charts"/><menuitem action="action_open_analytic_accounts" id="menu_action_open_analytic_accounts" parent="next_id_59"/>
          
         
-        <record id='action_open_invoice_analytic_accounts' model='ir.actions.act_window'>
-            <field name='name'>Unclosed invoiced accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','&lt;&gt;','close'),('type','&lt;&gt;','view'),('pricelist_id','&lt;&gt;',False)]</field>
+        <record id="action_open_invoice_analytic_accounts" model="ir.actions.act_window">
+            <field name="name">Unclosed invoiced accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view'),('pricelist_id','&lt;&gt;',False)]</field>
         </record>
-        <menuitem name='Financial Management/Charts/Analytic Charts of Accounts/Unclosed Accounts/Unclosed Invoiced Accounts' action='action_open_invoice_analytic_accounts' id='menu_action_open_invoice_analytic_accounts'/>
+        <menuitem action="action_open_invoice_analytic_accounts" id="menu_action_open_invoice_analytic_accounts" parent="hr_timesheet_invoice.menu_action_open_analytic_accounts"/>
          
         
         
-        <record id='action_draft_analytic_accounts' model='ir.actions.act_window'>
-            <field name='name'>Draft analytic accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft'),('type','&lt;&gt;','view')]</field>
+        <record id="action_draft_analytic_accounts" model="ir.actions.act_window">
+            <field name="name">Draft analytic accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem name='Financial Management/Charts/Analytic Charts of Accounts/Draft Accounts' action='action_draft_analytic_accounts' id='menu_action_draft_analytic_accounts'/>
+        <menuitem action="action_draft_analytic_accounts" id="menu_action_draft_analytic_accounts" parent="hr_timesheet_invoice.next_id_59"/>
          
         
         
-        <record id='action_pending_analytic_accounts' model='ir.actions.act_window'>
-            <field name='name'>Pending analytic accounts</field>
-            <field name='res_model'>account.analytic.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','pending'),('type','&lt;&gt;','view')]</field>
+        <record id="action_pending_analytic_accounts" model="ir.actions.act_window">
+            <field name="name">Pending analytic accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','pending'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem name='Financial Management/Charts/Analytic Charts of Accounts/Pending Accounts' action='action_pending_analytic_accounts' id='menu_action_pending_analytic_accounts'/>
+        <menuitem action="action_pending_analytic_accounts" id="menu_action_pending_analytic_accounts" parent="hr_timesheet_invoice.next_id_59"/>
          
         
         
         
         
-        <record id='view_hr_timesheet_invoice_factor_form' model='ir.ui.view'>
-            <field name='name'>hr_timesheet_invoice.factor.form</field>
-            <field name='model'>hr_timesheet_invoice.factor</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Type of invoicing'>
-                    <field name='name' select='1' colspan='1'/>
-                    <field name='customer_name' select='2' colspan='1'/>
-                    <field name='factor' colspan='2'/>
+        <record id="view_hr_timesheet_invoice_factor_form" model="ir.ui.view">
+            <field name="name">hr_timesheet_invoice.factor.form</field>
+            <field name="model">hr_timesheet_invoice.factor</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Type of invoicing">
+                    <field colspan="1" name="name" select="1"/>
+                    <field colspan="1" name="customer_name" select="2"/>
+                    <field colspan="2" name="factor"/>
                 </form>
             </field>
         </record>
-        <record id='view_hr_timesheet_invoice_factor_tree' model='ir.ui.view'>
-            <field name='name'>hr_timesheet_invoice.factor.tree</field>
-            <field name='model'>hr_timesheet_invoice.factor</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Types of invoicing'>
-                    <field name='name'/>
-                    <field name='customer_name'/>
-                    <field name='factor'/>
+        <record id="view_hr_timesheet_invoice_factor_tree" model="ir.ui.view">
+            <field name="name">hr_timesheet_invoice.factor.tree</field>
+            <field name="model">hr_timesheet_invoice.factor</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Types of invoicing">
+                    <field name="name"/>
+                    <field name="customer_name"/>
+                    <field name="factor"/>
                 </tree>
             </field>
         </record>
-        <record id='action_hr_timesheet_invoice_factor_form' model='ir.actions.act_window'>
-            <field name='name'>Types of Invoicing</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr_timesheet_invoice.factor</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_hr_timesheet_invoice_factor_tree'/>
+        <record id="action_hr_timesheet_invoice_factor_form" model="ir.actions.act_window">
+            <field name="name">Types of Invoicing</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_invoice.factor</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_hr_timesheet_invoice_factor_tree"/>
         </record>
-        <menuitem name='Financial Management/Configuration/Analytic Accounts/Types of Invoicing' action='action_hr_timesheet_invoice_factor_form' id='hr_timesheet_invoice_factor_view'/>
+        <menuitem action="action_hr_timesheet_invoice_factor_form" id="hr_timesheet_invoice_factor_view" parent="account.next_id_39"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
index df7d8041faf..56065686dce 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
@@ -1,16 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard
-			string="Invoice analytic lines"
-			id="hr_timesheet_invoice_create"
-			model="account.analytic.line"
-			name="hr.timesheet.invoice.create"/>
-        <wizard
-			string="Final invoices"
-			id="hr_timesheet_final_invoice_create"
-			model="account.analytic.account"
-			name="hr.timesheet.final.invoice.create"/>
+        <wizard id="hr_timesheet_invoice_create" model="account.analytic.line" name="hr.timesheet.invoice.create" string="Invoice analytic lines"/>
+        <wizard id="hr_timesheet_final_invoice_create" model="account.analytic.account" name="hr.timesheet.final.invoice.create" string="Final invoices"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_project/hr_timesheet_project_view.xml b/addons/hr_timesheet_project/hr_timesheet_project_view.xml
index 3476c292a20..c3e62b9d0e1 100644
--- a/addons/hr_timesheet_project/hr_timesheet_project_view.xml
+++ b/addons/hr_timesheet_project/hr_timesheet_project_view.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <wizard name='hr_timesheet_project.encode.hour' id='encode_hour' model='hr.employee' string='Hours From Tasks'/>
-        <menuitem name='Human Resources/Hours Encoding/For me/Today&apos;s Work (Import From Projects)' action='encode_hour' type='wizard' id='menu_act_hr_timesheet_line_me_today_project_form'/>
+        <wizard id="encode_hour" model="hr.employee" name="hr_timesheet_project.encode.hour" string="Hours From Tasks"/>
+        <menuitem action="encode_hour" id="menu_act_hr_timesheet_line_me_today_project_form" parent="hr_timesheet.next_id_46" type="wizard"/>
         
-        <wizard name='hr_timesheet_project.encode.hour.noopen' id='encode_hour_tss' model='hr_timesheet_sheet.sheet' string='Timesheet From Tasks'/>
+        <wizard id="encode_hour_tss" model="hr_timesheet_sheet.sheet" name="hr_timesheet_project.encode.hour.noopen" string="Timesheet From Tasks"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index d3454ca53ea..c9f42691f3c 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -1,115 +1,115 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="hr_timesheet_sheet.sheet" id="sheet0">
+        <record id="sheet0" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 0</field>
-            <field name="user_id" ref="base.user_admin" />
-            <field name="date_from" eval="time.strftime('%Y-%m-01', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))"/>
-            <field name="date_current" eval="time.strftime('%Y-%m-15', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))"/>
-            <field name="date_to" eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))"/>
+            <field name="user_id" ref="base.user_admin"/>
+            <field eval="time.strftime('%Y-%m-01', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_from"/>
+            <field eval="time.strftime('%Y-%m-15', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_current"/>
+            <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
         </record>
         
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet10">
+        <record id="hr_timesheet.analytic_timesheet10" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet0"/>
         </record>
         
-        <record model="hr_timesheet_sheet.sheet" id="sheet1">
+        <record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 1</field>
-            <field name="user_id" search="[('login','=','admin')]" model="res.users"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
             <!--
 			<field name="date_from">2005-05-01</field>
 			<field name="date_to">2005-05-31</field>
 			-->
-            <field name="date_current" eval="time.strftime('%Y-%m-%d')"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
         </record>
         
-        <record model="hr.attendance" id="hr.attendance1">
+        <record id="hr.attendance1" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance2">
+        <record id="hr.attendance2" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance3">
+        <record id="hr.attendance3" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance4">
+        <record id="hr.attendance4" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance5">
+        <record id="hr.attendance5" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance6">
+        <record id="hr.attendance6" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance7">
+        <record id="hr.attendance7" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance8">
+        <record id="hr.attendance8" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance9">
+        <record id="hr.attendance9" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance10">
+        <record id="hr.attendance10" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance11">
+        <record id="hr.attendance11" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance12">
+        <record id="hr.attendance12" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance13">
+        <record id="hr.attendance13" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance14">
+        <record id="hr.attendance14" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance15">
+        <record id="hr.attendance15" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance16">
+        <record id="hr.attendance16" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance17">
+        <record id="hr.attendance17" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance18">
+        <record id="hr.attendance18" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance19">
+        <record id="hr.attendance19" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.attendance" id="hr.attendance20">
+        <record id="hr.attendance20" model="hr.attendance">
             <field name="sheet_id" ref="sheet1"/>
         </record>
         
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet1">
+        <record id="hr_timesheet.analytic_timesheet1" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet2">
+        <record id="hr_timesheet.analytic_timesheet2" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet3">
+        <record id="hr_timesheet.analytic_timesheet3" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet4">
+        <record id="hr_timesheet.analytic_timesheet4" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet5">
+        <record id="hr_timesheet.analytic_timesheet5" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet6">
+        <record id="hr_timesheet.analytic_timesheet6" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet7">
+        <record id="hr_timesheet.analytic_timesheet7" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet8">
+        <record id="hr_timesheet.analytic_timesheet8" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
-        <record model="hr.analytic.timesheet" id="hr_timesheet.analytic_timesheet9">
+        <record id="hr_timesheet.analytic_timesheet9" model="hr.analytic.timesheet">
             <field name="sheet_id" ref="sheet1"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 5123a0556ed..05f219c14ec 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -1,153 +1,153 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id='hr_timesheet_sheet_tree' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.sheet.tree</field>
-            <field name='model'>hr_timesheet_sheet.sheet</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Timesheets'>
-                    <field name='user_id'/>
-                    <field name='date_from'/>
-                    <field name='date_to'/>
-                    <field name='name'/>
-                    <field name='total_attendance'/>
-                    <field name='total_timesheet'/>
-                    <field name='total_difference'/>
-                    <field name='state'/>
+        <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.tree</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheets">
+                    <field name="user_id"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="name"/>
+                    <field name="total_attendance"/>
+                    <field name="total_timesheet"/>
+                    <field name="total_difference"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
         
-        <record id='hr_timesheet_account_form' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.account.form</field>
-            <field name='model'>hr_timesheet_sheet.sheet.account</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet by accounts'>
-                    <field name='sheet_id' select='1'/>
-                    <field name='name' select='1'/>
-                    <field name='total' sum='Total'/>
-                    <field name='invoice_rate' select='2'/>
+        <record id="hr_timesheet_account_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.account.form</field>
+            <field name="model">hr_timesheet_sheet.sheet.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet by accounts">
+                    <field name="sheet_id" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="total" sum="Total"/>
+                    <field name="invoice_rate" select="2"/>
                 </form>
             </field>
         </record>
         
-        <record id='hr_timesheet_account_tree' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.account.tree</field>
-            <field name='model'>hr_timesheet_sheet.sheet.account</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Timesheet by Accounts'>
-                    <field name='sheet_id'/>
-                    <field name='name'/>
-                    <field name='total' sum='Total'/>
-                    <field name='invoice_rate'/>
+        <record id="hr_timesheet_account_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.account.tree</field>
+            <field name="model">hr_timesheet_sheet.sheet.account</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheet by Accounts">
+                    <field name="sheet_id"/>
+                    <field name="name"/>
+                    <field name="total" sum="Total"/>
+                    <field name="invoice_rate"/>
                 </tree>
             </field>
         </record>
         
         
-        <record id='hr_timesheet_day_form' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.day.form</field>
-            <field name='model'>hr_timesheet_sheet.sheet.day</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet by Days'>
-                    <field name='sheet_id' select='1'/>
-                    <field name='name' select='1'/>
-                    <field name='total_timesheet'/>
-                    <field name='total_attendance'/>
-                    <field name='total_difference'/>
+        <record id="hr_timesheet_day_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.day.form</field>
+            <field name="model">hr_timesheet_sheet.sheet.day</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet by Days">
+                    <field name="sheet_id" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="total_timesheet"/>
+                    <field name="total_attendance"/>
+                    <field name="total_difference"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='hr_timesheet_day_tree' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.day.tree</field>
-            <field name='model'>hr_timesheet_sheet.sheet.day</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree colors='red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1' string='Timesheet by Days'>
-                    <field name='sheet_id'/>
-                    <field name='name'/>
-                    <field name='total_timesheet' sum='Total Timesheet'/>
-                    <field name='total_attendance' sum='Total Attendance'/>
-                    <field name='total_difference' sum='Total Difference'/>
+        <record id="hr_timesheet_day_tree" model="ir.ui.view">
+            <field name="name">hr.timesheet.day.tree</field>
+            <field name="model">hr_timesheet_sheet.sheet.day</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1" string="Timesheet by Days">
+                    <field name="sheet_id"/>
+                    <field name="name"/>
+                    <field name="total_timesheet" sum="Total Timesheet"/>
+                    <field name="total_attendance" sum="Total Attendance"/>
+                    <field name="total_difference" sum="Total Difference"/>
                 </tree>
             </field>
         </record>
         
-        <record id='hr_timesheet_sheet_form' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.sheet.form</field>
-            <field name='model'>hr_timesheet_sheet.sheet</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet'>
-                    <field name='name'/>
-                    <field name='user_id'/>
-                    <field name='date_from'/>
-                    <field name='date_to'/>
+        <record id="hr_timesheet_sheet_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.form</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
                     
-                    <notebook colspan='4'>
-                        <page string='Daily View'>
-                            <group col='6' colspan='4'>
-                                <button name='button_dummy' type='object' string='Go to:'/>
-                                <field name='date_current' nolabel='1'/>
-                                <label string=''/>
-                                <button name='date_previous' icon='gtk-media-previous' type='object' string=''/>
-                                <button name='date_today' type='object' string='Today'/>
-                                <button name='date_next' icon='gtk-media-next' type='object' string=''/>
+                    <notebook colspan="4">
+                        <page string="Daily View">
+                            <group col="6" colspan="4">
+                                <button name="button_dummy" string="Go to:" type="object"/>
+                                <field name="date_current" nolabel="1"/>
+                                <label string=""/>
+                                <button icon="gtk-media-previous" name="date_previous" string="" type="object"/>
+                                <button name="date_today" string="Today" type="object"/>
+                                <button icon="gtk-media-next" name="date_next" string="" type="object"/>
                             </group>
                             
-                            <field name='attendances_ids' height='100' nolabel='1' context='name=date_current,user_id=user_id' colspan='3'>
-                                <tree string='Attendances'>
-                                    <field name='name'/>
-                                    <field name='action'/>
-                                    <field name='employee_id' invisible='1'/>
+                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1">
+                                <tree string="Attendances">
+                                    <field name="name"/>
+                                    <field name="action"/>
+                                    <field invisible="1" name="employee_id"/>
                                 </tree>
                             </field>
-                            <group col='1' colspan='1'>
-                                <button name='sign_in' type='object' string='Sign In'/>
-                                <button name='sign_out' type='object' string='Sign Out'/>
+                            <group col="1" colspan="1">
+                                <button name="sign_in" string="Sign In" type="object"/>
+                                <button name="sign_out" string="Sign Out" type="object"/>
                             </group>
                             
                             
-                            <field name='state_attendance'/>
-                            <field name='total_attendance_day' widget='float_time'/>
-                            <field name='timesheet_ids' domain='[(&apos;name&apos;,&apos;=&apos;,date_current)]' nolabel='1' context='date=date_current,user_id=user_id' colspan='4'>
-                                <tree editable='top' string='Timesheet'>
-                                    <field name='date' invisible='1'/>
-                                    <field name='account_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;normal&apos;), (&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;close&apos;)]' on_change='on_change_account_id(account_id)'/>
-                                    <field name='name'/>
-                                    <field name='unit_amount' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)' widget='float_time'/>
-                                    <field name='to_invoice'/>
-                                    <field name='journal_id' invisible='1'/>
-                                    <field name='product_id' invisible='1'/>
-                                    <field name='product_uom_id' invisible='1' on_change='on_change_unit_amount(product_id, unit_amount, product_uom_id)'/>
-                                    <field name='amount'/>
-                                    <field name='general_account_id'/>
-                                    <field name='journal_id'/>
-                                    <field name='user_id' invisible='1' required='1'/>
+                            <field name="state_attendance"/>
+                            <field name="total_attendance_day" widget="float_time"/>
+                            <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
+                                <tree editable="top" string="Timesheet">
+                                    <field invisible="1" name="date"/>
+                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                                    <field name="name"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+                                    <field name="to_invoice"/>
+                                    <field invisible="1" name="journal_id"/>
+                                    <field invisible="1" name="product_id"/>
+                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                    <field name="amount"/>
+                                    <field name="general_account_id"/>
+                                    <field name="journal_id"/>
+                                    <field invisible="1" name="user_id" required="1"/>
                                 </tree>
                             </field>
-                            <field name='total_difference_day' widget='float_time'/>
-                            <field name='total_timesheet_day' widget='float_time'/>
+                            <field name="total_difference_day" widget="float_time"/>
+                            <field name="total_timesheet_day" widget="float_time"/>
                         </page>
-                        <page string='By Day'>
-                            <field name='period_ids' nolabel='1' colspan='4'>
-                                <tree colors='red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1' string='Period'>
-                                    <field name='name'/>
-                                    <field name='total_attendance' widget='float_time'/>
-                                    <field name='total_timesheet' widget='float_time'/>
-                                    <field name='total_difference' widget='float_time'/>
+                        <page string="By Day">
+                            <field colspan="4" name="period_ids" nolabel="1">
+                                <tree colors="red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1" string="Period">
+                                    <field name="name"/>
+                                    <field name="total_attendance" widget="float_time"/>
+                                    <field name="total_timesheet" widget="float_time"/>
+                                    <field name="total_difference" widget="float_time"/>
                                 </tree>
                             </field>
-                            <field name='total_attendance' widget='float_time'/>
-                            <field name='total_timesheet' widget='float_time'/>
-                            <field name='total_difference' widget='float_time'/>
+                            <field name="total_attendance" widget="float_time"/>
+                            <field name="total_timesheet" widget="float_time"/>
+                            <field name="total_difference" widget="float_time"/>
                         </page>
                         <!--
 					<page string="By account">
@@ -161,96 +161,96 @@
 					</page>
 					-->
                     </notebook>
-                    <field name='state'/>
-                    <group col='4' colspan='2'>
-                        <button name='button_confirm' type='object' states='draft' string='Confirm'/>
-                        <button name='action_set_to_draft' type='object' states='done' string='Set to Draft'/>
-                        <button name='cancel' states='confirm' string='Refuse'/>
-                        <button name='done' states='confirm' string='Accept'/>
+                    <field name="state"/>
+                    <group col="4" colspan="2">
+                        <button name="button_confirm" states="draft" string="Confirm" type="object"/>
+                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
+                        <button name="cancel" states="confirm" string="Refuse"/>
+                        <button name="done" states="confirm" string="Accept"/>
                     </group>
                 </form>
             </field>
         </record>
         
-        <record id='act_hr_timesheet_sheet_form' model='ir.actions.act_window'>
-            <field name='name'>All Timesheets</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr_timesheet_sheet.sheet</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='hr_timesheet_sheet_form'/>
+        <record id="act_hr_timesheet_sheet_form" model="ir.actions.act_window">
+            <field name="name">All Timesheets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="hr_timesheet_sheet_form"/>
         </record>
-        <menuitem name='Human Resources/Timesheets/All Timesheets' action='act_hr_timesheet_sheet_form' id='menu_act_hr_timesheet_sheet_form'/>
+        <menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/><menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"/>
         
-        <record id='act_hr_timesheet_sheet_form_my' model='ir.actions.act_window'>
-            <field name='name'>My timesheets</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr_timesheet_sheet.sheet</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="act_hr_timesheet_sheet_form_my" model="ir.actions.act_window">
+            <field name="name">My timesheets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('user_id','=',uid)]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Human Resources/Timesheets/My Timesheets' action='act_hr_timesheet_sheet_form_my' id='menu_act_hr_timesheet_sheet_form_my'/>
+        <menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60"/>
         
-        <record id='act_hr_timesheet_sheet_form_my_confirm' model='ir.actions.act_window'>
-            <field name='name'>My timesheets to confirm</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr_timesheet_sheet.sheet</field>
-            <field name='domain'>[('user_id','=',uid),('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="act_hr_timesheet_sheet_form_my_confirm" model="ir.actions.act_window">
+            <field name="name">My timesheets to confirm</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('user_id','=',uid),('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Human Resources/Timesheets/My Timesheets/My Timesheets to Confirm' action='act_hr_timesheet_sheet_form_my_confirm' id='menu_act_hr_timesheet_sheet_form_my_confirm'/>
+        <menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my"/>
         
-        <wizard name='hr_timesheet_sheet.department.open' id='act_hr_timesheet_sheet_form_department_current' model='hr.employee' string='My department&apos;s timesheet'/>
-        <menuitem name='Human Resources/Timesheets/My Department&apos;s Timesheets' icon='STOCK_JUSTIFY_FILL' action='act_hr_timesheet_sheet_form_department_current' type='wizard' id='menu_act_hr_timesheet_sheet_form_department_current'/>
+        <wizard id="act_hr_timesheet_sheet_form_department_current" model="hr.employee" name="hr_timesheet_sheet.department.open" string="My department's timesheet"/>
+        <menuitem action="act_hr_timesheet_sheet_form_department_current" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_current" parent="hr_timesheet_sheet.next_id_60" type="wizard"/>
         
-        <wizard name='hr_timesheet_sheet.department.validate.open' id='act_hr_timesheet_sheet_form_department_validate' model='hr.employee' string='My department&apos;s timesheet'/>
-        <menuitem name='Human Resources/Timesheets/My Department&apos;s Timesheets/Timesheets to Validate' icon='STOCK_JUSTIFY_FILL' action='act_hr_timesheet_sheet_form_department_validate' type='wizard' id='menu_act_hr_timesheet_sheet_form_department_validate'/>
+        <wizard id="act_hr_timesheet_sheet_form_department_validate" model="hr.employee" name="hr_timesheet_sheet.department.validate.open" string="My department's timesheet"/>
+        <menuitem action="act_hr_timesheet_sheet_form_department_validate" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_validate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current" type="wizard"/>
         
         
-        <wizard name='hr_timesheet_sheet.department.confirm.open' id='act_hr_timesheet_sheet_form_department_confirm' model='hr.employee' string='My department&apos;s timesheet'/>
-        <menuitem name='Human Resources/Timesheets/My Department&apos;s Timesheets/Timesheets to Confirm' icon='STOCK_JUSTIFY_FILL' action='act_hr_timesheet_sheet_form_department_confirm' type='wizard' id='menu_act_hr_timesheet_sheet_form_department_confirm'/>
+        <wizard id="act_hr_timesheet_sheet_form_department_confirm" model="hr.employee" name="hr_timesheet_sheet.department.confirm.open" string="My department's timesheet"/>
+        <menuitem action="act_hr_timesheet_sheet_form_department_confirm" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current" type="wizard"/>
         
         
         
         
-        <wizard name='hr_timesheet_sheet.current.open' id='act_hr_timesheet_sheet_form_my_current' model='hr.employee' string='My Current Timesheet'/>
-        <menuitem name='Human Resources/Timesheets/My Timesheets/My Current Timesheet' icon='STOCK_NEW' action='act_hr_timesheet_sheet_form_my_current' type='wizard' id='menu_act_hr_timesheet_sheet_form_my_current'/>
+        <wizard id="act_hr_timesheet_sheet_form_my_current" model="hr.employee" name="hr_timesheet_sheet.current.open" string="My Current Timesheet"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my_current" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" type="wizard"/>
         
-        <record id='act_hr_timesheet_sheet_form_all_confirm' model='ir.actions.act_window'>
-            <field name='name'>Timesheets To Confirm</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr_timesheet_sheet.sheet</field>
-            <field name='domain'>[('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="act_hr_timesheet_sheet_form_all_confirm" model="ir.actions.act_window">
+            <field name="name">Timesheets To Confirm</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Human Resources/Timesheets/All Timesheets/Timesheets to Confirm' action='act_hr_timesheet_sheet_form_all_confirm' id='menu_act_hr_timesheet_sheet_form_all_confirm'/>
+        <menuitem action="act_hr_timesheet_sheet_form_all_confirm" id="menu_act_hr_timesheet_sheet_form_all_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
         
-        <record id='act_hr_timesheet_sheet_form_all_valid' model='ir.actions.act_window'>
-            <field name='name'>Timesheets To Validate</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>hr_timesheet_sheet.sheet</field>
-            <field name='domain'>[('state','=','confirm')]</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="act_hr_timesheet_sheet_form_all_valid" model="ir.actions.act_window">
+            <field name="name">Timesheets To Validate</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('state','=','confirm')]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Human Resources/Timesheets/All Timesheets/Timesheets to Validate' action='act_hr_timesheet_sheet_form_all_valid' id='menu_act_hr_timesheet_sheet_form_all_valid'/>
+        <menuitem action="act_hr_timesheet_sheet_form_all_valid" id="menu_act_hr_timesheet_sheet_form_all_valid" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
         
         <!--
 			Company inheritancy
 		-->
         
-        <record id='hr_timesheet_sheet_company' model='ir.ui.view'>
-            <field name='name'>res.company.sheet</field>
-            <field name='model'>res.company</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='base.view_company_form'/>
-            <field name='arch' type='xml'>
-                <field name='rml_footer2' position='after'>
+        <record id="hr_timesheet_sheet_company" model="ir.ui.view">
+            <field name="name">res.company.sheet</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <field name="rml_footer2" position="after">
                     <newline/>
-                    <field name='timesheet_range'/>
-                    <field name='timesheet_max_difference'/>
+                    <field name="timesheet_range"/>
+                    <field name="timesheet_max_difference"/>
                     <newline/>
                 </field>
             </field>
@@ -260,14 +260,14 @@
 			hr.analytic.timesheet inheritancy
 		-->
         
-        <record id='hr_timesheet_line_form' model='ir.ui.view'>
-            <field name='name'>hr.analytic.timesheet.form</field>
-            <field name='model'>hr.analytic.timesheet</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='hr_timesheet.hr_timesheet_line_form'/>
-            <field name='arch' type='xml'>
-                <field name='date' position='after'>
-                    <field name='sheet_id' select='2'/>
+        <record id="hr_timesheet_line_form" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.form</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+            <field name="arch" type="xml">
+                <field name="date" position="after">
+                    <field name="sheet_id" select="2"/>
                 </field>
             </field>
         </record>
@@ -276,62 +276,62 @@
 			hr.attendance inheritancy
 		-->
         
-        <record id='view_attendance_form' model='ir.ui.view'>
-            <field name='name'>hr.attendance.form</field>
-            <field name='model'>hr.attendance</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='hr.view_attendance_form'/>
-            <field name='arch' type='xml'>
-                <field name='action_desc' position='after'>
-                    <field name='sheet_id' select='2'/>
+        <record id="view_attendance_form" model="ir.ui.view">
+            <field name="name">hr.attendance.form</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_attendance_form"/>
+            <field name="arch" type="xml">
+                <field name="action_desc" position="after">
+                    <field name="sheet_id" select="2"/>
                 </field>
             </field>
         </record>
-        <record id='view_attendance_tree' model='ir.ui.view'>
-            <field name='name'>hr.attendance.tree</field>
-            <field name='model'>hr.attendance</field>
-            <field name='type'>tree</field>
-            <field name='inherit_id' ref='hr.view_attendance_tree'/>
-            <field name='arch' type='xml'>
-                <field name='action_desc' position='after'>
-                    <field name='sheet_id'/>
+        <record id="view_attendance_tree" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr.view_attendance_tree"/>
+            <field name="arch" type="xml">
+                <field name="action_desc" position="after">
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
         
-        <act_window name='Timesheet by Account' domain='[(&apos;sheet_id&apos;, &apos;=&apos;, active_id)]' id='act_hr_timesheet_sheet_sheet_by_day' src_model='hr_timesheet_sheet.sheet' res_model='hr_timesheet_sheet.sheet.account'/>
-        <act_window name='Timesheet by Day' domain='[(&apos;sheet_id&apos;, &apos;=&apos;, active_id)]' id='act_hr_timesheet_sheet_sheet_by_account' src_model='hr_timesheet_sheet.sheet' res_model='hr_timesheet_sheet.sheet.day'/>
+        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
+        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>
         
         
-        <act_window name='Timesheet Lines' domain='[(&apos;sheet_id&apos;, &apos;=&apos;, active_id)]' id='act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet' src_model='hr_timesheet_sheet.sheet' res_model='hr.analytic.timesheet'/>
+        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet" name="Timesheet Lines" res_model="hr.analytic.timesheet" src_model="hr_timesheet_sheet.sheet"/>
         
-        <act_window name='Attendances' domain='[(&apos;sheet_id&apos;, &apos;=&apos;, active_id)]' id='act_hr_timesheet_sheet_sheet_2_hr_attendance' src_model='hr_timesheet_sheet.sheet' res_model='hr.attendance'/>
+        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_attendance" name="Attendances" res_model="hr.attendance" src_model="hr_timesheet_sheet.sheet"/>
         
-        <record id='hr_timesheet_sheet_tree_simplified' model='ir.ui.view'>
-            <field name='name'>hr.timesheet.sheet.tree.simplified</field>
-            <field name='model'>hr_timesheet_sheet.sheet</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='20'/>
-            <field name='arch' type='xml'>
-                <tree string='Timesheets'>
-                    <field name='date_from'/>
-                    <field name='user_id'/>
-                    <field name='name'/>
-                    <field name='total_attendance'/>
-                    <field name='total_timesheet'/>
-                    <field name='state'/>
+        <record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.tree.simplified</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">tree</field>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Timesheets">
+                    <field name="date_from"/>
+                    <field name="user_id"/>
+                    <field name="name"/>
+                    <field name="total_attendance"/>
+                    <field name="total_timesheet"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='act_hr_timesheet_sheet_unvalidate' model='ir.actions.act_window'>
-            <field name='name'>Unvalidated Timesheets</field>
-            <field name='res_model'>hr_timesheet_sheet.sheet</field>
-            <field name='domain'>[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%Y-%m-%d'))]</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='hr_timesheet_sheet_tree_simplified'/>
+        <record id="act_hr_timesheet_sheet_unvalidate" model="ir.actions.act_window">
+            <field name="name">Unvalidated Timesheets</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%Y-%m-%d'))]</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="hr_timesheet_sheet_tree_simplified"/>
         </record>
         
-        <menuitem name='Human Resources/Timesheets/All Timesheets/Timesheets Unvalidate' action='act_hr_timesheet_sheet_unvalidate' id='menu_hr_timesheet_sheet_unvalidate'/>
+        <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
index 42e74af0b1f..25dd954834a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
         <!-- Roles definition -->
         
-        <record model="res.roles" id="HR">
+        <record id="HR" model="res.roles">
             <field name="name">Timesheets validation</field>
         </record>
         
         <!-- Workflow definition -->
         
-        <record model="workflow" id="wkf_timesheet">
+        <record id="wkf_timesheet" model="workflow">
             <field name="name">hr_timesheet_sheet.sheet</field>
             <field name="osv">hr_timesheet_sheet.sheet</field>
             <field name="on_create">True</field>
         </record>
         
-        <record model="workflow.activity" id="act_new">
-            <field name="wkf_id" ref="wkf_timesheet" />
+        <record id="act_new" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">new</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'new'})</field>
             <field name="flow_start">True</field>
         </record>
-        <record model="workflow.activity" id="act_draft">
-            <field name="wkf_id" ref="wkf_timesheet" />
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">draft</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'draft'})</field>
         </record>
-        <record model="workflow.activity" id="act_confirm">
-            <field name="wkf_id" ref="wkf_timesheet" />
+        <record id="act_confirm" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">confirm</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'confirm'})</field>
         </record>
-        <record model="workflow.activity" id="act_done">
-            <field name="wkf_id" ref="wkf_timesheet" />
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">done</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'done'})</field>
             <field name="flow_stop">True</field>
         </record>
         
-        <record model="workflow.transition" id="t0">
+        <record id="t0" model="workflow.transition">
             <field name="act_from" ref="act_new"/>
             <field name="act_to" ref="act_draft"/>
         </record>
-        <record model="workflow.transition" id="t1">
-            <field name="act_from" ref="act_draft" />
-            <field name="act_to" ref="act_confirm" />
+        <record id="t1" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_confirm"/>
             <field name="signal">confirm</field>
         </record>
-        <record model="workflow.transition" id="t2">
-            <field name="act_from" ref="act_confirm" />
-            <field name="act_to" ref="act_done" />
+        <record id="t2" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_done"/>
             <field name="signal">done</field>
             <field name="role_id" ref="HR"/>
         </record>
-        <record model="workflow.transition" id="t3">
-            <field name="act_from" ref="act_confirm" />
-            <field name="act_to" ref="act_draft" />
+        <record id="t3" model="workflow.transition">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_draft"/>
             <field name="signal">cancel</field>
             <field name="role_id" ref="HR"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/l10n_be/account_demo.xml b/addons/l10n_be/account_demo.xml
index 78aabd586e5..bfa9141343a 100644
--- a/addons/l10n_be/account_demo.xml
+++ b/addons/l10n_be/account_demo.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
         <!-- Invoices -->
-        <record model="account.invoice" id="invoice_1">
+        <record id="invoice_1" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="address_invoice_id" ref="base.res_partner_address_8"/>
@@ -14,14 +14,14 @@
             <field name="account_id" ref="a_recv"/>
             <field name="address_contact_id" ref="base.res_partner_address_8"/>
         </record>
-        <record model="account.invoice.line" id="invoice_1_line_1">
+        <record id="invoice_1_line_1" model="account.invoice.line">
             <field name="name">Otpez Laptop without OS</field>
             <field name="invoice_id" ref="invoice_1"/>
             <field name="price_unit">642</field>
             <field name="quantity">4</field>
             <field name="account_id" ref="a_sale"/>
         </record>
-        <record model="account.invoice.line" id="invoice_1_line_2">
+        <record id="invoice_1_line_2" model="account.invoice.line">
             <field name="name">Linutop</field>
             <field name="invoice_id" ref="invoice_1"/>
             <field name="price_unit">280</field>
@@ -29,7 +29,7 @@
             <field name="account_id" ref="a_sale"/>
         </record>
         
-        <record model="account.invoice" id="invoice_2">
+        <record id="invoice_2" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="address_invoice_id" ref="base.res_partner_address_8"/>
@@ -39,25 +39,25 @@
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
             <field name="address_contact_id" ref="base.res_partner_address_8"/>
-            <field name="date_invoice" eval="time.strftime('%Y-%m') + '-01'" />
+            <field eval="time.strftime('%Y-%m') + '-01'" name="date_invoice"/>
         </record>
-        <record model="account.invoice.line" id="invoice_2_line_1">
+        <record id="invoice_2_line_1" model="account.invoice.line">
             <field name="name">8-port Switch</field>
             <field name="invoice_id" ref="invoice_2"/>
             <field name="price_unit">50</field>
             <field name="quantity">3</field>
             <field name="account_id" ref="a_sale"/>
         </record>
-        <record model="account.invoice.line" id="invoice_2_line_2">
+        <record id="invoice_2_line_2" model="account.invoice.line">
             <field name="name">30m RJ45 wire</field>
             <field name="invoice_id" ref="invoice_2"/>
             <field name="price_unit">25</field>
             <field name="quantity">20</field>
             <field name="account_id" ref="a_sale"/>
         </record>
-        <workflow model="account.invoice" ref="invoice_2" action="invoice_open" />
+        <workflow action="invoice_open" model="account.invoice" ref="invoice_2"/>
         
-        <record model="account.invoice" id="invoice_3">
+        <record id="invoice_3" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="address_invoice_id" ref="base.res_partner_address_8"/>
@@ -67,25 +67,25 @@
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
             <field name="address_contact_id" ref="base.res_partner_address_8"/>
-            <field name="date_invoice" eval="time.strftime('%Y-%m') + '-08'" />
+            <field eval="time.strftime('%Y-%m') + '-08'" name="date_invoice"/>
         </record>
-        <record model="account.invoice.line" id="invoice_3_line_1">
+        <record id="invoice_3_line_1" model="account.invoice.line">
             <field name="name">TypeMatrix Dvorak Keyboard</field>
             <field name="invoice_id" ref="invoice_3"/>
             <field name="price_unit">90</field>
             <field name="quantity">5</field>
             <field name="account_id" ref="a_sale"/>
         </record>
-        <record model="account.invoice.line" id="invoice_3_line_2">
+        <record id="invoice_3_line_2" model="account.invoice.line">
             <field name="name">Ergonomic Mouse</field>
             <field name="invoice_id" ref="invoice_3"/>
             <field name="price_unit">15</field>
             <field name="quantity">5</field>
             <field name="account_id" ref="a_sale"/>
         </record>
-        <workflow model="account.invoice" ref="invoice_3" action="invoice_open" />
+        <workflow action="invoice_open" model="account.invoice" ref="invoice_3"/>
         
-        <record model="account.invoice" id="invoice_4">
+        <record id="invoice_4" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="address_invoice_id" ref="base.res_partner_address_8"/>
@@ -95,23 +95,23 @@
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
             <field name="address_contact_id" ref="base.res_partner_address_8"/>
-            <field name="date_invoice" eval="time.strftime('%Y-%m') + '-15'" />
+            <field eval="time.strftime('%Y-%m') + '-15'" name="date_invoice"/>
         </record>
-        <record model="account.invoice.line" id="invoice_4_line_1">
+        <record id="invoice_4_line_1" model="account.invoice.line">
             <field name="name">Desktop Computer Table</field>
             <field name="invoice_id" ref="invoice_4"/>
             <field name="price_unit">80</field>
             <field name="quantity">5</field>
             <field name="account_id" ref="a_sale"/>
         </record>
-        <record model="account.invoice.line" id="invoice_4_line_2">
+        <record id="invoice_4_line_2" model="account.invoice.line">
             <field name="name">Desktop Lamp</field>
             <field name="invoice_id" ref="invoice_4"/>
             <field name="price_unit">20</field>
             <field name="quantity">5</field>
             <field name="account_id" ref="a_sale"/>
         </record>
-        <workflow model="account.invoice" ref="invoice_4" action="invoice_open" />
+        <workflow action="invoice_open" model="account.invoice" ref="invoice_4"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index b627510ee58..b0cd5085732 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -1,6447 +1,6447 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="True">
         
-        <record model="account.account" id="a_root">
+        <record id="a_root" model="account.account">
             <field name="name">PLAN COMPTABLE MINIMUM NORMALISE</field>
             <field name="code">0</field>
             <field name="type">view</field>
         </record>
-        <record model="account.account" id="a1">
+        <record id="a1" model="account.account">
             <field name="name">CLASSE 1</field>
             <field name="code">1</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a_root])]"/>
+            <field eval="[(6,0,[a_root])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a10">
+        <record id="a10" model="account.account">
             <field name="name">CAPITAL</field>
             <field name="code">10</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a100">
+        <record id="a100" model="account.account">
             <field name="name">Capital souscrit ou capital personnel</field>
             <field name="code">100</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a10])]"/>
+            <field eval="[(6,0,[a10])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1000">
+        <record id="a1000" model="account.account">
             <field name="name">Capital non amorti</field>
             <field name="code">1000</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a100])]"/>
+            <field eval="[(6,0,[a100])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1001">
+        <record id="a1001" model="account.account">
             <field name="name">Capital amorti</field>
             <field name="code">1001</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a100])]"/>
+            <field eval="[(6,0,[a100])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a101">
+        <record id="a101" model="account.account">
             <field name="name">Capital non appelé</field>
             <field name="code">101</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a10])]"/>
+            <field eval="[(6,0,[a10])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a109">
+        <record id="a109" model="account.account">
             <field name="name">Compte de l'exploitant</field>
             <field name="code">109</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a10])]"/>
+            <field eval="[(6,0,[a10])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1090">
+        <record id="a1090" model="account.account">
             <field name="name">Opérations courantes</field>
             <field name="code">1090</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a109])]"/>
+            <field eval="[(6,0,[a109])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1091">
+        <record id="a1091" model="account.account">
             <field name="name">Impôts personnels</field>
             <field name="code">1091</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a109])]"/>
+            <field eval="[(6,0,[a109])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1092">
+        <record id="a1092" model="account.account">
             <field name="name">Rémunérations et autres avantages</field>
             <field name="code">1092</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a109])]"/>
+            <field eval="[(6,0,[a109])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a11">
+        <record id="a11" model="account.account">
             <field name="name">PRIMES D'EMISSION</field>
             <field name="code">11</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a12">
+        <record id="a12" model="account.account">
             <field name="name">PLUS-VALUES DE REEVALUATION</field>
             <field name="code">12</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a120">
+        <record id="a120" model="account.account">
             <field name="name">Plus-values de réévaluation sur immobilisations incorporelles</field>
             <field name="code">120</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a12])]"/>
+            <field eval="[(6,0,[a12])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1200">
+        <record id="a1200" model="account.account">
             <field name="name">Plus-values de réévaluation</field>
             <field name="code">1200</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a120])]"/>
+            <field eval="[(6,0,[a120])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1201">
+        <record id="a1201" model="account.account">
             <field name="name">Reprises de réductions de valeur</field>
             <field name="code">1201</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a120])]"/>
+            <field eval="[(6,0,[a120])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a121">
+        <record id="a121" model="account.account">
             <field name="name">Plus-values de réévaluation sur immobilisations corporelles</field>
             <field name="code">121</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a12])]"/>
+            <field eval="[(6,0,[a12])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1210">
+        <record id="a1210" model="account.account">
             <field name="name">Plus-values de réévaluation</field>
             <field name="code">1210</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a121])]"/>
+            <field eval="[(6,0,[a121])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1211">
+        <record id="a1211" model="account.account">
             <field name="name">Reprises de réductions de valeur</field>
             <field name="code">1211</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a121])]"/>
+            <field eval="[(6,0,[a121])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a122">
+        <record id="a122" model="account.account">
             <field name="name">Plus-values de réévaluation sur immobilisations financières</field>
             <field name="code">122</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a12])]"/>
+            <field eval="[(6,0,[a12])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1220">
+        <record id="a1220" model="account.account">
             <field name="name">Plus-values de réévaluation</field>
             <field name="code">1220</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a122])]"/>
+            <field eval="[(6,0,[a122])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1221">
+        <record id="a1221" model="account.account">
             <field name="name">Reprises de réductions de valeur</field>
             <field name="code">1221</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a122])]"/>
+            <field eval="[(6,0,[a122])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a123">
+        <record id="a123" model="account.account">
             <field name="name">Plus-values de réévaluation sur stocks</field>
             <field name="code">123</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a12])]"/>
+            <field eval="[(6,0,[a12])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a124">
+        <record id="a124" model="account.account">
             <field name="name">Reprises de réductions de valeur sur placements de trésorerie</field>
             <field name="code">124</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a12])]"/>
+            <field eval="[(6,0,[a12])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a13">
+        <record id="a13" model="account.account">
             <field name="name">RESERVES</field>
             <field name="code">13</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a130">
+        <record id="a130" model="account.account">
             <field name="name">Réserve légale</field>
             <field name="code">130</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a13])]"/>
+            <field eval="[(6,0,[a13])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a131">
+        <record id="a131" model="account.account">
             <field name="name">Réserves indisponibles</field>
             <field name="code">131</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a13])]"/>
+            <field eval="[(6,0,[a13])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1310">
+        <record id="a1310" model="account.account">
             <field name="name">Réserve pour actions propres</field>
             <field name="code">1310</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a131])]"/>
+            <field eval="[(6,0,[a131])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1311">
+        <record id="a1311" model="account.account">
             <field name="name">Autres réserves indisponibles</field>
             <field name="code">1311</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a131])]"/>
+            <field eval="[(6,0,[a131])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a132">
+        <record id="a132" model="account.account">
             <field name="name">Réserves immunisées</field>
             <field name="code">132</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a13])]"/>
+            <field eval="[(6,0,[a13])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a133">
+        <record id="a133" model="account.account">
             <field name="name">Réserves disponibles</field>
             <field name="code">133</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a13])]"/>
+            <field eval="[(6,0,[a13])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1330">
+        <record id="a1330" model="account.account">
             <field name="name">Réserve pour régularisation de dividendes</field>
             <field name="code">1330</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a133])]"/>
+            <field eval="[(6,0,[a133])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1331">
+        <record id="a1331" model="account.account">
             <field name="name">Réserve pour renouvellement des immobilisations</field>
             <field name="code">1331</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a133])]"/>
+            <field eval="[(6,0,[a133])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1332">
+        <record id="a1332" model="account.account">
             <field name="name">Réserve pour installations en faveur du personnel  1333 Réserves libres</field>
             <field name="code">1332</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a133])]"/>
+            <field eval="[(6,0,[a133])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a14">
+        <record id="a14" model="account.account">
             <field name="name">BENEFICE REPORTE</field>
             <field name="code">14</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a15">
+        <record id="a15" model="account.account">
             <field name="name">SUBSIDES EN CAPITAL</field>
             <field name="code">15</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a150">
+        <record id="a150" model="account.account">
             <field name="name">Montants obtenus</field>
             <field name="code">150</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a15])]"/>
+            <field eval="[(6,0,[a15])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a151">
+        <record id="a151" model="account.account">
             <field name="name">Montants transférés aux résultats</field>
             <field name="code">151</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a15])]"/>
+            <field eval="[(6,0,[a15])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a16">
+        <record id="a16" model="account.account">
             <field name="name">PROVISIONS POUR RISQUES ET CHARGES</field>
             <field name="code">16</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a160">
+        <record id="a160" model="account.account">
             <field name="name">Provisions pour pensions et obligations similaires</field>
             <field name="code">160</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a161">
+        <record id="a161" model="account.account">
             <field name="name">Provisions pour charges fiscales</field>
             <field name="code">161</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a162">
+        <record id="a162" model="account.account">
             <field name="name">Provisions pour grosses réparations et gros entretiens</field>
             <field name="code">162</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a163">
+        <record id="a163" model="account.account">
             <field name="name">à 169 Provisions pour autres risques et charges</field>
             <field name="code">163</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a164">
+        <record id="a164" model="account.account">
             <field name="name">Provisions pour sûretés personnelles ou réelles constituées à l'appui de dettes et d'engagements de tiers</field>
             <field name="code">164</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a165">
+        <record id="a165" model="account.account">
             <field name="name">Provisions pour engagements relatifs à l'acquisition ou à la cession d'immobilisations</field>
             <field name="code">165</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a166">
+        <record id="a166" model="account.account">
             <field name="name">Provisions pour exécution de commandes passées ou reçues</field>
             <field name="code">166</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a167">
+        <record id="a167" model="account.account">
             <field name="name">Provisions pour positions et marchés à terme en devises ou positions et marchés à terme en marchandises</field>
             <field name="code">167</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a168">
+        <record id="a168" model="account.account">
             <field name="name">Provisions pour garanties techniques attachées aux ventes et prestations déjà effectuées par l'entreprise</field>
             <field name="code">168</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a169">
+        <record id="a169" model="account.account">
             <field name="name">Provisions pour autres risques et charges</field>
             <field name="code">169</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a16])]"/>
+            <field eval="[(6,0,[a16])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1690">
+        <record id="a1690" model="account.account">
             <field name="name">Pour litiges en cours</field>
             <field name="code">1690</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a169])]"/>
+            <field eval="[(6,0,[a169])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1691">
+        <record id="a1691" model="account.account">
             <field name="name">Pour amendes, doubles droits, pénalités</field>
             <field name="code">1691</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a169])]"/>
+            <field eval="[(6,0,[a169])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1692">
+        <record id="a1692" model="account.account">
             <field name="name">Pour propre assureur</field>
             <field name="code">1692</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a169])]"/>
+            <field eval="[(6,0,[a169])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1693">
+        <record id="a1693" model="account.account">
             <field name="name">Pour risques inhérents aux opérations de crédits à moyen ou long terme</field>
             <field name="code">1693</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a169])]"/>
+            <field eval="[(6,0,[a169])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1695">
+        <record id="a1695" model="account.account">
             <field name="name">Provision pour charge de liquidation</field>
             <field name="code">1695</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a169])]"/>
+            <field eval="[(6,0,[a169])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1696">
+        <record id="a1696" model="account.account">
             <field name="name">Provision pour départ de personnel</field>
             <field name="code">1696</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a169])]"/>
+            <field eval="[(6,0,[a169])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1699">
+        <record id="a1699" model="account.account">
             <field name="name">Pour risques divers </field>
             <field name="code">1699</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a169])]"/>
+            <field eval="[(6,0,[a169])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17">
+        <record id="a17" model="account.account">
             <field name="name">DETTES A PLUS D'UN AN</field>
             <field name="code">17</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a170">
+        <record id="a170" model="account.account">
             <field name="name">Emprunts subordonnés</field>
             <field name="code">170</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1700">
+        <record id="a1700" model="account.account">
             <field name="name">Convertibles</field>
             <field name="code">1700</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a170])]"/>
+            <field eval="[(6,0,[a170])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1701">
+        <record id="a1701" model="account.account">
             <field name="name">Non convertibles</field>
             <field name="code">1701</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a170])]"/>
+            <field eval="[(6,0,[a170])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a171">
+        <record id="a171" model="account.account">
             <field name="name">Emprunts obligataires non subordonnés</field>
             <field name="code">171</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1710">
+        <record id="a1710" model="account.account">
             <field name="name">Convertibles</field>
             <field name="code">1710</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a171])]"/>
+            <field eval="[(6,0,[a171])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1711">
+        <record id="a1711" model="account.account">
             <field name="name">Non convertibles</field>
             <field name="code">1711</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a171])]"/>
+            <field eval="[(6,0,[a171])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a172">
+        <record id="a172" model="account.account">
             <field name="name">Dettes de location-financement et assimilés</field>
             <field name="code">172</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1720">
+        <record id="a1720" model="account.account">
             <field name="name">Dettes de location-financement de biens immobiliers</field>
             <field name="code">1720</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a172])]"/>
+            <field eval="[(6,0,[a172])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1721">
+        <record id="a1721" model="account.account">
             <field name="name">Dettes de location-financement de biens mobiliers</field>
             <field name="code">1721</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a172])]"/>
+            <field eval="[(6,0,[a172])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1722">
+        <record id="a1722" model="account.account">
             <field name="name">Dettes sur droits réels sur immeubles</field>
             <field name="code">1722</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a172])]"/>
+            <field eval="[(6,0,[a172])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a173">
+        <record id="a173" model="account.account">
             <field name="name">Etablissements de crédit</field>
             <field name="code">173</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1730">
+        <record id="a1730" model="account.account">
             <field name="name">Dettes en compte</field>
             <field name="code">1730</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a173])]"/>
+            <field eval="[(6,0,[a173])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17300">
+        <record id="a17300" model="account.account">
             <field name="name">Banque A</field>
             <field name="code">17300</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1730])]"/>
+            <field eval="[(6,0,[a1730])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17301">
+        <record id="a17301" model="account.account">
             <field name="name">Banque B</field>
             <field name="code">17301</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1730])]"/>
+            <field eval="[(6,0,[a1730])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1731">
+        <record id="a1731" model="account.account">
             <field name="name">Promesses</field>
             <field name="code">1731</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a173])]"/>
+            <field eval="[(6,0,[a173])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17310">
+        <record id="a17310" model="account.account">
             <field name="name">Banque A</field>
             <field name="code">17310</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1731])]"/>
+            <field eval="[(6,0,[a1731])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17311">
+        <record id="a17311" model="account.account">
             <field name="name">Banque B</field>
             <field name="code">17311</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1731])]"/>
+            <field eval="[(6,0,[a1731])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1732">
+        <record id="a1732" model="account.account">
             <field name="name">Crédits d'acceptation</field>
             <field name="code">1732</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a173])]"/>
+            <field eval="[(6,0,[a173])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17320">
+        <record id="a17320" model="account.account">
             <field name="name">Banque A</field>
             <field name="code">17320</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1732])]"/>
+            <field eval="[(6,0,[a1732])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17321">
+        <record id="a17321" model="account.account">
             <field name="name">Banque B</field>
             <field name="code">17321</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1732])]"/>
+            <field eval="[(6,0,[a1732])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a174">
+        <record id="a174" model="account.account">
             <field name="name">Autres emprunts</field>
             <field name="code">174</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175">
+        <record id="a175" model="account.account">
             <field name="name">Dettes commerciales</field>
             <field name="code">175</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1750">
+        <record id="a1750" model="account.account">
             <field name="name">Fournisseurs : dettes en compte</field>
             <field name="code">1750</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a175])]"/>
+            <field eval="[(6,0,[a175])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17500">
+        <record id="a17500" model="account.account">
             <field name="name">Entreprises apparentées</field>
             <field name="code">17500</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1750])]"/>
+            <field eval="[(6,0,[a1750])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175000">
+        <record id="a175000" model="account.account">
             <field name="name">Entreprises liées</field>
             <field name="code">175000</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17500])]"/>
+            <field eval="[(6,0,[a17500])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175001">
+        <record id="a175001" model="account.account">
             <field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">175001</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17500])]"/>
+            <field eval="[(6,0,[a17500])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17501">
+        <record id="a17501" model="account.account">
             <field name="name">Fournisseurs ordinaires</field>
             <field name="code">17501</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1750])]"/>
+            <field eval="[(6,0,[a1750])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175010">
+        <record id="a175010" model="account.account">
             <field name="name">Fournisseurs belges</field>
             <field name="code">175010</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17501])]"/>
+            <field eval="[(6,0,[a17501])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175011">
+        <record id="a175011" model="account.account">
             <field name="name">Fournisseurs C.E.E.</field>
             <field name="code">175011</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17501])]"/>
+            <field eval="[(6,0,[a17501])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175012">
+        <record id="a175012" model="account.account">
             <field name="name">Fournisseurs importation</field>
             <field name="code">175012</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17501])]"/>
+            <field eval="[(6,0,[a17501])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1751">
+        <record id="a1751" model="account.account">
             <field name="name">Effets à payer</field>
             <field name="code">1751</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a175])]"/>
+            <field eval="[(6,0,[a175])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17510">
+        <record id="a17510" model="account.account">
             <field name="name">Entreprises apparentées</field>
             <field name="code">17510</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1751])]"/>
+            <field eval="[(6,0,[a1751])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175100">
+        <record id="a175100" model="account.account">
             <field name="name">Entreprises liées</field>
             <field name="code">175100</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17510])]"/>
+            <field eval="[(6,0,[a17510])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175101">
+        <record id="a175101" model="account.account">
             <field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">175101</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17510])]"/>
+            <field eval="[(6,0,[a17510])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a17511">
+        <record id="a17511" model="account.account">
             <field name="name">Fournisseurs ordinaires</field>
             <field name="code">17511</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a1751])]"/>
+            <field eval="[(6,0,[a1751])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175110">
+        <record id="a175110" model="account.account">
             <field name="name">Fournisseurs belges</field>
             <field name="code">175110</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17511])]"/>
+            <field eval="[(6,0,[a17511])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175111">
+        <record id="a175111" model="account.account">
             <field name="name">Fournisseurs C.E.E.</field>
             <field name="code">175111</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17511])]"/>
+            <field eval="[(6,0,[a17511])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a175112">
+        <record id="a175112" model="account.account">
             <field name="name">Fournisseurs importation</field>
             <field name="code">175112</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17511])]"/>
+            <field eval="[(6,0,[a17511])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a176">
+        <record id="a176" model="account.account">
             <field name="name">Acomptes reçus sur commandes</field>
             <field name="code">176</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a178">
+        <record id="a178" model="account.account">
             <field name="name">Cautionnements reçus en numéraires</field>
             <field name="code">178</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a179">
+        <record id="a179" model="account.account">
             <field name="name">Dettes diverses</field>
             <field name="code">179</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a17])]"/>
+            <field eval="[(6,0,[a17])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1790">
+        <record id="a1790" model="account.account">
             <field name="name">Entreprises liées</field>
             <field name="code">1790</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a179])]"/>
+            <field eval="[(6,0,[a179])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1791">
+        <record id="a1791" model="account.account">
             <field name="name">Autres entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">1791</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a179])]"/>
+            <field eval="[(6,0,[a179])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1792">
+        <record id="a1792" model="account.account">
             <field name="name">Administrateurs, gérants, associés</field>
             <field name="code">1792</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a179])]"/>
+            <field eval="[(6,0,[a179])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1794">
+        <record id="a1794" model="account.account">
             <field name="name">Rentes viagères capitalisées</field>
             <field name="code">1794</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a179])]"/>
+            <field eval="[(6,0,[a179])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1798">
+        <record id="a1798" model="account.account">
             <field name="name">Dettes envers les coparticipants des associations momentanées et en participation</field>
             <field name="code">1798</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a179])]"/>
+            <field eval="[(6,0,[a179])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a1799">
+        <record id="a1799" model="account.account">
             <field name="name">Autres dettes diverses</field>
             <field name="code">1799</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a179])]"/>
+            <field eval="[(6,0,[a179])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a18">
+        <record id="a18" model="account.account">
             <field name="name">COMPTES DE LIAISON DES ETABLISSEMENTS ET SUCCURSALES</field>
             <field name="code">18</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a1])]"/>
+            <field eval="[(6,0,[a1])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2">
+        <record id="a2" model="account.account">
             <field name="name">CLASSE 2. FRAIS D'ETABLISSEMENT. ACTIFS IMMOBILISES ET CREANCES A PLUS D'UN AN</field>
             <field name="code">2</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a_root])]"/>
+            <field eval="[(6,0,[a_root])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a20">
+        <record id="a20" model="account.account">
             <field name="name">FRAIS D'ETABLISSEMENT</field>
             <field name="code">20</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a200">
+        <record id="a200" model="account.account">
             <field name="name">Frais de constitution et d'augmentation de capital</field>
             <field name="code">200</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a20])]"/>
+            <field eval="[(6,0,[a20])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2000">
+        <record id="a2000" model="account.account">
             <field name="name">Frais de constitution et d'augmentation de capital</field>
             <field name="code">2000</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a200])]"/>
+            <field eval="[(6,0,[a200])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2009">
+        <record id="a2009" model="account.account">
             <field name="name">Amortissements sur frais de constitution et d'augmentation de capital</field>
             <field name="code">2009</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a200])]"/>
+            <field eval="[(6,0,[a200])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a201">
+        <record id="a201" model="account.account">
             <field name="name">Frais d'émission d'emprunts et primes de remboursement</field>
             <field name="code">201</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a20])]"/>
+            <field eval="[(6,0,[a20])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2010">
+        <record id="a2010" model="account.account">
             <field name="name">Agios sur emprunts et frais d'émission d'emprunts</field>
             <field name="code">2010</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a201])]"/>
+            <field eval="[(6,0,[a201])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2019">
+        <record id="a2019" model="account.account">
             <field name="name">Amortissements sur agios sur emprunts et frais d'émission d'emprunts</field>
             <field name="code">2019</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a201])]"/>
+            <field eval="[(6,0,[a201])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a202">
+        <record id="a202" model="account.account">
             <field name="name">Autres frais d'établissement</field>
             <field name="code">202</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a20])]"/>
+            <field eval="[(6,0,[a20])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2020">
+        <record id="a2020" model="account.account">
             <field name="name">Autres frais d'établissement</field>
             <field name="code">2020</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a202])]"/>
+            <field eval="[(6,0,[a202])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2029">
+        <record id="a2029" model="account.account">
             <field name="name">Amortissements sur autres frais d'établissement</field>
             <field name="code">2029</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a202])]"/>
+            <field eval="[(6,0,[a202])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a203">
+        <record id="a203" model="account.account">
             <field name="name">Intérêts intercalaires</field>
             <field name="code">203</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a20])]"/>
+            <field eval="[(6,0,[a20])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2030">
+        <record id="a2030" model="account.account">
             <field name="name">Intérêts intercalaires</field>
             <field name="code">2030</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a203])]"/>
+            <field eval="[(6,0,[a203])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2039">
+        <record id="a2039" model="account.account">
             <field name="name">Amortissements sur intérêts intercalaires</field>
             <field name="code">2039</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a203])]"/>
+            <field eval="[(6,0,[a203])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a204">
+        <record id="a204" model="account.account">
             <field name="name">Frais de restructuration</field>
             <field name="code">204</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a20])]"/>
+            <field eval="[(6,0,[a20])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2040">
+        <record id="a2040" model="account.account">
             <field name="name">Coût des frais de restructuration</field>
             <field name="code">2040</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a204])]"/>
+            <field eval="[(6,0,[a204])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2049">
+        <record id="a2049" model="account.account">
             <field name="name">Amortissements sur frais de restructuration</field>
             <field name="code">2049</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a204])]"/>
+            <field eval="[(6,0,[a204])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a21">
+        <record id="a21" model="account.account">
             <field name="name">IMMOBILISATIONS INCORPORELLES</field>
             <field name="code">21</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a210">
+        <record id="a210" model="account.account">
             <field name="name">Frais de recherche et de développement</field>
             <field name="code">210</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a21])]"/>
+            <field eval="[(6,0,[a21])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2100">
+        <record id="a2100" model="account.account">
             <field name="name">Frais de recherche et de mise au point</field>
             <field name="code">2100</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a210])]"/>
+            <field eval="[(6,0,[a210])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2108">
+        <record id="a2108" model="account.account">
             <field name="name">Plus-values actées sur frais de recherche et de mise au point</field>
             <field name="code">2108</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a210])]"/>
+            <field eval="[(6,0,[a210])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2109">
+        <record id="a2109" model="account.account">
             <field name="name">Amortissements sur frais de recherche et de mise au point</field>
             <field name="code">2109</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a210])]"/>
+            <field eval="[(6,0,[a210])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a211">
+        <record id="a211" model="account.account">
             <field name="name">Concessions, brevets, licences, savoir-faire, marques et droits similaires</field>
             <field name="code">211</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a21])]"/>
+            <field eval="[(6,0,[a21])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2110">
+        <record id="a2110" model="account.account">
             <field name="name">Concessions, brevets, licences, savoir-faire, marques, etc...</field>
             <field name="code">2110</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a211])]"/>
+            <field eval="[(6,0,[a211])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2118">
+        <record id="a2118" model="account.account">
             <field name="name">Plus-values actées sur concessions, brevets, etc...</field>
             <field name="code">2118</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a211])]"/>
+            <field eval="[(6,0,[a211])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2119">
+        <record id="a2119" model="account.account">
             <field name="name">Amortissements sur concessions, brevets, etc...</field>
             <field name="code">2119</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a211])]"/>
+            <field eval="[(6,0,[a211])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a212">
+        <record id="a212" model="account.account">
             <field name="name">Goodwill</field>
             <field name="code">212</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a21])]"/>
+            <field eval="[(6,0,[a21])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2120">
+        <record id="a2120" model="account.account">
             <field name="name">Coût d'acquisition</field>
             <field name="code">2120</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a212])]"/>
+            <field eval="[(6,0,[a212])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2128">
+        <record id="a2128" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">2128</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a212])]"/>
+            <field eval="[(6,0,[a212])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2129">
+        <record id="a2129" model="account.account">
             <field name="name">Amortissements sur goodwill</field>
             <field name="code">2129</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a212])]"/>
+            <field eval="[(6,0,[a212])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a213">
+        <record id="a213" model="account.account">
             <field name="name">Acomptes versés</field>
             <field name="code">213</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a21])]"/>
+            <field eval="[(6,0,[a21])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22">
+        <record id="a22" model="account.account">
             <field name="name">TERRAINS ET CONSTRUCTIONS</field>
             <field name="code">22</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a220">
+        <record id="a220" model="account.account">
             <field name="name">Terrains</field>
             <field name="code">220</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a22])]"/>
+            <field eval="[(6,0,[a22])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2200">
+        <record id="a2200" model="account.account">
             <field name="name">Terrains</field>
             <field name="code">2200</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a220])]"/>
+            <field eval="[(6,0,[a220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2201">
+        <record id="a2201" model="account.account">
             <field name="name">Frais d'acquisition sur terrains</field>
             <field name="code">2201</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a220])]"/>
+            <field eval="[(6,0,[a220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2208">
+        <record id="a2208" model="account.account">
             <field name="name">Plus-values actées sur terrains</field>
             <field name="code">2208</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a220])]"/>
+            <field eval="[(6,0,[a220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2209">
+        <record id="a2209" model="account.account">
             <field name="name">Amortissements et réductions de valeur</field>
             <field name="code">2209</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a220])]"/>
+            <field eval="[(6,0,[a220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22090">
+        <record id="a22090" model="account.account">
             <field name="name">Amortissements sur frais d'acquisition</field>
             <field name="code">22090</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2209])]"/>
+            <field eval="[(6,0,[a2209])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22091">
+        <record id="a22091" model="account.account">
             <field name="name">Réductions de valeur sur terrains</field>
             <field name="code">22091</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2209])]"/>
+            <field eval="[(6,0,[a2209])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a221">
+        <record id="a221" model="account.account">
             <field name="name">Constructions</field>
             <field name="code">221</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a22])]"/>
+            <field eval="[(6,0,[a22])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2210">
+        <record id="a2210" model="account.account">
             <field name="name">Bâtiments industriels</field>
             <field name="code">2210</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a221])]"/>
+            <field eval="[(6,0,[a221])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2211">
+        <record id="a2211" model="account.account">
             <field name="name">Bâtiments administratifs et commerciaux</field>
             <field name="code">2211</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a221])]"/>
+            <field eval="[(6,0,[a221])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2212">
+        <record id="a2212" model="account.account">
             <field name="name">Autres bâtiments d'exploitation</field>
             <field name="code">2212</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a221])]"/>
+            <field eval="[(6,0,[a221])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2213">
+        <record id="a2213" model="account.account">
             <field name="name">Voies de transport et ouvrages d'art</field>
             <field name="code">2213</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a221])]"/>
+            <field eval="[(6,0,[a221])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2215">
+        <record id="a2215" model="account.account">
             <field name="name">Constructions sur sol d'autrui</field>
             <field name="code">2215</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a221])]"/>
+            <field eval="[(6,0,[a221])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2216">
+        <record id="a2216" model="account.account">
             <field name="name">Frais d'acquisition sur constructions</field>
             <field name="code">2216</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a221])]"/>
+            <field eval="[(6,0,[a221])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2218">
+        <record id="a2218" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">2218</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a221])]"/>
+            <field eval="[(6,0,[a221])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22180">
+        <record id="a22180" model="account.account">
             <field name="name">Sur bâtiments industriels</field>
             <field name="code">22180</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2218])]"/>
+            <field eval="[(6,0,[a2218])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22181">
+        <record id="a22181" model="account.account">
             <field name="name">Sur bâtiments administratifs et commerciaux</field>
             <field name="code">22181</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2218])]"/>
+            <field eval="[(6,0,[a2218])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22182">
+        <record id="a22182" model="account.account">
             <field name="name">Sur autres bâtiments d'exploitation</field>
             <field name="code">22182</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2218])]"/>
+            <field eval="[(6,0,[a2218])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22184">
+        <record id="a22184" model="account.account">
             <field name="name">Sur voies de transport et ouvrages d'art</field>
             <field name="code">22184</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2218])]"/>
+            <field eval="[(6,0,[a2218])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2219">
+        <record id="a2219" model="account.account">
             <field name="name">Amortissements sur constructions</field>
             <field name="code">2219</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a221])]"/>
+            <field eval="[(6,0,[a221])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22190">
+        <record id="a22190" model="account.account">
             <field name="name">Sur bâtiments industriels</field>
             <field name="code">22190</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2219])]"/>
+            <field eval="[(6,0,[a2219])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22191">
+        <record id="a22191" model="account.account">
             <field name="name">Sur bâtiments administratifs et commerciaux</field>
             <field name="code">22191</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2219])]"/>
+            <field eval="[(6,0,[a2219])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22192">
+        <record id="a22192" model="account.account">
             <field name="name">Sur autres bâtiments d'exploitation</field>
             <field name="code">22192</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2219])]"/>
+            <field eval="[(6,0,[a2219])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22194">
+        <record id="a22194" model="account.account">
             <field name="name">Sur voies de transport et ouvrages d'art</field>
             <field name="code">22194</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2219])]"/>
+            <field eval="[(6,0,[a2219])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22195">
+        <record id="a22195" model="account.account">
             <field name="name">Sur constructions sur sol d'autrui</field>
             <field name="code">22195</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2219])]"/>
+            <field eval="[(6,0,[a2219])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22196">
+        <record id="a22196" model="account.account">
             <field name="name">Sur frais d'acquisition sur constructions</field>
             <field name="code">22196</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2219])]"/>
+            <field eval="[(6,0,[a2219])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a222">
+        <record id="a222" model="account.account">
             <field name="name">Terrains bâtis</field>
             <field name="code">222</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a22])]"/>
+            <field eval="[(6,0,[a22])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2220">
+        <record id="a2220" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">2220</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a222])]"/>
+            <field eval="[(6,0,[a222])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22200">
+        <record id="a22200" model="account.account">
             <field name="name">Bâtiments industriels</field>
             <field name="code">22200</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2220])]"/>
+            <field eval="[(6,0,[a2220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22201">
+        <record id="a22201" model="account.account">
             <field name="name">Bâtiments administratifs et commerciaux</field>
             <field name="code">22201</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2220])]"/>
+            <field eval="[(6,0,[a2220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22202">
+        <record id="a22202" model="account.account">
             <field name="name">Autres bâtiments d'exploitation</field>
             <field name="code">22202</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2220])]"/>
+            <field eval="[(6,0,[a2220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22203">
+        <record id="a22203" model="account.account">
             <field name="name">Voies de transport et ouvrages d'art</field>
             <field name="code">22203</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2220])]"/>
+            <field eval="[(6,0,[a2220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22204">
+        <record id="a22204" model="account.account">
             <field name="name">Frais d'acquisition des terrains à bâtir</field>
             <field name="code">22204</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2220])]"/>
+            <field eval="[(6,0,[a2220])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2228">
+        <record id="a2228" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">2228</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a222])]"/>
+            <field eval="[(6,0,[a222])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22280">
+        <record id="a22280" model="account.account">
             <field name="name">Sur bâtiments industriels	</field>
             <field name="code">22280</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2228])]"/>
+            <field eval="[(6,0,[a2228])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22281">
+        <record id="a22281" model="account.account">
             <field name="name">Sur bâtiments administratifs et commerciaux</field>
             <field name="code">22281</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2228])]"/>
+            <field eval="[(6,0,[a2228])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22282">
+        <record id="a22282" model="account.account">
             <field name="name">Sur autres bâtiments d'exploitation</field>
             <field name="code">22282</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2228])]"/>
+            <field eval="[(6,0,[a2228])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22283">
+        <record id="a22283" model="account.account">
             <field name="name">Sur voies de transport et ouvrages d'art</field>
             <field name="code">22283</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2228])]"/>
+            <field eval="[(6,0,[a2228])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2229">
+        <record id="a2229" model="account.account">
             <field name="name">Amortissements sur terrains bâtis</field>
             <field name="code">2229</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a222])]"/>
+            <field eval="[(6,0,[a222])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22290">
+        <record id="a22290" model="account.account">
             <field name="name">Sur bâtiments industriels</field>
             <field name="code">22290</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2229])]"/>
+            <field eval="[(6,0,[a2229])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22291">
+        <record id="a22291" model="account.account">
             <field name="name">Sur bâtiments administratifs et commerciaux</field>
             <field name="code">22291</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2229])]"/>
+            <field eval="[(6,0,[a2229])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22292">
+        <record id="a22292" model="account.account">
             <field name="name">Sur autres bâtiments d'exploitation</field>
             <field name="code">22292</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2229])]"/>
+            <field eval="[(6,0,[a2229])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22293">
+        <record id="a22293" model="account.account">
             <field name="name">Sur voies de transport et ouvrages d'art</field>
             <field name="code">22293</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2229])]"/>
+            <field eval="[(6,0,[a2229])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a22294">
+        <record id="a22294" model="account.account">
             <field name="name">Sur frais d'acquisition des terrains bâtis</field>
             <field name="code">22294</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2229])]"/>
+            <field eval="[(6,0,[a2229])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a223">
+        <record id="a223" model="account.account">
             <field name="name">Autres droits réels sur des immeubles</field>
             <field name="code">223</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a22])]"/>
+            <field eval="[(6,0,[a22])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2230">
+        <record id="a2230" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">2230</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a223])]"/>
+            <field eval="[(6,0,[a223])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2238">
+        <record id="a2238" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">2238</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a223])]"/>
+            <field eval="[(6,0,[a223])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2239">
+        <record id="a2239" model="account.account">
             <field name="name">Amortissements</field>
             <field name="code">2239</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a223])]"/>
+            <field eval="[(6,0,[a223])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a23">
+        <record id="a23" model="account.account">
             <field name="name">INSTALLATIONS, MACHINES ET OUTILLAGE</field>
             <field name="code">23</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a230">
+        <record id="a230" model="account.account">
             <field name="name">Installations</field>
             <field name="code">230</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a23])]"/>
+            <field eval="[(6,0,[a23])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2300">
+        <record id="a2300" model="account.account">
             <field name="name">Installation d'eau</field>
             <field name="code">2300</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a230])]"/>
+            <field eval="[(6,0,[a230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2301">
+        <record id="a2301" model="account.account">
             <field name="name">Installation d'électricité</field>
             <field name="code">2301</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a230])]"/>
+            <field eval="[(6,0,[a230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2302">
+        <record id="a2302" model="account.account">
             <field name="name">Installation de vapeur</field>
             <field name="code">2302</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a230])]"/>
+            <field eval="[(6,0,[a230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2303">
+        <record id="a2303" model="account.account">
             <field name="name">Installation de gaz</field>
             <field name="code">2303</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a230])]"/>
+            <field eval="[(6,0,[a230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2304">
+        <record id="a2304" model="account.account">
             <field name="name">Installation de chauffage</field>
             <field name="code">2304</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a230])]"/>
+            <field eval="[(6,0,[a230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2305">
+        <record id="a2305" model="account.account">
             <field name="name">Installation de conditionnement d'air</field>
             <field name="code">2305</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a230])]"/>
+            <field eval="[(6,0,[a230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2306">
+        <record id="a2306" model="account.account">
             <field name="name">Installation de chargement</field>
             <field name="code">2306</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a230])]"/>
+            <field eval="[(6,0,[a230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a231">
+        <record id="a231" model="account.account">
             <field name="name">Machines</field>
             <field name="code">231</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a23])]"/>
+            <field eval="[(6,0,[a23])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2310">
+        <record id="a2310" model="account.account">
             <field name="name">Division A</field>
             <field name="code">2310</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a231])]"/>
+            <field eval="[(6,0,[a231])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2311">
+        <record id="a2311" model="account.account">
             <field name="name">Division B</field>
             <field name="code">2311</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a231])]"/>
+            <field eval="[(6,0,[a231])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a237">
+        <record id="a237" model="account.account">
             <field name="name">Outillage</field>
             <field name="code">237</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a23])]"/>
+            <field eval="[(6,0,[a23])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2370">
+        <record id="a2370" model="account.account">
             <field name="name">Division A</field>
             <field name="code">2370</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a237])]"/>
+            <field eval="[(6,0,[a237])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2371">
+        <record id="a2371" model="account.account">
             <field name="name">Division B</field>
             <field name="code">2371</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a237])]"/>
+            <field eval="[(6,0,[a237])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a238">
+        <record id="a238" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">238</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a23])]"/>
+            <field eval="[(6,0,[a23])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2380">
+        <record id="a2380" model="account.account">
             <field name="name">Sur installations</field>
             <field name="code">2380</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a238])]"/>
+            <field eval="[(6,0,[a238])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2381">
+        <record id="a2381" model="account.account">
             <field name="name">Sur machines</field>
             <field name="code">2381</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a238])]"/>
+            <field eval="[(6,0,[a238])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2382">
+        <record id="a2382" model="account.account">
             <field name="name">Sur outillage</field>
             <field name="code">2382</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a238])]"/>
+            <field eval="[(6,0,[a238])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a239">
+        <record id="a239" model="account.account">
             <field name="name">Amortissements</field>
             <field name="code">239</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a23])]"/>
+            <field eval="[(6,0,[a23])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2390">
+        <record id="a2390" model="account.account">
             <field name="name">Sur installations</field>
             <field name="code">2390</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a239])]"/>
+            <field eval="[(6,0,[a239])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2391">
+        <record id="a2391" model="account.account">
             <field name="name">Sur machines</field>
             <field name="code">2391</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a239])]"/>
+            <field eval="[(6,0,[a239])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2392">
+        <record id="a2392" model="account.account">
             <field name="name">Sur outillage</field>
             <field name="code">2392</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a239])]"/>
+            <field eval="[(6,0,[a239])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24">
+        <record id="a24" model="account.account">
             <field name="name">MOBILIER ET MATERIEL ROULANT</field>
             <field name="code">24</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a240">
+        <record id="a240" model="account.account">
             <field name="name">Mobilier</field>
             <field name="code">240</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a24])]"/>
+            <field eval="[(6,0,[a24])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2400">
+        <record id="a2400" model="account.account">
             <field name="name">Mobilier</field>
             <field name="code">2400</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a240])]"/>
+            <field eval="[(6,0,[a240])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24000">
+        <record id="a24000" model="account.account">
             <field name="name">Mobilier des bâtiments industriels</field>
             <field name="code">24000</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2400])]"/>
+            <field eval="[(6,0,[a2400])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24001">
+        <record id="a24001" model="account.account">
             <field name="name">Mobilier des bâtiments administratifs et commerciaux</field>
             <field name="code">24001</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2400])]"/>
+            <field eval="[(6,0,[a2400])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24002">
+        <record id="a24002" model="account.account">
             <field name="name">Mobilier des autres bâtiments d'exploitation</field>
             <field name="code">24002</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2400])]"/>
+            <field eval="[(6,0,[a2400])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24003">
+        <record id="a24003" model="account.account">
             <field name="name">Mobilier oeuvres sociales</field>
             <field name="code">24003</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2400])]"/>
+            <field eval="[(6,0,[a2400])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2401">
+        <record id="a2401" model="account.account">
             <field name="name">Matériel de bureau et de service social</field>
             <field name="code">2401</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a240])]"/>
+            <field eval="[(6,0,[a240])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24010">
+        <record id="a24010" model="account.account">
             <field name="name">Des bâtiments industriels</field>
             <field name="code">24010</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2401])]"/>
+            <field eval="[(6,0,[a2401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24011">
+        <record id="a24011" model="account.account">
             <field name="name">Des bâtiments administratifs et commerciaux</field>
             <field name="code">24011</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2401])]"/>
+            <field eval="[(6,0,[a2401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24012">
+        <record id="a24012" model="account.account">
             <field name="name">Des autres bâtiments d'exploitation</field>
             <field name="code">24012</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2401])]"/>
+            <field eval="[(6,0,[a2401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24013">
+        <record id="a24013" model="account.account">
             <field name="name">Des oeuvres sociales</field>
             <field name="code">24013</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2401])]"/>
+            <field eval="[(6,0,[a2401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2408">
+        <record id="a2408" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">2408</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a240])]"/>
+            <field eval="[(6,0,[a240])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24080">
+        <record id="a24080" model="account.account">
             <field name="name">Plus-values actées sur mobilier</field>
             <field name="code">24080</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2408])]"/>
+            <field eval="[(6,0,[a2408])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24081">
+        <record id="a24081" model="account.account">
             <field name="name">Plus-values actées sur matériel de bureau et service social</field>
             <field name="code">24081</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2408])]"/>
+            <field eval="[(6,0,[a2408])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2409">
+        <record id="a2409" model="account.account">
             <field name="name">Amortissements</field>
             <field name="code">2409</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a240])]"/>
+            <field eval="[(6,0,[a240])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24090">
+        <record id="a24090" model="account.account">
             <field name="name">Amortissements sur mobilier</field>
             <field name="code">24090</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2409])]"/>
+            <field eval="[(6,0,[a2409])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24091">
+        <record id="a24091" model="account.account">
             <field name="name">Amortissements sur matériel de bureau et service social</field>
             <field name="code">24091</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2409])]"/>
+            <field eval="[(6,0,[a2409])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a241">
+        <record id="a241" model="account.account">
             <field name="name">Matériel roulant</field>
             <field name="code">241</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a24])]"/>
+            <field eval="[(6,0,[a24])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2410">
+        <record id="a2410" model="account.account">
             <field name="name">Matériel automobile</field>
             <field name="code">2410</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a241])]"/>
+            <field eval="[(6,0,[a241])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24100">
+        <record id="a24100" model="account.account">
             <field name="name">Voitures</field>
             <field name="code">24100</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2410])]"/>
+            <field eval="[(6,0,[a2410])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24105">
+        <record id="a24105" model="account.account">
             <field name="name">Camions</field>
             <field name="code">24105</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2410])]"/>
+            <field eval="[(6,0,[a2410])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2411">
+        <record id="a2411" model="account.account">
             <field name="name">Matériel ferroviaire</field>
             <field name="code">2411</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a241])]"/>
+            <field eval="[(6,0,[a241])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2412">
+        <record id="a2412" model="account.account">
             <field name="name">Matériel fluvial</field>
             <field name="code">2412</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a241])]"/>
+            <field eval="[(6,0,[a241])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2413">
+        <record id="a2413" model="account.account">
             <field name="name">Matériel naval</field>
             <field name="code">2413</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a241])]"/>
+            <field eval="[(6,0,[a241])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2414">
+        <record id="a2414" model="account.account">
             <field name="name">Matériel aérien</field>
             <field name="code">2414</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a241])]"/>
+            <field eval="[(6,0,[a241])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2418">
+        <record id="a2418" model="account.account">
             <field name="name">Plus-values sur matériel roulant</field>
             <field name="code">2418</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a241])]"/>
+            <field eval="[(6,0,[a241])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24180">
+        <record id="a24180" model="account.account">
             <field name="name">Plus-values sur matériel automobile</field>
             <field name="code">24180</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2418])]"/>
+            <field eval="[(6,0,[a2418])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24181">
+        <record id="a24181" model="account.account">
             <field name="name">Idem sur matériel ferroviaire</field>
             <field name="code">24181</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2418])]"/>
+            <field eval="[(6,0,[a2418])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24182">
+        <record id="a24182" model="account.account">
             <field name="name">Idem sur matériel fluvial</field>
             <field name="code">24182</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2418])]"/>
+            <field eval="[(6,0,[a2418])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24183">
+        <record id="a24183" model="account.account">
             <field name="name">Idem sur matériel naval</field>
             <field name="code">24183</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2418])]"/>
+            <field eval="[(6,0,[a2418])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24184">
+        <record id="a24184" model="account.account">
             <field name="name">Idem sur matériel aérien</field>
             <field name="code">24184</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2418])]"/>
+            <field eval="[(6,0,[a2418])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2419">
+        <record id="a2419" model="account.account">
             <field name="name">Amortissements sur matériel roulant</field>
             <field name="code">2419</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a241])]"/>
+            <field eval="[(6,0,[a241])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24190">
+        <record id="a24190" model="account.account">
             <field name="name">Amortissements sur matériel automobile</field>
             <field name="code">24190</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2419])]"/>
+            <field eval="[(6,0,[a2419])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24191">
+        <record id="a24191" model="account.account">
             <field name="name">Idem sur matériel ferroviaire</field>
             <field name="code">24191</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2419])]"/>
+            <field eval="[(6,0,[a2419])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24192">
+        <record id="a24192" model="account.account">
             <field name="name">Idem sur matériel fluvial</field>
             <field name="code">24192</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2419])]"/>
+            <field eval="[(6,0,[a2419])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24193">
+        <record id="a24193" model="account.account">
             <field name="name">Idem sur matériel naval</field>
             <field name="code">24193</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2419])]"/>
+            <field eval="[(6,0,[a2419])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a24194">
+        <record id="a24194" model="account.account">
             <field name="name">Idem sur matériel aérien</field>
             <field name="code">24194</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2419])]"/>
+            <field eval="[(6,0,[a2419])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a25">
+        <record id="a25" model="account.account">
             <field name="name">IMMOBILISATION DETENUES EN LOCATION-FINANCEMENT ET DROITS SIMILAIRES</field>
             <field name="code">25</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a250">
+        <record id="a250" model="account.account">
             <field name="name">Terrains et constructions</field>
             <field name="code">250</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a25])]"/>
+            <field eval="[(6,0,[a25])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2500">
+        <record id="a2500" model="account.account">
             <field name="name">Terrains</field>
             <field name="code">2500</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a250])]"/>
+            <field eval="[(6,0,[a250])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2501">
+        <record id="a2501" model="account.account">
             <field name="name">Constructions</field>
             <field name="code">2501</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a250])]"/>
+            <field eval="[(6,0,[a250])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2508">
+        <record id="a2508" model="account.account">
             <field name="name">Plus-values sur emphytéose, leasing et droits similaires : terrains et constructions</field>
             <field name="code">2508</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a250])]"/>
+            <field eval="[(6,0,[a250])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2509">
+        <record id="a2509" model="account.account">
             <field name="name">Amortissements et réductions de valeur sur terrains et constructions en leasing</field>
             <field name="code">2509</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a250])]"/>
+            <field eval="[(6,0,[a250])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a251">
+        <record id="a251" model="account.account">
             <field name="name">Installations, machines et outillage</field>
             <field name="code">251</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a25])]"/>
+            <field eval="[(6,0,[a25])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2510">
+        <record id="a2510" model="account.account">
             <field name="name">Installations</field>
             <field name="code">2510</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a251])]"/>
+            <field eval="[(6,0,[a251])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2511">
+        <record id="a2511" model="account.account">
             <field name="name">Machines</field>
             <field name="code">2511</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a251])]"/>
+            <field eval="[(6,0,[a251])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2512">
+        <record id="a2512" model="account.account">
             <field name="name">Outillage</field>
             <field name="code">2512</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a251])]"/>
+            <field eval="[(6,0,[a251])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2518">
+        <record id="a2518" model="account.account">
             <field name="name">Plus-values actées sur installations, machines et outillage pris en leasing</field>
             <field name="code">2518</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a251])]"/>
+            <field eval="[(6,0,[a251])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2519">
+        <record id="a2519" model="account.account">
             <field name="name">Amortissements sur installations, machines et outillage pris en leasing</field>
             <field name="code">2519</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a251])]"/>
+            <field eval="[(6,0,[a251])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a252">
+        <record id="a252" model="account.account">
             <field name="name">Mobilier et matériel roulant</field>
             <field name="code">252</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a25])]"/>
+            <field eval="[(6,0,[a25])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2520">
+        <record id="a2520" model="account.account">
             <field name="name">Mobilier</field>
             <field name="code">2520</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a252])]"/>
+            <field eval="[(6,0,[a252])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2521">
+        <record id="a2521" model="account.account">
             <field name="name">Matériel roulant</field>
             <field name="code">2521</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a252])]"/>
+            <field eval="[(6,0,[a252])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2528">
+        <record id="a2528" model="account.account">
             <field name="name">Plus-values actées sur mobilier et matériel roulant en leasing</field>
             <field name="code">2528</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a252])]"/>
+            <field eval="[(6,0,[a252])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2529">
+        <record id="a2529" model="account.account">
             <field name="name">Amortissements sur mobilier et matériel roulant en leasing</field>
             <field name="code">2529</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a252])]"/>
+            <field eval="[(6,0,[a252])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a26">
+        <record id="a26" model="account.account">
             <field name="name">AUTRES IMMOBILISATIONS CORPORELLES</field>
             <field name="code">26</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a260">
+        <record id="a260" model="account.account">
             <field name="name">Frais d'aménagements de locaux pris en location</field>
             <field name="code">260</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a26])]"/>
+            <field eval="[(6,0,[a26])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a261">
+        <record id="a261" model="account.account">
             <field name="name">Maison d'habitation</field>
             <field name="code">261</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a26])]"/>
+            <field eval="[(6,0,[a26])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a262">
+        <record id="a262" model="account.account">
             <field name="name">Réserve immobilière</field>
             <field name="code">262</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a26])]"/>
+            <field eval="[(6,0,[a26])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a263">
+        <record id="a263" model="account.account">
             <field name="name">Matériel d'emballage</field>
             <field name="code">263</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a26])]"/>
+            <field eval="[(6,0,[a26])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a264">
+        <record id="a264" model="account.account">
             <field name="name">Emballages récupérables</field>
             <field name="code">264</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a26])]"/>
+            <field eval="[(6,0,[a26])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a268">
+        <record id="a268" model="account.account">
             <field name="name">Plus-values actées sur autres immobilisations corporelles</field>
             <field name="code">268</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a26])]"/>
+            <field eval="[(6,0,[a26])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a269">
+        <record id="a269" model="account.account">
             <field name="name">Amortissements sur autres immobilisations corporelles</field>
             <field name="code">269</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a26])]"/>
+            <field eval="[(6,0,[a26])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2690">
+        <record id="a2690" model="account.account">
             <field name="name">Amortissements sur frais d'aménagement des locaux pris en location</field>
             <field name="code">2690</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a269])]"/>
+            <field eval="[(6,0,[a269])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2691">
+        <record id="a2691" model="account.account">
             <field name="name">Amortissements sur maison d'habitation</field>
             <field name="code">2691</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a269])]"/>
+            <field eval="[(6,0,[a269])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2692">
+        <record id="a2692" model="account.account">
             <field name="name">Amortissements sur réserve immobilière</field>
             <field name="code">2692</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a269])]"/>
+            <field eval="[(6,0,[a269])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2693">
+        <record id="a2693" model="account.account">
             <field name="name">Amortissements sur matériel d'emballage</field>
             <field name="code">2693</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a269])]"/>
+            <field eval="[(6,0,[a269])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2694">
+        <record id="a2694" model="account.account">
             <field name="name">Amortissements sur emballages récupérables</field>
             <field name="code">2694</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a269])]"/>
+            <field eval="[(6,0,[a269])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a27">
+        <record id="a27" model="account.account">
             <field name="name">IMMOBILISATIONS CORPORELLES EN COURS ET ACOMPTES VERSES</field>
             <field name="code">27</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a270">
+        <record id="a270" model="account.account">
             <field name="name">Immobilisations en cours</field>
             <field name="code">270</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a27])]"/>
+            <field eval="[(6,0,[a27])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2700">
+        <record id="a2700" model="account.account">
             <field name="name">Constructions</field>
             <field name="code">2700</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a270])]"/>
+            <field eval="[(6,0,[a270])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2701">
+        <record id="a2701" model="account.account">
             <field name="name">Installations, machines et outillage</field>
             <field name="code">2701</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a270])]"/>
+            <field eval="[(6,0,[a270])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2702">
+        <record id="a2702" model="account.account">
             <field name="name">Mobilier et matériel roulant</field>
             <field name="code">2702</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a270])]"/>
+            <field eval="[(6,0,[a270])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2703">
+        <record id="a2703" model="account.account">
             <field name="name">Autres immobilisations corporelles</field>
             <field name="code">2703</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a270])]"/>
+            <field eval="[(6,0,[a270])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a271">
+        <record id="a271" model="account.account">
             <field name="name">Avances et acomptes versés sur immobilisations en cours</field>
             <field name="code">271</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a27])]"/>
+            <field eval="[(6,0,[a27])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a28">
+        <record id="a28" model="account.account">
             <field name="name">IMMOBILISATIONS FINANCIERES</field>
             <field name="code">28</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a280">
+        <record id="a280" model="account.account">
             <field name="name">Participations dans des entreprises liées</field>
             <field name="code">280</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a28])]"/>
+            <field eval="[(6,0,[a28])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2800">
+        <record id="a2800" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">2800</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a280])]"/>
+            <field eval="[(6,0,[a280])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2801">
+        <record id="a2801" model="account.account">
             <field name="name">Montants non appelés</field>
             <field name="code">2801</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a280])]"/>
+            <field eval="[(6,0,[a280])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2808">
+        <record id="a2808" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">2808</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a280])]"/>
+            <field eval="[(6,0,[a280])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2809">
+        <record id="a2809" model="account.account">
             <field name="name">Réductions de valeurs actées</field>
             <field name="code">2809</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a280])]"/>
+            <field eval="[(6,0,[a280])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a281">
+        <record id="a281" model="account.account">
             <field name="name">Créances sur des entreprises liées</field>
             <field name="code">281</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a28])]"/>
+            <field eval="[(6,0,[a28])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2810">
+        <record id="a2810" model="account.account">
             <field name="name">Créances en compte</field>
             <field name="code">2810</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a281])]"/>
+            <field eval="[(6,0,[a281])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2811">
+        <record id="a2811" model="account.account">
             <field name="name">Effets à recevoir</field>
             <field name="code">2811</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a281])]"/>
+            <field eval="[(6,0,[a281])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2812">
+        <record id="a2812" model="account.account">
             <field name="name">Titres à revenu fixes</field>
             <field name="code">2812</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a281])]"/>
+            <field eval="[(6,0,[a281])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2817">
+        <record id="a2817" model="account.account">
             <field name="name">Créances douteuses</field>
             <field name="code">2817</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a281])]"/>
+            <field eval="[(6,0,[a281])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2819">
+        <record id="a2819" model="account.account">
             <field name="name">Réductions de valeurs actées</field>
             <field name="code">2819</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a281])]"/>
+            <field eval="[(6,0,[a281])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a282">
+        <record id="a282" model="account.account">
             <field name="name">Participations dans des entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">282</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a28])]"/>
+            <field eval="[(6,0,[a28])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2820">
+        <record id="a2820" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">2820</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a282])]"/>
+            <field eval="[(6,0,[a282])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2821">
+        <record id="a2821" model="account.account">
             <field name="name">Montants non appelés</field>
             <field name="code">2821</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a282])]"/>
+            <field eval="[(6,0,[a282])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2828">
+        <record id="a2828" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">2828</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a282])]"/>
+            <field eval="[(6,0,[a282])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2829">
+        <record id="a2829" model="account.account">
             <field name="name">Réductions de valeurs actées</field>
             <field name="code">2829</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a282])]"/>
+            <field eval="[(6,0,[a282])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a283">
+        <record id="a283" model="account.account">
             <field name="name">Créances sur des entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">283</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a28])]"/>
+            <field eval="[(6,0,[a28])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2830">
+        <record id="a2830" model="account.account">
             <field name="name">Créances en compte</field>
             <field name="code">2830</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a283])]"/>
+            <field eval="[(6,0,[a283])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2831">
+        <record id="a2831" model="account.account">
             <field name="name">Effets à recevoir</field>
             <field name="code">2831</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a283])]"/>
+            <field eval="[(6,0,[a283])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2832">
+        <record id="a2832" model="account.account">
             <field name="name">Titres à revenu fixe</field>
             <field name="code">2832</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a283])]"/>
+            <field eval="[(6,0,[a283])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2837">
+        <record id="a2837" model="account.account">
             <field name="name">Créances douteuses</field>
             <field name="code">2837</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a283])]"/>
+            <field eval="[(6,0,[a283])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2839">
+        <record id="a2839" model="account.account">
             <field name="name">Réductions de valeurs actées</field>
             <field name="code">2839</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a283])]"/>
+            <field eval="[(6,0,[a283])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a284">
+        <record id="a284" model="account.account">
             <field name="name">Autres actions et parts</field>
             <field name="code">284</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a28])]"/>
+            <field eval="[(6,0,[a28])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2840">
+        <record id="a2840" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">2840</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a284])]"/>
+            <field eval="[(6,0,[a284])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2841">
+        <record id="a2841" model="account.account">
             <field name="name">Montants non appelés</field>
             <field name="code">2841</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a284])]"/>
+            <field eval="[(6,0,[a284])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2848">
+        <record id="a2848" model="account.account">
             <field name="name">Plus-values actées</field>
             <field name="code">2848</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a284])]"/>
+            <field eval="[(6,0,[a284])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2849">
+        <record id="a2849" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">2849</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a284])]"/>
+            <field eval="[(6,0,[a284])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a285">
+        <record id="a285" model="account.account">
             <field name="name">Autres créances</field>
             <field name="code">285</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a28])]"/>
+            <field eval="[(6,0,[a28])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2850">
+        <record id="a2850" model="account.account">
             <field name="name">Créances en compte</field>
             <field name="code">2850</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a285])]"/>
+            <field eval="[(6,0,[a285])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2851">
+        <record id="a2851" model="account.account">
             <field name="name">Effets à recevoir</field>
             <field name="code">2851</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a285])]"/>
+            <field eval="[(6,0,[a285])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2852">
+        <record id="a2852" model="account.account">
             <field name="name">Titres à revenu fixe</field>
             <field name="code">2852</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a285])]"/>
+            <field eval="[(6,0,[a285])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2857">
+        <record id="a2857" model="account.account">
             <field name="name">Créances douteuses</field>
             <field name="code">2857</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a285])]"/>
+            <field eval="[(6,0,[a285])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2859">
+        <record id="a2859" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">2859</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a285])]"/>
+            <field eval="[(6,0,[a285])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a288">
+        <record id="a288" model="account.account">
             <field name="name">Cautionnements versés en numéraires</field>
             <field name="code">288</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a28])]"/>
+            <field eval="[(6,0,[a28])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2880">
+        <record id="a2880" model="account.account">
             <field name="name">Téléphone, télefax, télex</field>
             <field name="code">2880</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a288])]"/>
+            <field eval="[(6,0,[a288])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2881">
+        <record id="a2881" model="account.account">
             <field name="name">Gaz</field>
             <field name="code">2881</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a288])]"/>
+            <field eval="[(6,0,[a288])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2882">
+        <record id="a2882" model="account.account">
             <field name="name">Eau</field>
             <field name="code">2882</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a288])]"/>
+            <field eval="[(6,0,[a288])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2883">
+        <record id="a2883" model="account.account">
             <field name="name">Electricité</field>
             <field name="code">2883</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a288])]"/>
+            <field eval="[(6,0,[a288])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2887">
+        <record id="a2887" model="account.account">
             <field name="name">Autres cautionnements versés en numéraires</field>
             <field name="code">2887</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a288])]"/>
+            <field eval="[(6,0,[a288])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29">
+        <record id="a29" model="account.account">
             <field name="name">CREANCES A PLUS D'UN AN</field>
             <field name="code">29</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a2])]"/>
+            <field eval="[(6,0,[a2])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a290">
+        <record id="a290" model="account.account">
             <field name="name">Créances commerciales</field>
             <field name="code">290</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a29])]"/>
+            <field eval="[(6,0,[a29])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2900">
+        <record id="a2900" model="account.account">
             <field name="name">Clients</field>
             <field name="code">2900</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a290])]"/>
+            <field eval="[(6,0,[a290])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29000">
+        <record id="a29000" model="account.account">
             <field name="name">Créances en compte sur entreprises liées</field>
             <field name="code">29000</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2900])]"/>
+            <field eval="[(6,0,[a2900])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29001">
+        <record id="a29001" model="account.account">
             <field name="name">Sur entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">29001</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2900])]"/>
+            <field eval="[(6,0,[a2900])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29002">
+        <record id="a29002" model="account.account">
             <field name="name">Sur clients Belgique</field>
             <field name="code">29002</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2900])]"/>
+            <field eval="[(6,0,[a2900])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29003">
+        <record id="a29003" model="account.account">
             <field name="name">Sur clients C.E.E.</field>
             <field name="code">29003</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2900])]"/>
+            <field eval="[(6,0,[a2900])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29004">
+        <record id="a29004" model="account.account">
             <field name="name">Sur clients exportation hors C.E.E.</field>
             <field name="code">29004</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2900])]"/>
+            <field eval="[(6,0,[a2900])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29005">
+        <record id="a29005" model="account.account">
             <field name="name">Créances sur les coparticipants</field>
             <field name="code">29005</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2900])]"/>
+            <field eval="[(6,0,[a2900])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2901">
+        <record id="a2901" model="account.account">
             <field name="name">Effets à recevoir</field>
             <field name="code">2901</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a290])]"/>
+            <field eval="[(6,0,[a290])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29010">
+        <record id="a29010" model="account.account">
             <field name="name">Sur entreprises liées</field>
             <field name="code">29010</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2901])]"/>
+            <field eval="[(6,0,[a2901])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29011">
+        <record id="a29011" model="account.account">
             <field name="name">Sur entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">29011</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2901])]"/>
+            <field eval="[(6,0,[a2901])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29012">
+        <record id="a29012" model="account.account">
             <field name="name">Sur clients Belgique</field>
             <field name="code">29012</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2901])]"/>
+            <field eval="[(6,0,[a2901])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29013">
+        <record id="a29013" model="account.account">
             <field name="name">Sur clients C.E.E.</field>
             <field name="code">29013</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2901])]"/>
+            <field eval="[(6,0,[a2901])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29014">
+        <record id="a29014" model="account.account">
             <field name="name">Sur clients exportation hors C.E.E.</field>
             <field name="code">29014</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2901])]"/>
+            <field eval="[(6,0,[a2901])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2905">
+        <record id="a2905" model="account.account">
             <field name="name">Retenues sur garanties</field>
             <field name="code">2905</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a290])]"/>
+            <field eval="[(6,0,[a290])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2906">
+        <record id="a2906" model="account.account">
             <field name="name">Acomptes versés</field>
             <field name="code">2906</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a290])]"/>
+            <field eval="[(6,0,[a290])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2907">
+        <record id="a2907" model="account.account">
             <field name="name">Créances douteuses</field>
             <field name="code">2907</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a290])]"/>
+            <field eval="[(6,0,[a290])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2909">
+        <record id="a2909" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">2909</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a290])]"/>
+            <field eval="[(6,0,[a290])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a291">
+        <record id="a291" model="account.account">
             <field name="name">Autres créances</field>
             <field name="code">291</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a29])]"/>
+            <field eval="[(6,0,[a29])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2910">
+        <record id="a2910" model="account.account">
             <field name="name">Créances en compte</field>
             <field name="code">2910</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a291])]"/>
+            <field eval="[(6,0,[a291])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29100">
+        <record id="a29100" model="account.account">
             <field name="name">Créances entreprises liées</field>
             <field name="code">29100</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2910])]"/>
+            <field eval="[(6,0,[a2910])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29101">
+        <record id="a29101" model="account.account">
             <field name="name">Créances entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">29101</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2910])]"/>
+            <field eval="[(6,0,[a2910])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29102">
+        <record id="a29102" model="account.account">
             <field name="name">Créances autres débiteurs</field>
             <field name="code">29102</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2910])]"/>
+            <field eval="[(6,0,[a2910])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2911">
+        <record id="a2911" model="account.account">
             <field name="name">Effets à recevoir</field>
             <field name="code">2911</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a291])]"/>
+            <field eval="[(6,0,[a291])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29110">
+        <record id="a29110" model="account.account">
             <field name="name">Sur entreprises liées</field>
             <field name="code">29110</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2911])]"/>
+            <field eval="[(6,0,[a2911])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29111">
+        <record id="a29111" model="account.account">
             <field name="name">Sur entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">29111</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2911])]"/>
+            <field eval="[(6,0,[a2911])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a29112">
+        <record id="a29112" model="account.account">
             <field name="name">Sur autres débiteurs</field>
             <field name="code">29112</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a2911])]"/>
+            <field eval="[(6,0,[a2911])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2912">
+        <record id="a2912" model="account.account">
             <field name="name">Créances résultant de la cession d'immobilisations données en leasing</field>
             <field name="code">2912</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a291])]"/>
+            <field eval="[(6,0,[a291])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2917">
+        <record id="a2917" model="account.account">
             <field name="name">Créances douteuses</field>
             <field name="code">2917</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a291])]"/>
+            <field eval="[(6,0,[a291])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a2919">
+        <record id="a2919" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">2919</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a291])]"/>
+            <field eval="[(6,0,[a291])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3">
+        <record id="a3" model="account.account">
             <field name="name">CLASSE 3. STOCK ET COMMANDES EN COURS D'EXECUTION</field>
             <field name="code">3</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a_root])]"/>
+            <field eval="[(6,0,[a_root])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a30">
+        <record id="a30" model="account.account">
             <field name="name">APPROVISIONNEMENTS - MATIERES PREMIERES</field>
             <field name="code">30</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a3])]"/>
+            <field eval="[(6,0,[a3])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a300">
+        <record id="a300" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">300</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a30])]"/>
+            <field eval="[(6,0,[a30])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a309">
+        <record id="a309" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">309</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a30])]"/>
+            <field eval="[(6,0,[a30])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a31">
+        <record id="a31" model="account.account">
             <field name="name">APPROVISIONNEMENTS ET FOURNITURES</field>
             <field name="code">31</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a3])]"/>
+            <field eval="[(6,0,[a3])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a310">
+        <record id="a310" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">310</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a31])]"/>
+            <field eval="[(6,0,[a31])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3100">
+        <record id="a3100" model="account.account">
             <field name="name">Matières d'approvisionnement</field>
             <field name="code">3100</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a310])]"/>
+            <field eval="[(6,0,[a310])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3101">
+        <record id="a3101" model="account.account">
             <field name="name">Energie, charbon, coke, Mazout, essence, propane</field>
             <field name="code">3101</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a310])]"/>
+            <field eval="[(6,0,[a310])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3102">
+        <record id="a3102" model="account.account">
             <field name="name">Produits d'entretien</field>
             <field name="code">3102</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a310])]"/>
+            <field eval="[(6,0,[a310])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3103">
+        <record id="a3103" model="account.account">
             <field name="name">Fournitures diverses et petit outillage</field>
             <field name="code">3103</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a310])]"/>
+            <field eval="[(6,0,[a310])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3104">
+        <record id="a3104" model="account.account">
             <field name="name">Imprimés et fournitures de bureau</field>
             <field name="code">3104</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a310])]"/>
+            <field eval="[(6,0,[a310])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3105">
+        <record id="a3105" model="account.account">
             <field name="name">Fournitures de services sociaux</field>
             <field name="code">3105</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a310])]"/>
+            <field eval="[(6,0,[a310])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3106">
+        <record id="a3106" model="account.account">
             <field name="name">Emballages commerciaux</field>
             <field name="code">3106</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a310])]"/>
+            <field eval="[(6,0,[a310])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a31060">
+        <record id="a31060" model="account.account">
             <field name="name">Emballages perdus</field>
             <field name="code">31060</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a3106])]"/>
+            <field eval="[(6,0,[a3106])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a31061">
+        <record id="a31061" model="account.account">
             <field name="name">Emballages récupérables</field>
             <field name="code">31061</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a3106])]"/>
+            <field eval="[(6,0,[a3106])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a319">
+        <record id="a319" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">319</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a31])]"/>
+            <field eval="[(6,0,[a31])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a32">
+        <record id="a32" model="account.account">
             <field name="name">EN COURS DE FABRICATION</field>
             <field name="code">32</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a3])]"/>
+            <field eval="[(6,0,[a3])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a320">
+        <record id="a320" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">320</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a32])]"/>
+            <field eval="[(6,0,[a32])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3200">
+        <record id="a3200" model="account.account">
             <field name="name">Produits semi-ouvrés</field>
             <field name="code">3200</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a320])]"/>
+            <field eval="[(6,0,[a320])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3201">
+        <record id="a3201" model="account.account">
             <field name="name">Produits en cours de fabrication</field>
             <field name="code">3201</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a320])]"/>
+            <field eval="[(6,0,[a320])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3202">
+        <record id="a3202" model="account.account">
             <field name="name">Travaux en cours</field>
             <field name="code">3202</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a320])]"/>
+            <field eval="[(6,0,[a320])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3205">
+        <record id="a3205" model="account.account">
             <field name="name">Déchets</field>
             <field name="code">3205</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a320])]"/>
+            <field eval="[(6,0,[a320])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3206">
+        <record id="a3206" model="account.account">
             <field name="name">Rebuts</field>
             <field name="code">3206</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a320])]"/>
+            <field eval="[(6,0,[a320])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3209">
+        <record id="a3209" model="account.account">
             <field name="name">Travaux en association momentanée</field>
             <field name="code">3209</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a320])]"/>
+            <field eval="[(6,0,[a320])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a329">
+        <record id="a329" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">329</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a32])]"/>
+            <field eval="[(6,0,[a32])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a33">
+        <record id="a33" model="account.account">
             <field name="name">PRODUITS FINIS</field>
             <field name="code">33</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a3])]"/>
+            <field eval="[(6,0,[a3])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a330">
+        <record id="a330" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">330</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a33])]"/>
+            <field eval="[(6,0,[a33])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3300">
+        <record id="a3300" model="account.account">
             <field name="name">Produits finis</field>
             <field name="code">3300</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a330])]"/>
+            <field eval="[(6,0,[a330])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a339">
+        <record id="a339" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">339</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a33])]"/>
+            <field eval="[(6,0,[a33])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a34">
+        <record id="a34" model="account.account">
             <field name="name">MARCHANDISES</field>
             <field name="code">34</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a3])]"/>
+            <field eval="[(6,0,[a3])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a340">
+        <record id="a340" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">340</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a34])]"/>
+            <field eval="[(6,0,[a34])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3400">
+        <record id="a3400" model="account.account">
             <field name="name">Groupe A</field>
             <field name="code">3400</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a340])]"/>
+            <field eval="[(6,0,[a340])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3401">
+        <record id="a3401" model="account.account">
             <field name="name">Groupe B</field>
             <field name="code">3401</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a340])]"/>
+            <field eval="[(6,0,[a340])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a349">
+        <record id="a349" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">349</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a34])]"/>
+            <field eval="[(6,0,[a34])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a35">
+        <record id="a35" model="account.account">
             <field name="name">IMMEUBLES DESTINES A LA VENTE</field>
             <field name="code">35</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a3])]"/>
+            <field eval="[(6,0,[a3])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a350">
+        <record id="a350" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">350</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a35])]"/>
+            <field eval="[(6,0,[a35])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3500">
+        <record id="a3500" model="account.account">
             <field name="name">Immeuble A</field>
             <field name="code">3500</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a350])]"/>
+            <field eval="[(6,0,[a350])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3501">
+        <record id="a3501" model="account.account">
             <field name="name">Immeuble B</field>
             <field name="code">3501</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a350])]"/>
+            <field eval="[(6,0,[a350])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a351">
+        <record id="a351" model="account.account">
             <field name="name">Immeubles construits en vue de leur revente</field>
             <field name="code">351</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a35])]"/>
+            <field eval="[(6,0,[a35])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3510">
+        <record id="a3510" model="account.account">
             <field name="name">Immeuble A</field>
             <field name="code">3510</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a351])]"/>
+            <field eval="[(6,0,[a351])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a3511">
+        <record id="a3511" model="account.account">
             <field name="name">Immeuble B</field>
             <field name="code">3511</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a351])]"/>
+            <field eval="[(6,0,[a351])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a359">
+        <record id="a359" model="account.account">
             <field name="name">Réductions de valeurs actées</field>
             <field name="code">359</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a35])]"/>
+            <field eval="[(6,0,[a35])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a36">
+        <record id="a36" model="account.account">
             <field name="name">ACOMPTES VERSES SUR ACHATS POUR STOCKS</field>
             <field name="code">36</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a3])]"/>
+            <field eval="[(6,0,[a3])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a360">
+        <record id="a360" model="account.account">
             <field name="name">Acomptes versés</field>
             <field name="code">360</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a36])]"/>
+            <field eval="[(6,0,[a36])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a369">
+        <record id="a369" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">369</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a36])]"/>
+            <field eval="[(6,0,[a36])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a37">
+        <record id="a37" model="account.account">
             <field name="name">COMMANDES EN COURS D'EXECUTION</field>
             <field name="code">37</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a3])]"/>
+            <field eval="[(6,0,[a3])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a370">
+        <record id="a370" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">370</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a37])]"/>
+            <field eval="[(6,0,[a37])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a371">
+        <record id="a371" model="account.account">
             <field name="name">Bénéfice pris en compte</field>
             <field name="code">371</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a37])]"/>
+            <field eval="[(6,0,[a37])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a379">
+        <record id="a379" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">379</field>
             <field name="type">asset</field>
             
-            <field name="parent_id" eval="[(6,0,[a37])]"/>
+            <field eval="[(6,0,[a37])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4">
+        <record id="a4" model="account.account">
             <field name="name">CLASSE 4. CREANCES ET DETTES A UN AN AU PLUS</field>
             <field name="code">4</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a_root])]"/>
+            <field eval="[(6,0,[a_root])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a40">
+        <record id="a40" model="account.account">
             <field name="name">CREANCES COMMERCIALES</field>
             <field name="code">40</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a400">
+        <record id="a400" model="account.account">
             <field name="name">Clients</field>
             <field name="code">400</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4007">
+        <record id="a4007" model="account.account">
             <field name="name">Rabais, remises, ristournes à accorder et autres notes de crédit à établir</field>
             <field name="code">4007</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a400])]"/>
+            <field eval="[(6,0,[a400])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4008">
+        <record id="a4008" model="account.account">
             <field name="name">Créances résultant de livraisons de biens</field>
             <field name="code">4008</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a400])]"/>
+            <field eval="[(6,0,[a400])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a401">
+        <record id="a401" model="account.account">
             <field name="name">Effets à recevoir</field>
             <field name="code">401</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a_recv">
+        <record id="a_recv" model="account.account">
             <field name="name">Effets à recevoir</field>
             <field name="code">4010</field>
             <field name="type">receivable</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" eval="[(6,0,[a401])]"/>
+            <field eval="True" name="reconcile"/>
+            <field eval="[(6,0,[a401])]" name="parent_id"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_receivable">
-            <field name="value" eval="'account.account,'+str(a_recv)"/>
+        <record id="account.property_account_receivable" model="ir.property">
+            <field eval="'account.account,'+str(a_recv)" name="value"/>
         </record>
         
-        <record model="account.account" id="a4013">
+        <record id="a4013" model="account.account">
             <field name="name">Effets à l'encaissement</field>
             <field name="code">4013</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a401])]"/>
+            <field eval="[(6,0,[a401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4015">
+        <record id="a4015" model="account.account">
             <field name="name">Effets à l'escompte</field>
             <field name="code">4015</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a401])]"/>
+            <field eval="[(6,0,[a401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a402">
+        <record id="a402" model="account.account">
             <field name="name">Clients, créances courantes, entreprises apparentées, administrateurs et gérants</field>
             <field name="code">402</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4020">
+        <record id="a4020" model="account.account">
             <field name="name">Entreprises liées</field>
             <field name="code">4020</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a402])]"/>
+            <field eval="[(6,0,[a402])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4021">
+        <record id="a4021" model="account.account">
             <field name="name">Autres entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">4021</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a402])]"/>
+            <field eval="[(6,0,[a402])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4022">
+        <record id="a4022" model="account.account">
             <field name="name">Administrateurs et gérants d'entreprise</field>
             <field name="code">4022</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a402])]"/>
+            <field eval="[(6,0,[a402])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a403">
+        <record id="a403" model="account.account">
             <field name="name">Effets à recevoir sur entreprises apparentées et administrateurs et gérants</field>
             <field name="code">403</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4030">
+        <record id="a4030" model="account.account">
             <field name="name">Entreprises liées</field>
             <field name="code">4030</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a403])]"/>
+            <field eval="[(6,0,[a403])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4031">
+        <record id="a4031" model="account.account">
             <field name="name">Autres entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">4031</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a403])]"/>
+            <field eval="[(6,0,[a403])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4032">
+        <record id="a4032" model="account.account">
             <field name="name">Administrateurs et gérants de l'entreprise</field>
             <field name="code">4032</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a403])]"/>
+            <field eval="[(6,0,[a403])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a404">
+        <record id="a404" model="account.account">
             <field name="name">Produits à recevoir</field>
             <field name="code">404</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a405">
+        <record id="a405" model="account.account">
             <field name="name">Clients : retenues sur garanties</field>
             <field name="code">405</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a406">
+        <record id="a406" model="account.account">
             <field name="name">Acomptes versés</field>
             <field name="code">406</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a407">
+        <record id="a407" model="account.account">
             <field name="name">Créances douteuses</field>
             <field name="code">407</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a408">
+        <record id="a408" model="account.account">
             <field name="name">Compensation clients</field>
             <field name="code">408</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a409">
+        <record id="a409" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">409</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a40])]"/>
+            <field eval="[(6,0,[a40])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a41">
+        <record id="a41" model="account.account">
             <field name="name">AUTRES CREANCES</field>
             <field name="code">41</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a410">
+        <record id="a410" model="account.account">
             <field name="name">Capital appelé, non versé</field>
             <field name="code">410</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a41])]"/>
+            <field eval="[(6,0,[a41])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4100">
+        <record id="a4100" model="account.account">
             <field name="name">Appels de fonds</field>
             <field name="code">4100</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a410])]"/>
+            <field eval="[(6,0,[a410])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4101">
+        <record id="a4101" model="account.account">
             <field name="name">Actionnaires défaillants</field>
             <field name="code">4101</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a410])]"/>
+            <field eval="[(6,0,[a410])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a411">
+        <record id="a411" model="account.account">
             <field name="name">T.V.A. à récupérer</field>
             <field name="code">411</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a41])]"/>
+            <field eval="[(6,0,[a41])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4110">
+        <record id="a4110" model="account.account">
             <field name="name">T.V.A. due</field>
             <field name="code">4110</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a411])]"/>
+            <field eval="[(6,0,[a411])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="vat_refund0">
+        <record id="vat_refund0" model="account.account">
             <field name="name">T.V.A. due 0%</field>
             <field name="code">411000</field>
             <field name="type">tax</field>
             
-            <field name="parent_id" eval="[(6,0,[a4110])]"/>
+            <field eval="[(6,0,[a4110])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="vat_refund06">
+        <record id="vat_refund06" model="account.account">
             <field name="name">T.V.A. due 6%</field>
             <field name="code">4110001</field>
             <field name="type">tax</field>
             
-            <field name="parent_id" eval="[(6,0,[a4110])]"/>
+            <field eval="[(6,0,[a4110])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="vat_refund12">
+        <record id="vat_refund12" model="account.account">
             <field name="name">T.V.A. due 12%</field>
             <field name="code">4110002</field>
             <field name="type">tax</field>
             
-            <field name="parent_id" eval="[(6,0,[a4110])]"/>
+            <field eval="[(6,0,[a4110])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="vat_refund21">
+        <record id="vat_refund21" model="account.account">
             <field name="name">T.V.A. due 21%</field>
             <field name="code">4110003</field>
             <field name="type">tax</field>
             
-            <field name="parent_id" eval="[(6,0,[a4110])]"/>
+            <field eval="[(6,0,[a4110])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4111">
+        <record id="a4111" model="account.account">
             <field name="name">T.V.A. déductible</field>
             <field name="code">4111</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a411])]"/>
+            <field eval="[(6,0,[a411])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4112">
+        <record id="a4112" model="account.account">
             <field name="name">Compte courant administration T.V.A.</field>
             <field name="code">4112</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a411])]"/>
+            <field eval="[(6,0,[a411])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4118">
+        <record id="a4118" model="account.account">
             <field name="name">Taxe d'égalisation due</field>
             <field name="code">4118</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a411])]"/>
+            <field eval="[(6,0,[a411])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a412">
+        <record id="a412" model="account.account">
             <field name="name">Impôts et versements fiscaux à récupérer</field>
             <field name="code">412</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a41])]"/>
+            <field eval="[(6,0,[a41])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4120">
+        <record id="a4120" model="account.account">
             <field name="name">à 4124 Impôts belges sur le résultat</field>
             <field name="code">4120</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a412])]"/>
+            <field eval="[(6,0,[a412])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4125">
+        <record id="a4125" model="account.account">
             <field name="name">à 4127 Autres impôts belges</field>
             <field name="code">4125</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a412])]"/>
+            <field eval="[(6,0,[a412])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4128">
+        <record id="a4128" model="account.account">
             <field name="name">Impôts étrangers</field>
             <field name="code">4128</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a412])]"/>
+            <field eval="[(6,0,[a412])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a414">
+        <record id="a414" model="account.account">
             <field name="name">Produits à recevoir</field>
             <field name="code">414</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a41])]"/>
+            <field eval="[(6,0,[a41])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a416">
+        <record id="a416" model="account.account">
             <field name="name">Créances diverses</field>
             <field name="code">416</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a41])]"/>
+            <field eval="[(6,0,[a41])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4160">
+        <record id="a4160" model="account.account">
             <field name="name">Associés</field>
             <field name="code">4160</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a416])]"/>
+            <field eval="[(6,0,[a416])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4161">
+        <record id="a4161" model="account.account">
             <field name="name">Avances et prêts au personnel</field>
             <field name="code">4161</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a416])]"/>
+            <field eval="[(6,0,[a416])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4162">
+        <record id="a4162" model="account.account">
             <field name="name">Compte courant des associés en S.P.R.L.</field>
             <field name="code">4162</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a416])]"/>
+            <field eval="[(6,0,[a416])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4163">
+        <record id="a4163" model="account.account">
             <field name="name">Compte courant des administrateurs et gérants</field>
             <field name="code">4163</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a416])]"/>
+            <field eval="[(6,0,[a416])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4164">
+        <record id="a4164" model="account.account">
             <field name="name">Créances sur sociétés apparentées</field>
             <field name="code">4164</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a416])]"/>
+            <field eval="[(6,0,[a416])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4166">
+        <record id="a4166" model="account.account">
             <field name="name">Emballages et matériel à rendre</field>
             <field name="code">4166</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a416])]"/>
+            <field eval="[(6,0,[a416])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4167">
+        <record id="a4167" model="account.account">
             <field name="name">Etat et établissements publics</field>
             <field name="code">4167</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a416])]"/>
+            <field eval="[(6,0,[a416])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a41670">
+        <record id="a41670" model="account.account">
             <field name="name">Subsides à recevoir</field>
             <field name="code">41670</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4167])]"/>
+            <field eval="[(6,0,[a4167])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a41671">
+        <record id="a41671" model="account.account">
             <field name="name">Autres créances</field>
             <field name="code">41671</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4167])]"/>
+            <field eval="[(6,0,[a4167])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4168">
+        <record id="a4168" model="account.account">
             <field name="name">Rabais, ristournes, remises à obtenir et autres avoirs non encore reçus</field>
             <field name="code">4168</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a416])]"/>
+            <field eval="[(6,0,[a416])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a417">
+        <record id="a417" model="account.account">
             <field name="name">Créances douteuses</field>
             <field name="code">417</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a41])]"/>
+            <field eval="[(6,0,[a41])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a418">
+        <record id="a418" model="account.account">
             <field name="name">Cautionnements versés en numéraires</field>
             <field name="code">418</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a41])]"/>
+            <field eval="[(6,0,[a41])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a419">
+        <record id="a419" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">419</field>
             <field name="type">receivable</field>
             
-            <field name="parent_id" eval="[(6,0,[a41])]"/>
+            <field eval="[(6,0,[a41])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a42">
+        <record id="a42" model="account.account">
             <field name="name">DETTES A PLUS D'UN AN ECHEANT DANS L'ANNEE</field>
             <field name="code">42</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a420">
+        <record id="a420" model="account.account">
             <field name="name">Emprunts subordonnés</field>
             <field name="code">420</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a42])]"/>
+            <field eval="[(6,0,[a42])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4200">
+        <record id="a4200" model="account.account">
             <field name="name">Convertibles</field>
             <field name="code">4200</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a420])]"/>
+            <field eval="[(6,0,[a420])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4201">
+        <record id="a4201" model="account.account">
             <field name="name">Non convertibles</field>
             <field name="code">4201</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a420])]"/>
+            <field eval="[(6,0,[a420])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a421">
+        <record id="a421" model="account.account">
             <field name="name">Emprunts obligataires non subordonnés</field>
             <field name="code">421</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a42])]"/>
+            <field eval="[(6,0,[a42])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4210">
+        <record id="a4210" model="account.account">
             <field name="name">Convertibles</field>
             <field name="code">4210</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a421])]"/>
+            <field eval="[(6,0,[a421])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4211">
+        <record id="a4211" model="account.account">
             <field name="name">Non convertibles</field>
             <field name="code">4211</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a421])]"/>
+            <field eval="[(6,0,[a421])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a422">
+        <record id="a422" model="account.account">
             <field name="name">Dettes de location-financement et assimilées</field>
             <field name="code">422</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a42])]"/>
+            <field eval="[(6,0,[a42])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4220">
+        <record id="a4220" model="account.account">
             <field name="name">Financement de biens immobiliers</field>
             <field name="code">4220</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a422])]"/>
+            <field eval="[(6,0,[a422])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4221">
+        <record id="a4221" model="account.account">
             <field name="name">Financement de biens mobiliers</field>
             <field name="code">4221</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a422])]"/>
+            <field eval="[(6,0,[a422])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a423">
+        <record id="a423" model="account.account">
             <field name="name">Etablissements de crédit</field>
             <field name="code">423</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a42])]"/>
+            <field eval="[(6,0,[a42])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4230">
+        <record id="a4230" model="account.account">
             <field name="name">Dettes en compte</field>
             <field name="code">4230</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a423])]"/>
+            <field eval="[(6,0,[a423])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4231">
+        <record id="a4231" model="account.account">
             <field name="name">Promesses</field>
             <field name="code">4231</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a423])]"/>
+            <field eval="[(6,0,[a423])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4232">
+        <record id="a4232" model="account.account">
             <field name="name">Crédits d'acceptation</field>
             <field name="code">4232</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a423])]"/>
+            <field eval="[(6,0,[a423])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a424">
+        <record id="a424" model="account.account">
             <field name="name">Autres emprunts</field>
             <field name="code">424</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a42])]"/>
+            <field eval="[(6,0,[a42])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a425">
+        <record id="a425" model="account.account">
             <field name="name">Dettes commerciales</field>
             <field name="code">425</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a42])]"/>
+            <field eval="[(6,0,[a42])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4250">
+        <record id="a4250" model="account.account">
             <field name="name">Fournisseurs</field>
             <field name="code">4250</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a425])]"/>
+            <field eval="[(6,0,[a425])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4251">
+        <record id="a4251" model="account.account">
             <field name="name">Effets à payer</field>
             <field name="code">4251</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a425])]"/>
+            <field eval="[(6,0,[a425])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a426">
+        <record id="a426" model="account.account">
             <field name="name">Cautionnements reçus en numéraires</field>
             <field name="code">426</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a42])]"/>
+            <field eval="[(6,0,[a42])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a429">
+        <record id="a429" model="account.account">
             <field name="name">Dettes diverses</field>
             <field name="code">429</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a42])]"/>
+            <field eval="[(6,0,[a42])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4290">
+        <record id="a4290" model="account.account">
             <field name="name">Entreprises liées</field>
             <field name="code">4290</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a429])]"/>
+            <field eval="[(6,0,[a429])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4291">
+        <record id="a4291" model="account.account">
             <field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">4291</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a429])]"/>
+            <field eval="[(6,0,[a429])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4292">
+        <record id="a4292" model="account.account">
             <field name="name">Administrateurs, gérants, associés</field>
             <field name="code">4292</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a429])]"/>
+            <field eval="[(6,0,[a429])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4299">
+        <record id="a4299" model="account.account">
             <field name="name">Autres dettes</field>
             <field name="code">4299</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a429])]"/>
+            <field eval="[(6,0,[a429])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a43">
+        <record id="a43" model="account.account">
             <field name="name">DETTES FINANCIERES</field>
             <field name="code">43</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a430">
+        <record id="a430" model="account.account">
             <field name="name">Etablissements de crédit. Emprunts en compte à terme fixe</field>
             <field name="code">430</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a43])]"/>
+            <field eval="[(6,0,[a43])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a431">
+        <record id="a431" model="account.account">
             <field name="name">Etablissements de crédit. Promesses</field>
             <field name="code">431</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a43])]"/>
+            <field eval="[(6,0,[a43])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a432">
+        <record id="a432" model="account.account">
             <field name="name">Etablissements de crédit. Crédits d'acceptation</field>
             <field name="code">432</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a43])]"/>
+            <field eval="[(6,0,[a43])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a433">
+        <record id="a433" model="account.account">
             <field name="name">Etablissements de crédit. Dettes en compte courant</field>
             <field name="code">433</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a43])]"/>
+            <field eval="[(6,0,[a43])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a439">
+        <record id="a439" model="account.account">
             <field name="name">Autres emprunts</field>
             <field name="code">439</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a43])]"/>
+            <field eval="[(6,0,[a43])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44">
+        <record id="a44" model="account.account">
             <field name="name">DETTES COMMERCIALES</field>
             <field name="code">44</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a440">
+        <record id="a440" model="account.account">
             <field name="name">Fournisseurs</field>
             <field name="code">440</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a44])]"/>
+            <field eval="[(6,0,[a44])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4400">
+        <record id="a4400" model="account.account">
             <field name="name">Entreprises apparentées</field>
             <field name="code">4400</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a440])]"/>
+            <field eval="[(6,0,[a440])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a_pay">
+        <record id="a_pay" model="account.account">
             <field name="name">Entreprises liées</field>
             <field name="code">44000</field>
             <field name="type">payable</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" eval="[(6,0,[a4400])]"/>
+            <field eval="True" name="reconcile"/>
+            <field eval="[(6,0,[a4400])]" name="parent_id"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_payable">
-            <field name="value" eval="'account.account,'+str(a_pay)"/>
+        <record id="account.property_account_payable" model="ir.property">
+            <field eval="'account.account,'+str(a_pay)" name="value"/>
         </record>
         
-        <record model="account.account" id="a44001">
+        <record id="a44001" model="account.account">
             <field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">44001</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4400])]"/>
+            <field eval="[(6,0,[a4400])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4401">
+        <record id="a4401" model="account.account">
             <field name="name">Fournisseurs ordinaires</field>
             <field name="code">4401</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a440])]"/>
+            <field eval="[(6,0,[a440])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44010">
+        <record id="a44010" model="account.account">
             <field name="name">Fournisseurs belges</field>
             <field name="code">44010</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4401])]"/>
+            <field eval="[(6,0,[a4401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44011">
+        <record id="a44011" model="account.account">
             <field name="name">Fournisseurs CEE</field>
             <field name="code">44011</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4401])]"/>
+            <field eval="[(6,0,[a4401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44012">
+        <record id="a44012" model="account.account">
             <field name="name">Fournisseurs importation</field>
             <field name="code">44012</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4401])]"/>
+            <field eval="[(6,0,[a4401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4402">
+        <record id="a4402" model="account.account">
             <field name="name">Dettes envers les coparticipants</field>
             <field name="code">4402</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a440])]"/>
+            <field eval="[(6,0,[a440])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4403">
+        <record id="a4403" model="account.account">
             <field name="name">Fournisseurs - retenues de garanties</field>
             <field name="code">4403</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a440])]"/>
+            <field eval="[(6,0,[a440])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a441">
+        <record id="a441" model="account.account">
             <field name="name">Effets à payer</field>
             <field name="code">441</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a44])]"/>
+            <field eval="[(6,0,[a44])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4410">
+        <record id="a4410" model="account.account">
             <field name="name">Entreprises apparentées</field>
             <field name="code">4410</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a441])]"/>
+            <field eval="[(6,0,[a441])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44100">
+        <record id="a44100" model="account.account">
             <field name="name">Entreprises liées</field>
             <field name="code">44100</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4410])]"/>
+            <field eval="[(6,0,[a4410])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44101">
+        <record id="a44101" model="account.account">
             <field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
             <field name="code">44101</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4410])]"/>
+            <field eval="[(6,0,[a4410])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4411">
+        <record id="a4411" model="account.account">
             <field name="name">Fournisseurs ordinaires</field>
             <field name="code">4411</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a441])]"/>
+            <field eval="[(6,0,[a441])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44110">
+        <record id="a44110" model="account.account">
             <field name="name">Fournisseurs belges</field>
             <field name="code">44110</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4411])]"/>
+            <field eval="[(6,0,[a4411])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44111">
+        <record id="a44111" model="account.account">
             <field name="name">Fournisseurs CEE</field>
             <field name="code">44111</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4411])]"/>
+            <field eval="[(6,0,[a4411])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a44112">
+        <record id="a44112" model="account.account">
             <field name="name">Fournisseurs importation</field>
             <field name="code">44112</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4411])]"/>
+            <field eval="[(6,0,[a4411])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a444">
+        <record id="a444" model="account.account">
             <field name="name">Factures à recevoir</field>
             <field name="code">444</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a44])]"/>
+            <field eval="[(6,0,[a44])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a446">
+        <record id="a446" model="account.account">
             <field name="name">Acomptes reçus</field>
             <field name="code">446</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a44])]"/>
+            <field eval="[(6,0,[a44])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a448">
+        <record id="a448" model="account.account">
             <field name="name">Compensations fournisseurs</field>
             <field name="code">448</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a44])]"/>
+            <field eval="[(6,0,[a44])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45">
+        <record id="a45" model="account.account">
             <field name="name">DETTES FISCALES, SALARIALES ET SOCIALES</field>
             <field name="code">45</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a450">
+        <record id="a450" model="account.account">
             <field name="name">Dettes fiscales estimées</field>
             <field name="code">450</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a45])]"/>
+            <field eval="[(6,0,[a45])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4501">
+        <record id="a4501" model="account.account">
             <field name="name">à 4504 Impôts sur le résultat</field>
             <field name="code">4501</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a450])]"/>
+            <field eval="[(6,0,[a450])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4505">
+        <record id="a4505" model="account.account">
             <field name="name">à 4507 Autres impôts en Belgique</field>
             <field name="code">4505</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a450])]"/>
+            <field eval="[(6,0,[a450])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4508">
+        <record id="a4508" model="account.account">
             <field name="name">Impôts à l'étranger</field>
             <field name="code">4508</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a450])]"/>
+            <field eval="[(6,0,[a450])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a451">
+        <record id="a451" model="account.account">
             <field name="name">T.V.A. à payer</field>
             <field name="code">451</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a45])]"/>
+            <field eval="[(6,0,[a45])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4510">
+        <record id="a4510" model="account.account">
             <field name="name">T.V.A. due</field>
             <field name="code">4510</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a451])]"/>
+            <field eval="[(6,0,[a451])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="vat_payable0">
+        <record id="vat_payable0" model="account.account">
             <field name="name">T.V.A. due 0%</field>
             <field name="code">451000</field>
             <field name="type">tax</field>
-            <field name="parent_id" eval="[(6,0,[a4510])]"/>
+            <field eval="[(6,0,[a4510])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="vat_payable06">
+        <record id="vat_payable06" model="account.account">
             <field name="name">T.V.A. due 6%</field>
             <field name="code">4510001</field>
             <field name="type">tax</field>
-            <field name="parent_id" eval="[(6,0,[a4510])]"/>
+            <field eval="[(6,0,[a4510])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="vat_payable12">
+        <record id="vat_payable12" model="account.account">
             <field name="name">T.V.A. due 12%</field>
             <field name="code">4510002</field>
             <field name="type">tax</field>
-            <field name="parent_id" eval="[(6,0,[a4510])]"/>
+            <field eval="[(6,0,[a4510])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="vat_payable21">
+        <record id="vat_payable21" model="account.account">
             <field name="name">T.V.A. due 21%</field>
             <field name="code">4510003</field>
             <field name="type">tax</field>
             
-            <field name="parent_id" eval="[(6,0,[a4510])]"/>
+            <field eval="[(6,0,[a4510])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4511">
+        <record id="a4511" model="account.account">
             <field name="name">T.V.A. déductible</field>
             <field name="code">4511</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a451])]"/>
+            <field eval="[(6,0,[a451])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4512">
+        <record id="a4512" model="account.account">
             <field name="name">Compte courant administration T.V.A.</field>
             <field name="code">4512</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a451])]"/>
+            <field eval="[(6,0,[a451])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4518">
+        <record id="a4518" model="account.account">
             <field name="name">Taxe d'égalisation due</field>
             <field name="code">4518</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a451])]"/>
+            <field eval="[(6,0,[a451])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a452">
+        <record id="a452" model="account.account">
             <field name="name">Impôts et taxes à payer</field>
             <field name="code">452</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a45])]"/>
+            <field eval="[(6,0,[a45])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4520">
+        <record id="a4520" model="account.account">
             <field name="name">Autres impôts sur le résultat</field>
             <field name="code">4520</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a452])]"/>
+            <field eval="[(6,0,[a452])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4525">
+        <record id="a4525" model="account.account">
             <field name="name">Autres impôts et taxes en Belgique</field>
             <field name="code">4525</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a452])]"/>
+            <field eval="[(6,0,[a452])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45250">
+        <record id="a45250" model="account.account">
             <field name="name">Précompte immobilier</field>
             <field name="code">45250</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4525])]"/>
+            <field eval="[(6,0,[a4525])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45251">
+        <record id="a45251" model="account.account">
             <field name="name">Impôts communaux à payer</field>
             <field name="code">45251</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4525])]"/>
+            <field eval="[(6,0,[a4525])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45252">
+        <record id="a45252" model="account.account">
             <field name="name">Impôts provinciaux à payer</field>
             <field name="code">45252</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4525])]"/>
+            <field eval="[(6,0,[a4525])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45253">
+        <record id="a45253" model="account.account">
             <field name="name">Autres impôts et taxes à payer</field>
             <field name="code">45253</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4525])]"/>
+            <field eval="[(6,0,[a4525])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4528">
+        <record id="a4528" model="account.account">
             <field name="name">Impôts et taxes à l'étranger</field>
             <field name="code">4528</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a452])]"/>
+            <field eval="[(6,0,[a452])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a453">
+        <record id="a453" model="account.account">
             <field name="name">Précomptes retenus</field>
             <field name="code">453</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a45])]"/>
+            <field eval="[(6,0,[a45])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4530">
+        <record id="a4530" model="account.account">
             <field name="name">Précompte professionnel retenu sur rémunérations</field>
             <field name="code">4530</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a453])]"/>
+            <field eval="[(6,0,[a453])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4531">
+        <record id="a4531" model="account.account">
             <field name="name">Précompte professionnel retenu sur tantièmes</field>
             <field name="code">4531</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a453])]"/>
+            <field eval="[(6,0,[a453])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4532">
+        <record id="a4532" model="account.account">
             <field name="name">Précompte mobilier retenu sur dividendes attribués</field>
             <field name="code">4532</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a453])]"/>
+            <field eval="[(6,0,[a453])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4533">
+        <record id="a4533" model="account.account">
             <field name="name">Précompte mobilier retenu sur intérêts payés</field>
             <field name="code">4533</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a453])]"/>
+            <field eval="[(6,0,[a453])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4538">
+        <record id="a4538" model="account.account">
             <field name="name">Autres précomptes retenus</field>
             <field name="code">4538</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a453])]"/>
+            <field eval="[(6,0,[a453])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a454">
+        <record id="a454" model="account.account">
             <field name="name">Office National de la Sécurité Sociale</field>
             <field name="code">454</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a45])]"/>
+            <field eval="[(6,0,[a45])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4540">
+        <record id="a4540" model="account.account">
             <field name="name">Arriérés</field>
             <field name="code">4540</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a454])]"/>
+            <field eval="[(6,0,[a454])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4541">
+        <record id="a4541" model="account.account">
             <field name="name">1er trimestre</field>
             <field name="code">4541</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a454])]"/>
+            <field eval="[(6,0,[a454])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4542">
+        <record id="a4542" model="account.account">
             <field name="name">2ème trimestre</field>
             <field name="code">4542</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a454])]"/>
+            <field eval="[(6,0,[a454])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4543">
+        <record id="a4543" model="account.account">
             <field name="name">3ème trimestre</field>
             <field name="code">4543</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a454])]"/>
+            <field eval="[(6,0,[a454])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4544">
+        <record id="a4544" model="account.account">
             <field name="name">4ème trimestre</field>
             <field name="code">4544</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a454])]"/>
+            <field eval="[(6,0,[a454])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a455">
+        <record id="a455" model="account.account">
             <field name="name">Rémunérations</field>
             <field name="code">455</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a45])]"/>
+            <field eval="[(6,0,[a45])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4550">
+        <record id="a4550" model="account.account">
             <field name="name">Administrateurs, gérants et commissaires</field>
             <field name="code">4550</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a455])]"/>
+            <field eval="[(6,0,[a455])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4551">
+        <record id="a4551" model="account.account">
             <field name="name">Direction</field>
             <field name="code">4551</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a455])]"/>
+            <field eval="[(6,0,[a455])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4552">
+        <record id="a4552" model="account.account">
             <field name="name">Employés</field>
             <field name="code">4552</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a455])]"/>
+            <field eval="[(6,0,[a455])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4553">
+        <record id="a4553" model="account.account">
             <field name="name">Ouvriers</field>
             <field name="code">4553</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a455])]"/>
+            <field eval="[(6,0,[a455])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a456">
+        <record id="a456" model="account.account">
             <field name="name">Pécules de vacances</field>
             <field name="code">456</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a45])]"/>
+            <field eval="[(6,0,[a45])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4560">
+        <record id="a4560" model="account.account">
             <field name="name">Direction</field>
             <field name="code">4560</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a456])]"/>
+            <field eval="[(6,0,[a456])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4561">
+        <record id="a4561" model="account.account">
             <field name="name">Employés</field>
             <field name="code">4561</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a456])]"/>
+            <field eval="[(6,0,[a456])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4562">
+        <record id="a4562" model="account.account">
             <field name="name">Ouvriers</field>
             <field name="code">4562</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a456])]"/>
+            <field eval="[(6,0,[a456])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a459">
+        <record id="a459" model="account.account">
             <field name="name">Autres dettes sociales</field>
             <field name="code">459</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a45])]"/>
+            <field eval="[(6,0,[a45])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4590">
+        <record id="a4590" model="account.account">
             <field name="name">Provision pour gratifications de fin d'année</field>
             <field name="code">4590</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a459])]"/>
+            <field eval="[(6,0,[a459])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4591">
+        <record id="a4591" model="account.account">
             <field name="name">Départs de personnel</field>
             <field name="code">4591</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a459])]"/>
+            <field eval="[(6,0,[a459])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4592">
+        <record id="a4592" model="account.account">
             <field name="name">Oppositions sur rémunérations</field>
             <field name="code">4592</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a459])]"/>
+            <field eval="[(6,0,[a459])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4593">
+        <record id="a4593" model="account.account">
             <field name="name">Assurances relatives au personnel</field>
             <field name="code">4593</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a459])]"/>
+            <field eval="[(6,0,[a459])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45930">
+        <record id="a45930" model="account.account">
             <field name="name">Assurance loi</field>
             <field name="code">45930</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4593])]"/>
+            <field eval="[(6,0,[a4593])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45931">
+        <record id="a45931" model="account.account">
             <field name="name">Assurance salaire garanti </field>
             <field name="code">45931</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4593])]"/>
+            <field eval="[(6,0,[a4593])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45932">
+        <record id="a45932" model="account.account">
             <field name="name">Assurance groupe </field>
             <field name="code">45932</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4593])]"/>
+            <field eval="[(6,0,[a4593])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a45933">
+        <record id="a45933" model="account.account">
             <field name="name">Assurances individuelles</field>
             <field name="code">45933</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4593])]"/>
+            <field eval="[(6,0,[a4593])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4594">
+        <record id="a4594" model="account.account">
             <field name="name">Caisse d'assurances sociales pour travailleurs indépendants</field>
             <field name="code">4594</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a459])]"/>
+            <field eval="[(6,0,[a459])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4597">
+        <record id="a4597" model="account.account">
             <field name="name">Dettes et provisions sociales diverses</field>
             <field name="code">4597</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a459])]"/>
+            <field eval="[(6,0,[a459])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a46">
+        <record id="a46" model="account.account">
             <field name="name">ACOMPTES RECUS SUR COMMANDES</field>
             <field name="code">46</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a47">
+        <record id="a47" model="account.account">
             <field name="name">DETTES DECOULANT DE L'AFFECTATION DES RESULTATS</field>
             <field name="code">47</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a470">
+        <record id="a470" model="account.account">
             <field name="name">Dividendes et tantièmes d'exercices antérieurs</field>
             <field name="code">470</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a47])]"/>
+            <field eval="[(6,0,[a47])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a471">
+        <record id="a471" model="account.account">
             <field name="name">Dividendes de l'exercice</field>
             <field name="code">471</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a47])]"/>
+            <field eval="[(6,0,[a47])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a472">
+        <record id="a472" model="account.account">
             <field name="name">Tantièmes de l'exercice</field>
             <field name="code">472</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a47])]"/>
+            <field eval="[(6,0,[a47])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a473">
+        <record id="a473" model="account.account">
             <field name="name">Autres allocataires</field>
             <field name="code">473</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a47])]"/>
+            <field eval="[(6,0,[a47])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a48">
+        <record id="a48" model="account.account">
             <field name="name">DETTES DIVERSES</field>
             <field name="code">48</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a480">
+        <record id="a480" model="account.account">
             <field name="name">Obligations et coupons échus</field>
             <field name="code">480</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a48])]"/>
+            <field eval="[(6,0,[a48])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a481">
+        <record id="a481" model="account.account">
             <field name="name">Actionnaires - capital à rembourser</field>
             <field name="code">481</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a48])]"/>
+            <field eval="[(6,0,[a48])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a482">
+        <record id="a482" model="account.account">
             <field name="name">Participation du personnel à payer</field>
             <field name="code">482</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a48])]"/>
+            <field eval="[(6,0,[a48])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a483">
+        <record id="a483" model="account.account">
             <field name="name">Acomptes reçus d'autres tiers à moins d'un an</field>
             <field name="code">483</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a48])]"/>
+            <field eval="[(6,0,[a48])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a486">
+        <record id="a486" model="account.account">
             <field name="name">Emballages et matériel consignés</field>
             <field name="code">486</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a48])]"/>
+            <field eval="[(6,0,[a48])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a488">
+        <record id="a488" model="account.account">
             <field name="name">Cautionnements reçus en numéraires</field>
             <field name="code">488</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a48])]"/>
+            <field eval="[(6,0,[a48])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a489">
+        <record id="a489" model="account.account">
             <field name="name">Autres dettes diverses</field>
             <field name="code">489</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a48])]"/>
+            <field eval="[(6,0,[a48])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a49">
+        <record id="a49" model="account.account">
             <field name="name">COMPTES DE REGULARISATION ET COMPTES D'ATTENTE</field>
             <field name="code">49</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a4])]"/>
+            <field eval="[(6,0,[a4])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a490">
+        <record id="a490" model="account.account">
             <field name="name">Charges à reporter</field>
             <field name="code">490</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a49])]"/>
+            <field eval="[(6,0,[a49])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a491">
+        <record id="a491" model="account.account">
             <field name="name">Produits acquis</field>
             <field name="code">491</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a49])]"/>
+            <field eval="[(6,0,[a49])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4910">
+        <record id="a4910" model="account.account">
             <field name="name">Produits d'exploitation</field>
             <field name="code">4910</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a491])]"/>
+            <field eval="[(6,0,[a491])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a49100">
+        <record id="a49100" model="account.account">
             <field name="name">Ristournes, rabais à obtenir</field>
             <field name="code">49100</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4910])]"/>
+            <field eval="[(6,0,[a4910])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a49101">
+        <record id="a49101" model="account.account">
             <field name="name">Commissions à obtenir</field>
             <field name="code">49101</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4910])]"/>
+            <field eval="[(6,0,[a4910])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a49102">
+        <record id="a49102" model="account.account">
             <field name="name">Autres produits d'exploitation</field>
             <field name="code">49102</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4910])]"/>
+            <field eval="[(6,0,[a4910])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4911">
+        <record id="a4911" model="account.account">
             <field name="name">Produits financiers</field>
             <field name="code">4911</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a491])]"/>
+            <field eval="[(6,0,[a491])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a49110">
+        <record id="a49110" model="account.account">
             <field name="name">Intérêts courus et non échus sur prêts et débits</field>
             <field name="code">49110</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4911])]"/>
+            <field eval="[(6,0,[a4911])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a49111">
+        <record id="a49111" model="account.account">
             <field name="name">Autres produits financiers</field>
             <field name="code">49111</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a4911])]"/>
+            <field eval="[(6,0,[a4911])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a492">
+        <record id="a492" model="account.account">
             <field name="name">Charges à imputer</field>
             <field name="code">492</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a49])]"/>
+            <field eval="[(6,0,[a49])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a493">
+        <record id="a493" model="account.account">
             <field name="name">Produits à reporter</field>
             <field name="code">493</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a49])]"/>
+            <field eval="[(6,0,[a49])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4930">
+        <record id="a4930" model="account.account">
             <field name="name">Produits d'exploitation à reporter</field>
             <field name="code">4930</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a493])]"/>
+            <field eval="[(6,0,[a493])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4931">
+        <record id="a4931" model="account.account">
             <field name="name">Produits financiers à reporter</field>
             <field name="code">4931</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a493])]"/>
+            <field eval="[(6,0,[a493])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a499">
+        <record id="a499" model="account.account">
             <field name="name">Comptes d'attente</field>
             <field name="code">499</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a49])]"/>
+            <field eval="[(6,0,[a49])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4990">
+        <record id="a4990" model="account.account">
             <field name="name">Compte d'attente</field>
             <field name="code">4990</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a499])]"/>
+            <field eval="[(6,0,[a499])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4991">
+        <record id="a4991" model="account.account">
             <field name="name">Compte de répartition périodique des charges</field>
             <field name="code">4991</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a499])]"/>
+            <field eval="[(6,0,[a499])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a4999">
+        <record id="a4999" model="account.account">
             <field name="name">Transferts d'exercice</field>
             <field name="code">4999</field>
             <field name="type">payable</field>
             
-            <field name="parent_id" eval="[(6,0,[a499])]"/>
+            <field eval="[(6,0,[a499])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a5">
+        <record id="a5" model="account.account">
             <field name="name">CLASSE 5. PLACEMENTS DE TRESORERIE ET DE VALEURS DISPONIBLES</field>
             <field name="code">5</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a_root])]"/>
+            <field eval="[(6,0,[a_root])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a50">
+        <record id="a50" model="account.account">
             <field name="name">ACTIONS PROPRES</field>
             <field name="code">50</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a51">
+        <record id="a51" model="account.account">
             <field name="name">ACTIONS ET PARTS</field>
             <field name="code">51</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a510">
+        <record id="a510" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">510</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a51])]"/>
+            <field eval="[(6,0,[a51])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a511">
+        <record id="a511" model="account.account">
             <field name="name">Montants non appelés</field>
             <field name="code">511</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a51])]"/>
+            <field eval="[(6,0,[a51])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a519">
+        <record id="a519" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">519</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a51])]"/>
+            <field eval="[(6,0,[a51])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a52">
+        <record id="a52" model="account.account">
             <field name="name">TITRES A REVENUS FIXES</field>
             <field name="code">52</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a520">
+        <record id="a520" model="account.account">
             <field name="name">Valeur d'acquisition</field>
             <field name="code">520</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a52])]"/>
+            <field eval="[(6,0,[a52])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a529">
+        <record id="a529" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">529</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a52])]"/>
+            <field eval="[(6,0,[a52])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a53">
+        <record id="a53" model="account.account">
             <field name="name">DEPOTS A TERME</field>
             <field name="code">53</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a530">
+        <record id="a530" model="account.account">
             <field name="name">De plus d'un an</field>
             <field name="code">530</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a53])]"/>
+            <field eval="[(6,0,[a53])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a531">
+        <record id="a531" model="account.account">
             <field name="name">De plus d'un mois et à un an au plus</field>
             <field name="code">531</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a53])]"/>
+            <field eval="[(6,0,[a53])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a532">
+        <record id="a532" model="account.account">
             <field name="name">D'un mois au plus</field>
             <field name="code">532</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a53])]"/>
+            <field eval="[(6,0,[a53])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a539">
+        <record id="a539" model="account.account">
             <field name="name">Réductions de valeur actées</field>
             <field name="code">539</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a53])]"/>
+            <field eval="[(6,0,[a53])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a54">
+        <record id="a54" model="account.account">
             <field name="name">VALEURS ECHUES A L'ENCAISSEMENT</field>
             <field name="code">54</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a540">
+        <record id="a540" model="account.account">
             <field name="name">Chèques à encaisser</field>
             <field name="code">540</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a54])]"/>
+            <field eval="[(6,0,[a54])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a541">
+        <record id="a541" model="account.account">
             <field name="name">Coupons à encaisser</field>
             <field name="code">541</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a54])]"/>
+            <field eval="[(6,0,[a54])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a55">
+        <record id="a55" model="account.account">
             <field name="name">ETABLISSEMENTS DE CREDIT.</field>
             <field name="code">55</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a550">
+        <record id="a550" model="account.account">
             <field name="name">Comptes ouverts auprès des divers établissements</field>
             <field name="code">550</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a55])]"/>
+            <field eval="[(6,0,[a55])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a56">
+        <record id="a56" model="account.account">
             <field name="name">OFFICE DES CHEQUES POSTAUX</field>
             <field name="code">56</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a560">
+        <record id="a560" model="account.account">
             <field name="name">Compte courant</field>
             <field name="code">560</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a56])]"/>
+            <field eval="[(6,0,[a56])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a561">
+        <record id="a561" model="account.account">
             <field name="name">Chèques émis</field>
             <field name="code">561</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a56])]"/>
+            <field eval="[(6,0,[a56])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a57">
+        <record id="a57" model="account.account">
             <field name="name">CAISSES</field>
             <field name="code">57</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a570">
+        <record id="a570" model="account.account">
             <field name="name">Caisses - espèces</field>
             <field name="code">570</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a57])]"/>
+            <field eval="[(6,0,[a57])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="cash">
+        <record id="cash" model="account.account">
             <field name="name">Caisse principale</field>
             <field name="code">5700</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a570])]"/>
+            <field eval="[(6,0,[a570])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a578">
+        <record id="a578" model="account.account">
             <field name="name">Caisses - timbres</field>
             <field name="code">578</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a57])]"/>
+            <field eval="[(6,0,[a57])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a58">
+        <record id="a58" model="account.account">
             <field name="name">VIREMENTS INTERNES</field>
             <field name="code">58</field>
             <field name="type">cash</field>
             
-            <field name="parent_id" eval="[(6,0,[a5])]"/>
+            <field eval="[(6,0,[a5])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6">
+        <record id="a6" model="account.account">
             <field name="name">CLASSE 6. - CHARGES</field>
             <field name="code">6</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a_root])]"/>
+            <field eval="[(6,0,[a_root])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a60">
+        <record id="a60" model="account.account">
             <field name="name">APPROVISIONNEMENTS ET MARCHANDISES</field>
             <field name="code">60</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a_expense">
+        <record id="a_expense" model="account.account">
             <field name="name">Achats de matières premières</field>
             <field name="code">600</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a60])]"/>
+            <field eval="[(6,0,[a60])]" name="parent_id"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_expense_categ">
-            <field name="value" eval="'account.account,'+str(a_expense)"/>
+        <record id="account.property_account_expense_categ" model="ir.property">
+            <field eval="'account.account,'+str(a_expense)" name="value"/>
         </record>
         
-        <record model="account.account" id="a601">
+        <record id="a601" model="account.account">
             <field name="name">Achats de fournitures</field>
             <field name="code">601</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a60])]"/>
+            <field eval="[(6,0,[a60])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a602">
+        <record id="a602" model="account.account">
             <field name="name">Achats de services, travaux et études</field>
             <field name="code">602</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a60])]"/>
+            <field eval="[(6,0,[a60])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a603">
+        <record id="a603" model="account.account">
             <field name="name">Sous-traitances générales</field>
             <field name="code">603</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a60])]"/>
+            <field eval="[(6,0,[a60])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a604">
+        <record id="a604" model="account.account">
             <field name="name">Achats de marchandises</field>
             <field name="code">604</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a60])]"/>
+            <field eval="[(6,0,[a60])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a605">
+        <record id="a605" model="account.account">
             <field name="name">Achats d'immeubles destinés à la revente</field>
             <field name="code">605</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a60])]"/>
+            <field eval="[(6,0,[a60])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a608">
+        <record id="a608" model="account.account">
             <field name="name">Remises, ristournes et rabais obtenus sur achats</field>
             <field name="code">608</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a60])]"/>
+            <field eval="[(6,0,[a60])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a609">
+        <record id="a609" model="account.account">
             <field name="name">Variations de stocks</field>
             <field name="code">609</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a60])]"/>
+            <field eval="[(6,0,[a60])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6090">
+        <record id="a6090" model="account.account">
             <field name="name">De matières premières</field>
             <field name="code">6090</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a609])]"/>
+            <field eval="[(6,0,[a609])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6091">
+        <record id="a6091" model="account.account">
             <field name="name">De fournitures</field>
             <field name="code">6091</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a609])]"/>
+            <field eval="[(6,0,[a609])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6094">
+        <record id="a6094" model="account.account">
             <field name="name">De marchandises</field>
             <field name="code">6094</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a609])]"/>
+            <field eval="[(6,0,[a609])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6095">
+        <record id="a6095" model="account.account">
             <field name="name">D'immeubles destinés à la vente</field>
             <field name="code">6095</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a609])]"/>
+            <field eval="[(6,0,[a609])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61">
+        <record id="a61" model="account.account">
             <field name="name">SERVICES ET BIENS DIVERS</field>
             <field name="code">61</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a610">
+        <record id="a610" model="account.account">
             <field name="name">Loyers et charges locatives</field>
             <field name="code">610</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a61])]"/>
+            <field eval="[(6,0,[a61])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6100">
+        <record id="a6100" model="account.account">
             <field name="name">Loyers divers</field>
             <field name="code">6100</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a610])]"/>
+            <field eval="[(6,0,[a610])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6101">
+        <record id="a6101" model="account.account">
             <field name="name">Charges locatives</field>
             <field name="code">6101</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a610])]"/>
+            <field eval="[(6,0,[a610])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a611">
+        <record id="a611" model="account.account">
             <field name="name">Entretien et réparation</field>
             <field name="code">611</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a61])]"/>
+            <field eval="[(6,0,[a61])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a612">
+        <record id="a612" model="account.account">
             <field name="name">Fournitures faites à l'entreprise</field>
             <field name="code">612</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a61])]"/>
+            <field eval="[(6,0,[a61])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6120">
+        <record id="a6120" model="account.account">
             <field name="name">Eau, gaz, électricité, vapeur</field>
             <field name="code">6120</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a612])]"/>
+            <field eval="[(6,0,[a612])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61200">
+        <record id="a61200" model="account.account">
             <field name="name">Eau</field>
             <field name="code">61200</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6120])]"/>
+            <field eval="[(6,0,[a6120])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61201">
+        <record id="a61201" model="account.account">
             <field name="name">Gaz</field>
             <field name="code">61201</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6120])]"/>
+            <field eval="[(6,0,[a6120])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61202">
+        <record id="a61202" model="account.account">
             <field name="name">Electricité</field>
             <field name="code">61202</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6120])]"/>
+            <field eval="[(6,0,[a6120])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61203">
+        <record id="a61203" model="account.account">
             <field name="name">Vapeur</field>
             <field name="code">61203</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6120])]"/>
+            <field eval="[(6,0,[a6120])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6121">
+        <record id="a6121" model="account.account">
             <field name="name">Téléphone, télégrammes, télex, téléfax, frais postaux</field>
             <field name="code">6121</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a612])]"/>
+            <field eval="[(6,0,[a612])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61210">
+        <record id="a61210" model="account.account">
             <field name="name">Téléphone</field>
             <field name="code">61210</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6121])]"/>
+            <field eval="[(6,0,[a6121])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61211">
+        <record id="a61211" model="account.account">
             <field name="name">Télégrammes</field>
             <field name="code">61211</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6121])]"/>
+            <field eval="[(6,0,[a6121])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61212">
+        <record id="a61212" model="account.account">
             <field name="name">Télex et téléfax</field>
             <field name="code">61212</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6121])]"/>
+            <field eval="[(6,0,[a6121])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61213">
+        <record id="a61213" model="account.account">
             <field name="name">Frais postaux</field>
             <field name="code">61213</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6121])]"/>
+            <field eval="[(6,0,[a6121])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6122">
+        <record id="a6122" model="account.account">
             <field name="name">Livres, bibliothèque</field>
             <field name="code">6122</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a612])]"/>
+            <field eval="[(6,0,[a612])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6123">
+        <record id="a6123" model="account.account">
             <field name="name">Imprimés et fournitures de bureau</field>
             <field name="code">6123</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a612])]"/>
+            <field eval="[(6,0,[a612])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a613">
+        <record id="a613" model="account.account">
             <field name="name">Rétributions de tiers</field>
             <field name="code">613</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a61])]"/>
+            <field eval="[(6,0,[a61])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6130">
+        <record id="a6130" model="account.account">
             <field name="name">Redevances et royalties</field>
             <field name="code">6130</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a613])]"/>
+            <field eval="[(6,0,[a613])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61300">
+        <record id="a61300" model="account.account">
             <field name="name">Redevances pour brevets, licences, marques, accessoires</field>
             <field name="code">61300</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6130])]"/>
+            <field eval="[(6,0,[a6130])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61301">
+        <record id="a61301" model="account.account">
             <field name="name">Autres redevances</field>
             <field name="code">61301</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6130])]"/>
+            <field eval="[(6,0,[a6130])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6131">
+        <record id="a6131" model="account.account">
             <field name="name">Assurances non relatives au personnel</field>
             <field name="code">6131</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a613])]"/>
+            <field eval="[(6,0,[a613])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61310">
+        <record id="a61310" model="account.account">
             <field name="name">Assurance incendie</field>
             <field name="code">61310</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6131])]"/>
+            <field eval="[(6,0,[a6131])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61311">
+        <record id="a61311" model="account.account">
             <field name="name">Assurance vol</field>
             <field name="code">61311</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6131])]"/>
+            <field eval="[(6,0,[a6131])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61312">
+        <record id="a61312" model="account.account">
             <field name="name">Assurance autos</field>
             <field name="code">61312</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6131])]"/>
+            <field eval="[(6,0,[a6131])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61313">
+        <record id="a61313" model="account.account">
             <field name="name">Assurance crédit</field>
             <field name="code">61313</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6131])]"/>
+            <field eval="[(6,0,[a6131])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61314">
+        <record id="a61314" model="account.account">
             <field name="name">Assurances frais généraux</field>
             <field name="code">61314</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6131])]"/>
+            <field eval="[(6,0,[a6131])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6132">
+        <record id="a6132" model="account.account">
             <field name="name">Divers</field>
             <field name="code">6132</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a613])]"/>
+            <field eval="[(6,0,[a613])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61320">
+        <record id="a61320" model="account.account">
             <field name="name">Commissions aux tiers</field>
             <field name="code">61320</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6132])]"/>
+            <field eval="[(6,0,[a6132])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61321">
+        <record id="a61321" model="account.account">
             <field name="name">Honoraires d'avocats, d'experts, etc ...</field>
             <field name="code">61321</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6132])]"/>
+            <field eval="[(6,0,[a6132])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61322">
+        <record id="a61322" model="account.account">
             <field name="name">Cotisations aux groupements professionnels</field>
             <field name="code">61322</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6132])]"/>
+            <field eval="[(6,0,[a6132])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61323">
+        <record id="a61323" model="account.account">
             <field name="name">Dons, libéralités, ...</field>
             <field name="code">61323</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6132])]"/>
+            <field eval="[(6,0,[a6132])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61324">
+        <record id="a61324" model="account.account">
             <field name="name">Frais de contentieux</field>
             <field name="code">61324</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6132])]"/>
+            <field eval="[(6,0,[a6132])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61325">
+        <record id="a61325" model="account.account">
             <field name="name">Publications légales</field>
             <field name="code">61325</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6132])]"/>
+            <field eval="[(6,0,[a6132])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6133">
+        <record id="a6133" model="account.account">
             <field name="name">Transports et déplacements</field>
             <field name="code">6133</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a613])]"/>
+            <field eval="[(6,0,[a613])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61330">
+        <record id="a61330" model="account.account">
             <field name="name">Transports de personnel</field>
             <field name="code">61330</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6133])]"/>
+            <field eval="[(6,0,[a6133])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61331">
+        <record id="a61331" model="account.account">
             <field name="name">Voyages, déplacements, représentations</field>
             <field name="code">61331</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6133])]"/>
+            <field eval="[(6,0,[a6133])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6134">
+        <record id="a6134" model="account.account">
             <field name="name">Personnel intérimaire</field>
             <field name="code">6134</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a613])]"/>
+            <field eval="[(6,0,[a613])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a614">
+        <record id="a614" model="account.account">
             <field name="name">Annonces, publicité, propagande et documentation</field>
             <field name="code">614</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a61])]"/>
+            <field eval="[(6,0,[a61])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6140">
+        <record id="a6140" model="account.account">
             <field name="name">Annonces et insertions</field>
             <field name="code">6140</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a614])]"/>
+            <field eval="[(6,0,[a614])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6141">
+        <record id="a6141" model="account.account">
             <field name="name">Catalogues et imprimés</field>
             <field name="code">6141</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a614])]"/>
+            <field eval="[(6,0,[a614])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6142">
+        <record id="a6142" model="account.account">
             <field name="name">Echantillons</field>
             <field name="code">6142</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a614])]"/>
+            <field eval="[(6,0,[a614])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6143">
+        <record id="a6143" model="account.account">
             <field name="name">Foires et expositions</field>
             <field name="code">6143</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a614])]"/>
+            <field eval="[(6,0,[a614])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6144">
+        <record id="a6144" model="account.account">
             <field name="name">Primes</field>
             <field name="code">6144</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a614])]"/>
+            <field eval="[(6,0,[a614])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6145">
+        <record id="a6145" model="account.account">
             <field name="name">Cadeaux à la clientèle</field>
             <field name="code">6145</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a614])]"/>
+            <field eval="[(6,0,[a614])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6146">
+        <record id="a6146" model="account.account">
             <field name="name">Missions et réceptions</field>
             <field name="code">6146</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a614])]"/>
+            <field eval="[(6,0,[a614])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6147">
+        <record id="a6147" model="account.account">
             <field name="name">Documentation</field>
             <field name="code">6147</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a614])]"/>
+            <field eval="[(6,0,[a614])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a615">
+        <record id="a615" model="account.account">
             <field name="name">Sous-traitants</field>
             <field name="code">615</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a61])]"/>
+            <field eval="[(6,0,[a61])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6150">
+        <record id="a6150" model="account.account">
             <field name="name">Sous-traitants pour activités propres</field>
             <field name="code">6150</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a615])]"/>
+            <field eval="[(6,0,[a615])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6151">
+        <record id="a6151" model="account.account">
             <field name="name">Sous-traitants d'associations momentanées</field>
             <field name="code">6151</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a615])]"/>
+            <field eval="[(6,0,[a615])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6152">
+        <record id="a6152" model="account.account">
             <field name="name">Quote-part bénéficiaire des coparticipants</field>
             <field name="code">6152</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a615])]"/>
+            <field eval="[(6,0,[a615])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61700">
+        <record id="a61700" model="account.account">
             <field name="name">Personnel intérimaire et personnes mises à la disposition  de l'entreprise</field>
             <field name="code">61700</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a61])]"/>
+            <field eval="[(6,0,[a61])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a61800">
+        <record id="a61800" model="account.account">
             <field name="name">Rémunérations, primes pour assurances extralégales</field>
             <field name="code">61800</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a61])]"/>
+            <field eval="[(6,0,[a61])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62">
+        <record id="a62" model="account.account">
             <field name="name">REMUNERATIONS, CHARGES SOCIALES ET PENSIONS</field>
             <field name="code">62</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a620">
+        <record id="a620" model="account.account">
             <field name="name">Rémunérations et avantages sociaux directs</field>
             <field name="code">620</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a62])]"/>
+            <field eval="[(6,0,[a62])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6200">
+        <record id="a6200" model="account.account">
             <field name="name">Administrateurs ou gérants</field>
             <field name="code">6200</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a620])]"/>
+            <field eval="[(6,0,[a620])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6201">
+        <record id="a6201" model="account.account">
             <field name="name">Personnel de direction</field>
             <field name="code">6201</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a620])]"/>
+            <field eval="[(6,0,[a620])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6202">
+        <record id="a6202" model="account.account">
             <field name="name">Employés</field>
             <field name="code">6202</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a620])]"/>
+            <field eval="[(6,0,[a620])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6203">
+        <record id="a6203" model="account.account">
             <field name="name">Ouvriers</field>
             <field name="code">6203</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a620])]"/>
+            <field eval="[(6,0,[a620])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6204">
+        <record id="a6204" model="account.account">
             <field name="name">Autres membres du personnel</field>
             <field name="code">6204</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a620])]"/>
+            <field eval="[(6,0,[a620])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a621">
+        <record id="a621" model="account.account">
             <field name="name">Cotisations patronales d'assurances sociales</field>
             <field name="code">621</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a62])]"/>
+            <field eval="[(6,0,[a62])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6210">
+        <record id="a6210" model="account.account">
             <field name="name">Sur salaires</field>
             <field name="code">6210</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a621])]"/>
+            <field eval="[(6,0,[a621])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6211">
+        <record id="a6211" model="account.account">
             <field name="name">Sur appointements et commissions</field>
             <field name="code">6211</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a621])]"/>
+            <field eval="[(6,0,[a621])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a622">
+        <record id="a622" model="account.account">
             <field name="name">Primes patronales pour assurances extralégales</field>
             <field name="code">622</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a62])]"/>
+            <field eval="[(6,0,[a62])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a623">
+        <record id="a623" model="account.account">
             <field name="name">Autres frais de personnel</field>
             <field name="code">623</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a62])]"/>
+            <field eval="[(6,0,[a62])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6230">
+        <record id="a6230" model="account.account">
             <field name="name">Assurances du personnel</field>
             <field name="code">6230</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a623])]"/>
+            <field eval="[(6,0,[a623])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62300">
+        <record id="a62300" model="account.account">
             <field name="name">Assurances loi, responsabilité civile, chemin du travail</field>
             <field name="code">62300</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6230])]"/>
+            <field eval="[(6,0,[a6230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62301">
+        <record id="a62301" model="account.account">
             <field name="name">Assurance salaire garanti</field>
             <field name="code">62301</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6230])]"/>
+            <field eval="[(6,0,[a6230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62302">
+        <record id="a62302" model="account.account">
             <field name="name">Assurances individuelles</field>
             <field name="code">62302</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6230])]"/>
+            <field eval="[(6,0,[a6230])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6231">
+        <record id="a6231" model="account.account">
             <field name="name">Charges sociales diverses</field>
             <field name="code">6231</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a623])]"/>
+            <field eval="[(6,0,[a623])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62310">
+        <record id="a62310" model="account.account">
             <field name="name">Jours fériés payés</field>
             <field name="code">62310</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6231])]"/>
+            <field eval="[(6,0,[a6231])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62311">
+        <record id="a62311" model="account.account">
             <field name="name">Salaire hebdomadaire garanti</field>
             <field name="code">62311</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6231])]"/>
+            <field eval="[(6,0,[a6231])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62312">
+        <record id="a62312" model="account.account">
             <field name="name">Allocations familiales complémentaires</field>
             <field name="code">62312</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6231])]"/>
+            <field eval="[(6,0,[a6231])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6232">
+        <record id="a6232" model="account.account">
             <field name="name">Charges sociales des administrateurs, gérants et commissaires</field>
             <field name="code">6232</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a623])]"/>
+            <field eval="[(6,0,[a623])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62320">
+        <record id="a62320" model="account.account">
             <field name="name">Allocations familiales complémentaires pour non salariés</field>
             <field name="code">62320</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6232])]"/>
+            <field eval="[(6,0,[a6232])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62321">
+        <record id="a62321" model="account.account">
             <field name="name">Lois sociales pour indépendants</field>
             <field name="code">62321</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6232])]"/>
+            <field eval="[(6,0,[a6232])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a62322">
+        <record id="a62322" model="account.account">
             <field name="name">Divers</field>
             <field name="code">62322</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6232])]"/>
+            <field eval="[(6,0,[a6232])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a624">
+        <record id="a624" model="account.account">
             <field name="name">Pensions de retraite et de survie</field>
             <field name="code">624</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a62])]"/>
+            <field eval="[(6,0,[a62])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6240">
+        <record id="a6240" model="account.account">
             <field name="name">Administrateurs et gérants</field>
             <field name="code">6240</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a624])]"/>
+            <field eval="[(6,0,[a624])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6241">
+        <record id="a6241" model="account.account">
             <field name="name">Personnel</field>
             <field name="code">6241</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a624])]"/>
+            <field eval="[(6,0,[a624])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a625">
+        <record id="a625" model="account.account">
             <field name="name">Provision pour pécule de vacances</field>
             <field name="code">625</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a62])]"/>
+            <field eval="[(6,0,[a62])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6250">
+        <record id="a6250" model="account.account">
             <field name="name">Dotations</field>
             <field name="code">6250</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a625])]"/>
+            <field eval="[(6,0,[a625])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6251">
+        <record id="a6251" model="account.account">
             <field name="name">Utilisations et reprises</field>
             <field name="code">6251</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a625])]"/>
+            <field eval="[(6,0,[a625])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a63">
+        <record id="a63" model="account.account">
             <field name="name">AMORTISSEMENTS, REDUCTIONS DE VALEUR ET PROVISIONS POUR RISQUES ET CHARGES</field>
             <field name="code">63</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a630">
+        <record id="a630" model="account.account">
             <field name="name">Dotations aux amortissements et aux réductions de valeur sur immobilisations</field>
             <field name="code">630</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a63])]"/>
+            <field eval="[(6,0,[a63])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6300">
+        <record id="a6300" model="account.account">
             <field name="name">Dotations aux amortissements sur frais d'établissement</field>
             <field name="code">6300</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a630])]"/>
+            <field eval="[(6,0,[a630])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6301">
+        <record id="a6301" model="account.account">
             <field name="name">Dotations aux amortissements sur immobilisations incorporelles</field>
             <field name="code">6301</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a630])]"/>
+            <field eval="[(6,0,[a630])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6302">
+        <record id="a6302" model="account.account">
             <field name="name">Dotations aux amortissements sur immobilisations corporelles</field>
             <field name="code">6302</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a630])]"/>
+            <field eval="[(6,0,[a630])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6308">
+        <record id="a6308" model="account.account">
             <field name="name">Dotations aux réductions de valeur sur immobilisations incorporelles</field>
             <field name="code">6308</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a630])]"/>
+            <field eval="[(6,0,[a630])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6309">
+        <record id="a6309" model="account.account">
             <field name="name">Dotations aux réductions de valeur sur immobilisations corporelles</field>
             <field name="code">6309</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a630])]"/>
+            <field eval="[(6,0,[a630])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a631">
+        <record id="a631" model="account.account">
             <field name="name">Réductions de valeur sur stocks</field>
             <field name="code">631</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a63])]"/>
+            <field eval="[(6,0,[a63])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6310">
+        <record id="a6310" model="account.account">
             <field name="name">Dotations</field>
             <field name="code">6310</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a631])]"/>
+            <field eval="[(6,0,[a631])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6311">
+        <record id="a6311" model="account.account">
             <field name="name">Reprises</field>
             <field name="code">6311</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a631])]"/>
+            <field eval="[(6,0,[a631])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a632">
+        <record id="a632" model="account.account">
             <field name="name">Réductions de valeur sur commandes en cours d'exécution</field>
             <field name="code">632</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a63])]"/>
+            <field eval="[(6,0,[a63])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6320">
+        <record id="a6320" model="account.account">
             <field name="name">Dotations</field>
             <field name="code">6320</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a632])]"/>
+            <field eval="[(6,0,[a632])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6321">
+        <record id="a6321" model="account.account">
             <field name="name">Reprises</field>
             <field name="code">6321</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a632])]"/>
+            <field eval="[(6,0,[a632])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a633">
+        <record id="a633" model="account.account">
             <field name="name">Réductions de valeur sur créances commerciales à plus d'un an</field>
             <field name="code">633</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a63])]"/>
+            <field eval="[(6,0,[a63])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6330">
+        <record id="a6330" model="account.account">
             <field name="name">Dotations</field>
             <field name="code">6330</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a633])]"/>
+            <field eval="[(6,0,[a633])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6331">
+        <record id="a6331" model="account.account">
             <field name="name">Reprises</field>
             <field name="code">6331</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a633])]"/>
+            <field eval="[(6,0,[a633])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a634">
+        <record id="a634" model="account.account">
             <field name="name">Réductions de valeur sur créances commerciales à un an au plus</field>
             <field name="code">634</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a63])]"/>
+            <field eval="[(6,0,[a63])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6340">
+        <record id="a6340" model="account.account">
             <field name="name">Dotations</field>
             <field name="code">6340</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a634])]"/>
+            <field eval="[(6,0,[a634])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6341">
+        <record id="a6341" model="account.account">
             <field name="name">Reprises</field>
             <field name="code">6341</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a634])]"/>
+            <field eval="[(6,0,[a634])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a635">
+        <record id="a635" model="account.account">
             <field name="name">Provisions pour pensions et obligations similaires</field>
             <field name="code">635</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a63])]"/>
+            <field eval="[(6,0,[a63])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6350">
+        <record id="a6350" model="account.account">
             <field name="name">Dotations</field>
             <field name="code">6350</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a635])]"/>
+            <field eval="[(6,0,[a635])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6351">
+        <record id="a6351" model="account.account">
             <field name="name">Utilisations et reprises</field>
             <field name="code">6351</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a635])]"/>
+            <field eval="[(6,0,[a635])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a636">
+        <record id="a636" model="account.account">
             <field name="name">Provisions pour grosses réparations et gros entretiens</field>
             <field name="code">636</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a63])]"/>
+            <field eval="[(6,0,[a63])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6360">
+        <record id="a6360" model="account.account">
             <field name="name">Dotations</field>
             <field name="code">6360</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a636])]"/>
+            <field eval="[(6,0,[a636])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6361">
+        <record id="a6361" model="account.account">
             <field name="name">Utilisations et reprises</field>
             <field name="code">6361</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a636])]"/>
+            <field eval="[(6,0,[a636])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a637">
+        <record id="a637" model="account.account">
             <field name="name">Provisions pour autres risques et charges</field>
             <field name="code">637</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a63])]"/>
+            <field eval="[(6,0,[a63])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6370">
+        <record id="a6370" model="account.account">
             <field name="name">Dotations </field>
             <field name="code">6370</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a637])]"/>
+            <field eval="[(6,0,[a637])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6371">
+        <record id="a6371" model="account.account">
             <field name="name">Utilisations et reprises</field>
             <field name="code">6371</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a637])]"/>
+            <field eval="[(6,0,[a637])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a64">
+        <record id="a64" model="account.account">
             <field name="name">AUTRES CHARGES D'EXPLOITATION</field>
             <field name="code">64</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a640">
+        <record id="a640" model="account.account">
             <field name="name">Charges fiscales d'exploitation</field>
             <field name="code">640</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a64])]"/>
+            <field eval="[(6,0,[a64])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6400">
+        <record id="a6400" model="account.account">
             <field name="name">Taxes et impôts directs</field>
             <field name="code">6400</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a640])]"/>
+            <field eval="[(6,0,[a640])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a64000">
+        <record id="a64000" model="account.account">
             <field name="name">Taxes sur autos et camions</field>
             <field name="code">64000</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6400])]"/>
+            <field eval="[(6,0,[a6400])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6401">
+        <record id="a6401" model="account.account">
             <field name="name">Taxes et impôts indirects</field>
             <field name="code">6401</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a640])]"/>
+            <field eval="[(6,0,[a640])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a64010">
+        <record id="a64010" model="account.account">
             <field name="name">Timbres fiscaux pris en charge par la firme</field>
             <field name="code">64010</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6401])]"/>
+            <field eval="[(6,0,[a6401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a64011">
+        <record id="a64011" model="account.account">
             <field name="name">Droits d'enregistrement</field>
             <field name="code">64011</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6401])]"/>
+            <field eval="[(6,0,[a6401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a64012">
+        <record id="a64012" model="account.account">
             <field name="name">T.V.A. non déductible</field>
             <field name="code">64012</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6401])]"/>
+            <field eval="[(6,0,[a6401])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6402">
+        <record id="a6402" model="account.account">
             <field name="name">Impôts provinciaux et communaux</field>
             <field name="code">6402</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a640])]"/>
+            <field eval="[(6,0,[a640])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a64020">
+        <record id="a64020" model="account.account">
             <field name="name">Taxe sur la force motrice</field>
             <field name="code">64020</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6402])]"/>
+            <field eval="[(6,0,[a6402])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a64021">
+        <record id="a64021" model="account.account">
             <field name="name">Taxe sur le personnel occupé</field>
             <field name="code">64021</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6402])]"/>
+            <field eval="[(6,0,[a6402])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6403">
+        <record id="a6403" model="account.account">
             <field name="name">Taxes diverses</field>
             <field name="code">6403</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a640])]"/>
+            <field eval="[(6,0,[a640])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a641">
+        <record id="a641" model="account.account">
             <field name="name">Moins-values sur réalisations courantes d'immobilisations corporelles</field>
             <field name="code">641</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a64])]"/>
+            <field eval="[(6,0,[a64])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a642">
+        <record id="a642" model="account.account">
             <field name="name">Moins-values sur réalisations de créances commerciales</field>
             <field name="code">642</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a64])]"/>
+            <field eval="[(6,0,[a64])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a643">
+        <record id="a643" model="account.account">
             <field name="name">à 648 Charges d'exploitations diverses</field>
             <field name="code">643</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a64])]"/>
+            <field eval="[(6,0,[a64])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a649">
+        <record id="a649" model="account.account">
             <field name="name">Charges d'exploitation portées à l'actif au titre de restructuration</field>
             <field name="code">649</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a64])]"/>
+            <field eval="[(6,0,[a64])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a65">
+        <record id="a65" model="account.account">
             <field name="name">CHARGES FINANCIERES</field>
             <field name="code">65</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a650">
+        <record id="a650" model="account.account">
             <field name="name">Charges des dettes</field>
             <field name="code">650</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6500">
+        <record id="a6500" model="account.account">
             <field name="name">Intérêts, commissions et frais afférents aux dettes</field>
             <field name="code">6500</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a650])]"/>
+            <field eval="[(6,0,[a650])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6501">
+        <record id="a6501" model="account.account">
             <field name="name">Amortissements des agios et frais d'émission d'emprunts</field>
             <field name="code">6501</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a650])]"/>
+            <field eval="[(6,0,[a650])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6502">
+        <record id="a6502" model="account.account">
             <field name="name">Autres charges de dettes</field>
             <field name="code">6502</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a650])]"/>
+            <field eval="[(6,0,[a650])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6503">
+        <record id="a6503" model="account.account">
             <field name="name">Intérêts intercalaires portés à l'actif</field>
             <field name="code">6503</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a650])]"/>
+            <field eval="[(6,0,[a650])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a651">
+        <record id="a651" model="account.account">
             <field name="name">Réductions de valeur sur actifs circulants</field>
             <field name="code">651</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6510">
+        <record id="a6510" model="account.account">
             <field name="name">Dotations </field>
             <field name="code">6510</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a651])]"/>
+            <field eval="[(6,0,[a651])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6511">
+        <record id="a6511" model="account.account">
             <field name="name">Reprises</field>
             <field name="code">6511</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a651])]"/>
+            <field eval="[(6,0,[a651])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a652">
+        <record id="a652" model="account.account">
             <field name="name">Moins-values sur réalisation d'actifs circulants</field>
             <field name="code">652</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a653">
+        <record id="a653" model="account.account">
             <field name="name">Charges d'escompte de créances</field>
             <field name="code">653</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a654">
+        <record id="a654" model="account.account">
             <field name="name">Différences de change</field>
             <field name="code">654</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a655">
+        <record id="a655" model="account.account">
             <field name="name">Ecarts de conversion des devises</field>
             <field name="code">655</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a656">
+        <record id="a656" model="account.account">
             <field name="name">Frais de banques, de chèques postaux</field>
             <field name="code">656</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a657">
+        <record id="a657" model="account.account">
             <field name="name">Commissions sur ouvertures de crédit, cautions, avals</field>
             <field name="code">657</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a658">
+        <record id="a658" model="account.account">
             <field name="name">Frais de vente des titres</field>
             <field name="code">658</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a65])]"/>
+            <field eval="[(6,0,[a65])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a66">
+        <record id="a66" model="account.account">
             <field name="name">CHARGES EXCEPTIONNELLES</field>
             <field name="code">66</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a660">
+        <record id="a660" model="account.account">
             <field name="name">Amortissements et réductions de valeur exceptionnels</field>
             <field name="code">660</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a66])]"/>
+            <field eval="[(6,0,[a66])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6600">
+        <record id="a6600" model="account.account">
             <field name="name">Sur frais d'établissement</field>
             <field name="code">6600</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a660])]"/>
+            <field eval="[(6,0,[a660])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6601">
+        <record id="a6601" model="account.account">
             <field name="name">Sur immobilisations incorporelles</field>
             <field name="code">6601</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a660])]"/>
+            <field eval="[(6,0,[a660])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6602">
+        <record id="a6602" model="account.account">
             <field name="name">Sur immobilisations corporelles</field>
             <field name="code">6602</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a660])]"/>
+            <field eval="[(6,0,[a660])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a661">
+        <record id="a661" model="account.account">
             <field name="name">Réductions de valeur sur immobilisations financières</field>
             <field name="code">661</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a66])]"/>
+            <field eval="[(6,0,[a66])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a662">
+        <record id="a662" model="account.account">
             <field name="name">Provisions pour risques et charges exceptionnels</field>
             <field name="code">662</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a66])]"/>
+            <field eval="[(6,0,[a66])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a663">
+        <record id="a663" model="account.account">
             <field name="name">Moins-values sur réalisation d'actifs immobilisés</field>
             <field name="code">663</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a66])]"/>
+            <field eval="[(6,0,[a66])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6630">
+        <record id="a6630" model="account.account">
             <field name="name">Sur immobilisations incorporelles</field>
             <field name="code">6630</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a663])]"/>
+            <field eval="[(6,0,[a663])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6631">
+        <record id="a6631" model="account.account">
             <field name="name">Sur immobilisations corporelles</field>
             <field name="code">6631</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a663])]"/>
+            <field eval="[(6,0,[a663])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6632">
+        <record id="a6632" model="account.account">
             <field name="name">Sur immobilisations détenues en location-financement et droits similaires</field>
             <field name="code">6632</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a663])]"/>
+            <field eval="[(6,0,[a663])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6633">
+        <record id="a6633" model="account.account">
             <field name="name">Sur immobilisations financières</field>
             <field name="code">6633</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a663])]"/>
+            <field eval="[(6,0,[a663])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6634">
+        <record id="a6634" model="account.account">
             <field name="name">Sur immeubles acquis ou construits en vue de la revente</field>
             <field name="code">6634</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a663])]"/>
+            <field eval="[(6,0,[a663])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a668">
+        <record id="a668" model="account.account">
             <field name="name">Autres charges exceptionnelles</field>
             <field name="code">668</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a66])]"/>
+            <field eval="[(6,0,[a66])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a664">
+        <record id="a664" model="account.account">
             <field name="name">Pénalités et amendes diverses</field>
             <field name="code">664</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a66])]"/>
+            <field eval="[(6,0,[a66])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a665">
+        <record id="a665" model="account.account">
             <field name="name">Différence de charge</field>
             <field name="code">665</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a66])]"/>
+            <field eval="[(6,0,[a66])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a669">
+        <record id="a669" model="account.account">
             <field name="name">Charges exceptionnelles transférées à l'actif en frais de restructuration</field>
             <field name="code">669</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a66])]"/>
+            <field eval="[(6,0,[a66])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a67">
+        <record id="a67" model="account.account">
             <field name="name">IMPOTS SUR LE RESULTAT</field>
             <field name="code">67</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a670">
+        <record id="a670" model="account.account">
             <field name="name">Impôts belges sur le résultat de l'exercice</field>
             <field name="code">670</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a67])]"/>
+            <field eval="[(6,0,[a67])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6700">
+        <record id="a6700" model="account.account">
             <field name="name">Impôts et précomptes dus ou versés</field>
             <field name="code">6700</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a670])]"/>
+            <field eval="[(6,0,[a670])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6701">
+        <record id="a6701" model="account.account">
             <field name="name">Excédent de versements d'impôts et précomptes porté à l'actif</field>
             <field name="code">6701</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a670])]"/>
+            <field eval="[(6,0,[a670])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6702">
+        <record id="a6702" model="account.account">
             <field name="name">Charges fiscales estimées</field>
             <field name="code">6702</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a670])]"/>
+            <field eval="[(6,0,[a670])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a671">
+        <record id="a671" model="account.account">
             <field name="name">Impôts belges sur le résultat d'exercices antérieurs</field>
             <field name="code">671</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a67])]"/>
+            <field eval="[(6,0,[a67])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6710">
+        <record id="a6710" model="account.account">
             <field name="name">Suppléments d'impôts dus ou versés</field>
             <field name="code">6710</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a671])]"/>
+            <field eval="[(6,0,[a671])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6711">
+        <record id="a6711" model="account.account">
             <field name="name">Suppléments d'impôts estimés</field>
             <field name="code">6711</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a671])]"/>
+            <field eval="[(6,0,[a671])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a6712">
+        <record id="a6712" model="account.account">
             <field name="name">Provisions fiscales constituées</field>
             <field name="code">6712</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a671])]"/>
+            <field eval="[(6,0,[a671])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a672">
+        <record id="a672" model="account.account">
             <field name="name">Impôts étrangers sur le résultat de l'exercice</field>
             <field name="code">672</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a67])]"/>
+            <field eval="[(6,0,[a67])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a673">
+        <record id="a673" model="account.account">
             <field name="name">Impôts étrangers sur le résultat d'exercices antérieurs</field>
             <field name="code">673</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a67])]"/>
+            <field eval="[(6,0,[a67])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a68">
+        <record id="a68" model="account.account">
             <field name="name">TRANSFERTS AUX RESERVES IMMUNISEES</field>
             <field name="code">68</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a69">
+        <record id="a69" model="account.account">
             <field name="name">AFFECTATION DES RESULTATS</field>
             <field name="code">69</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a6])]"/>
+            <field eval="[(6,0,[a6])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a690">
+        <record id="a690" model="account.account">
             <field name="name">Perte reportée de l'exercice précédent</field>
             <field name="code">690</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a69])]"/>
+            <field eval="[(6,0,[a69])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a691">
+        <record id="a691" model="account.account">
             <field name="name">Dotation à la réserve légale</field>
             <field name="code">691</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a69])]"/>
+            <field eval="[(6,0,[a69])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a692">
+        <record id="a692" model="account.account">
             <field name="name">Dotation aux autres réserves</field>
             <field name="code">692</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a69])]"/>
+            <field eval="[(6,0,[a69])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a693">
+        <record id="a693" model="account.account">
             <field name="name">Bénéfice à reporter</field>
             <field name="code">693</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a69])]"/>
+            <field eval="[(6,0,[a69])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a694">
+        <record id="a694" model="account.account">
             <field name="name">Rémunération du capital</field>
             <field name="code">694</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a69])]"/>
+            <field eval="[(6,0,[a69])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a695">
+        <record id="a695" model="account.account">
             <field name="name">Administrateurs ou gérants</field>
             <field name="code">695</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a69])]"/>
+            <field eval="[(6,0,[a69])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a696">
+        <record id="a696" model="account.account">
             <field name="name">Autres allocataires</field>
             <field name="code">696</field>
             <field name="type">expense</field>
             
-            <field name="parent_id" eval="[(6,0,[a69])]"/>
+            <field eval="[(6,0,[a69])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7">
+        <record id="a7" model="account.account">
             <field name="name">CLASSE 7. - PRODUITS</field>
             <field name="code">7</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a_root])]"/>
+            <field eval="[(6,0,[a_root])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a70">
+        <record id="a70" model="account.account">
             <field name="name">CHIFFRE D'AFFAIRES</field>
             <field name="code">70</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a7])]"/>
+            <field eval="[(6,0,[a7])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a700">
+        <record id="a700" model="account.account">
             <field name="name">Ventes de marchandises</field>
             <field name="code">700</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a70])]"/>
+            <field eval="[(6,0,[a70])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7000">
+        <record id="a7000" model="account.account">
             <field name="name">Ventes en Belgique</field>
             <field name="code">7000</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a700])]"/>
+            <field eval="[(6,0,[a700])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7001">
+        <record id="a7001" model="account.account">
             <field name="name">Ventes dans les pays membres de la C.E.E.</field>
             <field name="code">7001</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a700])]"/>
+            <field eval="[(6,0,[a700])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7002">
+        <record id="a7002" model="account.account">
             <field name="name">Ventes à l'exportation</field>
             <field name="code">7002</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a700])]"/>
+            <field eval="[(6,0,[a700])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a701">
+        <record id="a701" model="account.account">
             <field name="name">Ventes de produits finis</field>
             <field name="code">701</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a70])]"/>
+            <field eval="[(6,0,[a70])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a_sale">
+        <record id="a_sale" model="account.account">
             <field name="name">Ventes en Belgique</field>
             <field name="code">7010</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a701])]"/>
+            <field eval="[(6,0,[a701])]" name="parent_id"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_income_categ">
-            <field name="value" eval="'account.account,'+str(a_sale)"/>
+        <record id="account.property_account_income_categ" model="ir.property">
+            <field eval="'account.account,'+str(a_sale)" name="value"/>
         </record>
         
-        <record model="account.account" id="a7011">
+        <record id="a7011" model="account.account">
             <field name="name">Ventes dans les pays membres de la C.E.E.</field>
             <field name="code">7011</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a701])]"/>
+            <field eval="[(6,0,[a701])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7012">
+        <record id="a7012" model="account.account">
             <field name="name">Ventes à l'exportation</field>
             <field name="code">7012</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a701])]"/>
+            <field eval="[(6,0,[a701])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a702">
+        <record id="a702" model="account.account">
             <field name="name">Ventes de déchets et rebuts</field>
             <field name="code">702</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a70])]"/>
+            <field eval="[(6,0,[a70])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7020">
+        <record id="a7020" model="account.account">
             <field name="name">Ventes en Belgique</field>
             <field name="code">7020</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a702])]"/>
+            <field eval="[(6,0,[a702])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7021">
+        <record id="a7021" model="account.account">
             <field name="name">Ventes dans les pays membres de la C.E.E.</field>
             <field name="code">7021</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a702])]"/>
+            <field eval="[(6,0,[a702])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7022">
+        <record id="a7022" model="account.account">
             <field name="name">Ventes à l'exportation</field>
             <field name="code">7022</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a702])]"/>
+            <field eval="[(6,0,[a702])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a703">
+        <record id="a703" model="account.account">
             <field name="name">Ventes d'emballages récupérables</field>
             <field name="code">703</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a70])]"/>
+            <field eval="[(6,0,[a70])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a704">
+        <record id="a704" model="account.account">
             <field name="name">Facturations des travaux en cours</field>
             <field name="code">704</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a70])]"/>
+            <field eval="[(6,0,[a70])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a705">
+        <record id="a705" model="account.account">
             <field name="name">Prestations de services</field>
             <field name="code">705</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a70])]"/>
+            <field eval="[(6,0,[a70])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7050">
+        <record id="a7050" model="account.account">
             <field name="name">Prestations de services en Belgique</field>
             <field name="code">7050</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a705])]"/>
+            <field eval="[(6,0,[a705])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7051">
+        <record id="a7051" model="account.account">
             <field name="name">Prestations de services dans les pays membres de la C.E.E.</field>
             <field name="code">7051</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a705])]"/>
+            <field eval="[(6,0,[a705])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7052">
+        <record id="a7052" model="account.account">
             <field name="name">Prestations de services en vue de l'exportation</field>
             <field name="code">7052</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a705])]"/>
+            <field eval="[(6,0,[a705])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a706">
+        <record id="a706" model="account.account">
             <field name="name">Pénalités et dédits obtenus par l'entreprise</field>
             <field name="code">706</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a70])]"/>
+            <field eval="[(6,0,[a70])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a708">
+        <record id="a708" model="account.account">
             <field name="name">Remises, ristournes et rabais accordés</field>
             <field name="code">708</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a70])]"/>
+            <field eval="[(6,0,[a70])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7080">
+        <record id="a7080" model="account.account">
             <field name="name">Sur ventes de marchandises</field>
             <field name="code">7080</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a708])]"/>
+            <field eval="[(6,0,[a708])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7081">
+        <record id="a7081" model="account.account">
             <field name="name">Sur ventes de produits finis</field>
             <field name="code">7081</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a708])]"/>
+            <field eval="[(6,0,[a708])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7082">
+        <record id="a7082" model="account.account">
             <field name="name">Sur ventes de déchets et rebuts</field>
             <field name="code">7082</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a708])]"/>
+            <field eval="[(6,0,[a708])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7083">
+        <record id="a7083" model="account.account">
             <field name="name">Sur prestations de services</field>
             <field name="code">7083</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a708])]"/>
+            <field eval="[(6,0,[a708])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7084">
+        <record id="a7084" model="account.account">
             <field name="name">Mali sur travaux facturés aux associations momentanées</field>
             <field name="code">7084</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a708])]"/>
+            <field eval="[(6,0,[a708])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a71">
+        <record id="a71" model="account.account">
             <field name="name">VARIATION DES STOCKS ET DES COMMANDES EN COURS D'EXECUTION</field>
             <field name="code">71</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a7])]"/>
+            <field eval="[(6,0,[a7])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a712">
+        <record id="a712" model="account.account">
             <field name="name">Des en cours de fabrication</field>
             <field name="code">712</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a71])]"/>
+            <field eval="[(6,0,[a71])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a713">
+        <record id="a713" model="account.account">
             <field name="name">Des produits finis</field>
             <field name="code">713</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a71])]"/>
+            <field eval="[(6,0,[a71])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a715">
+        <record id="a715" model="account.account">
             <field name="name">Des immeubles construits destinés à la vente</field>
             <field name="code">715</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a71])]"/>
+            <field eval="[(6,0,[a71])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a717">
+        <record id="a717" model="account.account">
             <field name="name">Des commandes en cours d'exécution</field>
             <field name="code">717</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a71])]"/>
+            <field eval="[(6,0,[a71])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7170">
+        <record id="a7170" model="account.account">
             <field name="name">Commandes en cours - Coût de revient</field>
             <field name="code">7170</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a717])]"/>
+            <field eval="[(6,0,[a717])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a71700">
+        <record id="a71700" model="account.account">
             <field name="name">Coût des commandes en cours d'exécution</field>
             <field name="code">71700</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a7170])]"/>
+            <field eval="[(6,0,[a7170])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a71701">
+        <record id="a71701" model="account.account">
             <field name="name">Coût des travaux en cours des associations momentanées</field>
             <field name="code">71701</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a7170])]"/>
+            <field eval="[(6,0,[a7170])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7171">
+        <record id="a7171" model="account.account">
             <field name="name">Bénéfices portés en compte sur commandes en cours</field>
             <field name="code">7171</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a717])]"/>
+            <field eval="[(6,0,[a717])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a71710">
+        <record id="a71710" model="account.account">
             <field name="name">Sur commandes en cours d'exécution</field>
             <field name="code">71710</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a7171])]"/>
+            <field eval="[(6,0,[a7171])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a71711">
+        <record id="a71711" model="account.account">
             <field name="name">Sur travaux en cours des associations momentanées</field>
             <field name="code">71711</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a7171])]"/>
+            <field eval="[(6,0,[a7171])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a72">
+        <record id="a72" model="account.account">
             <field name="name">PRODUCTION IMMOBILISEE</field>
             <field name="code">72</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a7])]"/>
+            <field eval="[(6,0,[a7])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a720">
+        <record id="a720" model="account.account">
             <field name="name">En frais d'établissement</field>
             <field name="code">720</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a72])]"/>
+            <field eval="[(6,0,[a72])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a721">
+        <record id="a721" model="account.account">
             <field name="name">En immobilisations incorporelles</field>
             <field name="code">721</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a72])]"/>
+            <field eval="[(6,0,[a72])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a722">
+        <record id="a722" model="account.account">
             <field name="name">En immobilisations corporelles</field>
             <field name="code">722</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a72])]"/>
+            <field eval="[(6,0,[a72])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a723">
+        <record id="a723" model="account.account">
             <field name="name">En immobilisations en cours</field>
             <field name="code">723</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a72])]"/>
+            <field eval="[(6,0,[a72])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a74">
+        <record id="a74" model="account.account">
             <field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
             <field name="code">74</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a7])]"/>
+            <field eval="[(6,0,[a7])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a740">
+        <record id="a740" model="account.account">
             <field name="name">Subsides d'exploitation et montants compensatoires</field>
             <field name="code">740</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a741">
+        <record id="a741" model="account.account">
             <field name="name">Plus-values sur réalisations courantes d'immobilisations corporelles</field>
             <field name="code">741</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a742">
+        <record id="a742" model="account.account">
             <field name="name">Plus-values sur réalisations de créances commerciales</field>
             <field name="code">742</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a743">
+        <record id="a743" model="account.account">
             <field name="name">Produits de services exploités dans l'intérêt du personnel</field>
             <field name="code">743</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a744">
+        <record id="a744" model="account.account">
             <field name="name">Commissions et courtages</field>
             <field name="code">744</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a745">
+        <record id="a745" model="account.account">
             <field name="name">Redevances pour brevets et licences</field>
             <field name="code">745</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a746">
+        <record id="a746" model="account.account">
             <field name="name">Prestations de services</field>
             <field name="code">746</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a747">
+        <record id="a747" model="account.account">
             <field name="name">Revenus des immeubles affectés aux activités non professionnelles</field>
             <field name="code">747</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a748">
+        <record id="a748" model="account.account">
             <field name="name">Locations diverses à caractère professionnel</field>
             <field name="code">748</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a749">
+        <record id="a749" model="account.account">
             <field name="name">Produits divers</field>
             <field name="code">749</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a74])]"/>
+            <field eval="[(6,0,[a74])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7490">
+        <record id="a7490" model="account.account">
             <field name="name">Bonis sur reprises d'emballages consignés</field>
             <field name="code">7490</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a749])]"/>
+            <field eval="[(6,0,[a749])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7491">
+        <record id="a7491" model="account.account">
             <field name="name">Bonis sur travaux en associations momentanées</field>
             <field name="code">7491</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a749])]"/>
+            <field eval="[(6,0,[a749])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a75">
+        <record id="a75" model="account.account">
             <field name="name">PRODUITS FINANCIERS</field>
             <field name="code">75</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a7])]"/>
+            <field eval="[(6,0,[a7])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a750">
+        <record id="a750" model="account.account">
             <field name="name">Produits des immobilisations financières</field>
             <field name="code">750</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a75])]"/>
+            <field eval="[(6,0,[a75])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7500">
+        <record id="a7500" model="account.account">
             <field name="name">Revenus des actions</field>
             <field name="code">7500</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a750])]"/>
+            <field eval="[(6,0,[a750])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7501">
+        <record id="a7501" model="account.account">
             <field name="name">Revenus des obligations</field>
             <field name="code">7501</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a750])]"/>
+            <field eval="[(6,0,[a750])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7502">
+        <record id="a7502" model="account.account">
             <field name="name">Revenus des créances à plus d'un an</field>
             <field name="code">7502</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a750])]"/>
+            <field eval="[(6,0,[a750])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a751">
+        <record id="a751" model="account.account">
             <field name="name">Produits des actifs circulants</field>
             <field name="code">751</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a75])]"/>
+            <field eval="[(6,0,[a75])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a752">
+        <record id="a752" model="account.account">
             <field name="name">Plus-values sur réalisations d'actifs circulants</field>
             <field name="code">752</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a75])]"/>
+            <field eval="[(6,0,[a75])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a753">
+        <record id="a753" model="account.account">
             <field name="name">Subsides en capital et en intérêts</field>
             <field name="code">753</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a75])]"/>
+            <field eval="[(6,0,[a75])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a754">
+        <record id="a754" model="account.account">
             <field name="name">Différences de change</field>
             <field name="code">754</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a75])]"/>
+            <field eval="[(6,0,[a75])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a755">
+        <record id="a755" model="account.account">
             <field name="name">Ecarts de conversion des devises</field>
             <field name="code">755</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a75])]"/>
+            <field eval="[(6,0,[a75])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a756">
+        <record id="a756" model="account.account">
             <field name="name">Produits des autres créances</field>
             <field name="code">756</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a75])]"/>
+            <field eval="[(6,0,[a75])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a757">
+        <record id="a757" model="account.account">
             <field name="name">Escomptes obtenus</field>
             <field name="code">757</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a75])]"/>
+            <field eval="[(6,0,[a75])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a76">
+        <record id="a76" model="account.account">
             <field name="name">PRODUITS EXCEPTIONNELS</field>
             <field name="code">76</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a7])]"/>
+            <field eval="[(6,0,[a7])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a760">
+        <record id="a760" model="account.account">
             <field name="name">Reprises d'amortissements et de réductions de valeur</field>
             <field name="code">760</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a76])]"/>
+            <field eval="[(6,0,[a76])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7600">
+        <record id="a7600" model="account.account">
             <field name="name">Sur immobilisations incorporelles</field>
             <field name="code">7600</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a760])]"/>
+            <field eval="[(6,0,[a760])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7601">
+        <record id="a7601" model="account.account">
             <field name="name">Sur immobilisations corporelles</field>
             <field name="code">7601</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a760])]"/>
+            <field eval="[(6,0,[a760])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a761">
+        <record id="a761" model="account.account">
             <field name="name">Reprises de réductions de valeur sur immobilisations financières</field>
             <field name="code">761</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a76])]"/>
+            <field eval="[(6,0,[a76])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a762">
+        <record id="a762" model="account.account">
             <field name="name">Reprises de provisions pour risques et charges exceptionnelles</field>
             <field name="code">762</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a76])]"/>
+            <field eval="[(6,0,[a76])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a763">
+        <record id="a763" model="account.account">
             <field name="name">Plus-values sur réalisation d'actifs immobilisés</field>
             <field name="code">763</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a76])]"/>
+            <field eval="[(6,0,[a76])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7630">
+        <record id="a7630" model="account.account">
             <field name="name">Sur immobilisations incorporelles</field>
             <field name="code">7630</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a763])]"/>
+            <field eval="[(6,0,[a763])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7631">
+        <record id="a7631" model="account.account">
             <field name="name">Sur immobilisations corporelles</field>
             <field name="code">7631</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a763])]"/>
+            <field eval="[(6,0,[a763])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7632">
+        <record id="a7632" model="account.account">
             <field name="name">Sur immobilisations financières</field>
             <field name="code">7632</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a763])]"/>
+            <field eval="[(6,0,[a763])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a764">
+        <record id="a764" model="account.account">
             <field name="name">Autres produits exceptionnels</field>
             <field name="code">764</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a76])]"/>
+            <field eval="[(6,0,[a76])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a77">
+        <record id="a77" model="account.account">
             <field name="name">REGULARISATIONS D'IMPOTS ET REPRISES DE PROVISIONS FISCALES</field>
             <field name="code">77</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a7])]"/>
+            <field eval="[(6,0,[a7])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a771">
+        <record id="a771" model="account.account">
             <field name="name">Impôts belges sur le résultat</field>
             <field name="code">771</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a77])]"/>
+            <field eval="[(6,0,[a77])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7710">
+        <record id="a7710" model="account.account">
             <field name="name">Régularisations d'impôts dus ou versés</field>
             <field name="code">7710</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a771])]"/>
+            <field eval="[(6,0,[a771])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7711">
+        <record id="a7711" model="account.account">
             <field name="name">Régularisations d'impôts estimés</field>
             <field name="code">7711</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a771])]"/>
+            <field eval="[(6,0,[a771])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a7712">
+        <record id="a7712" model="account.account">
             <field name="name">Reprises de provisions fiscales</field>
             <field name="code">7712</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a771])]"/>
+            <field eval="[(6,0,[a771])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a773">
+        <record id="a773" model="account.account">
             <field name="name">Impôts étrangers sur le résultat</field>
             <field name="code">773</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a77])]"/>
+            <field eval="[(6,0,[a77])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a79">
+        <record id="a79" model="account.account">
             <field name="name">AFFECTATION AUX RESULTATS</field>
             <field name="code">79</field>
             <field name="type">view</field>
             
-            <field name="parent_id" eval="[(6,0,[a7])]"/>
+            <field eval="[(6,0,[a7])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a790">
+        <record id="a790" model="account.account">
             <field name="name">Bénéfice reporté de l'exercice précédent</field>
             <field name="code">790</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a79])]"/>
+            <field eval="[(6,0,[a79])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a791">
+        <record id="a791" model="account.account">
             <field name="name">Prélèvement sur le capital et les primes d'émission</field>
             <field name="code">791</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a79])]"/>
+            <field eval="[(6,0,[a79])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a792">
+        <record id="a792" model="account.account">
             <field name="name">Prélèvement sur les réserves</field>
             <field name="code">792</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a79])]"/>
+            <field eval="[(6,0,[a79])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a793">
+        <record id="a793" model="account.account">
             <field name="name">Perte à reporter</field>
             <field name="code">793</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a79])]"/>
+            <field eval="[(6,0,[a79])]" name="parent_id"/>
         </record>
-        <record model="account.account" id="a794">
+        <record id="a794" model="account.account">
             <field name="name">Intervention d'associés</field>
             <field name="code">794</field>
             <field name="type">income</field>
             
-            <field name="parent_id" eval="[(6,0,[a79])]"/>
+            <field eval="[(6,0,[a79])]" name="parent_id"/>
         </record>
         
         <!-- Tax Code Configuration -->
-        <record model="account.tax.code" id="vat_code_op_base">
+        <record id="vat_code_op_base" model="account.tax.code">
             <field name="name">I. Valeur des operations</field>
         </record>
         
-        <record model="account.tax.code" id="vat_code_out">
+        <record id="vat_code_out" model="account.tax.code">
             <field name="name">II. Operations a la sortie</field>
             <field name="parent_id" ref="vat_code_op_base"/>
         </record>
         
-        <record model="account.tax.code" id="vat_code_a00">
+        <record id="vat_code_a00" model="account.tax.code">
             <field name="code">00</field>
             <field name="parent_id" ref="vat_code_out"/>
             <field name="name">Operations soumises a un regime particulier</field>
         </record>
-        <record model="account.tax.code" id="vat_code_a01">
+        <record id="vat_code_a01" model="account.tax.code">
             <field name="code">01</field>
             <field name="parent_id" ref="vat_code_out"/>
             <field name="name">Operations avec TVA a 6%</field>
         </record>
-        <record model="account.tax.code" id="vat_code_a02">
+        <record id="vat_code_a02" model="account.tax.code">
             <field name="code">02</field>
             <field name="parent_id" ref="vat_code_out"/>
             <field name="name">Operations avec TVA a 12%</field>
         </record>
-        <record model="account.tax.code" id="vat_code_a03">
+        <record id="vat_code_a03" model="account.tax.code">
             <field name="code">03</field>
             <field name="parent_id" ref="vat_code_out"/>
             <field name="name">Operations avec TVA a 21%</field>
         </record>
         
-        <record model="account.tax.code" id="vat_code_a45">
+        <record id="vat_code_a45" model="account.tax.code">
             <field name="code">45</field>
             <field name="name">Operations avec TVA due par le concotractant</field>
             <field name="parent_id" ref="vat_code_out"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a46">
+        <record id="vat_code_a46" model="account.tax.code">
             <field name="code">46</field>
             <field name="name">Livraisons intra-communautaire exemptees</field>
             <field name="parent_id" ref="vat_code_out"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a47">
+        <record id="vat_code_a47" model="account.tax.code">
             <field name="code">47</field>
             <field name="name">Autres operations exemptees</field>
             <field name="parent_id" ref="vat_code_out"/>
         </record>
         
-        <record model="account.tax.code" id="vat_code_a4X">
+        <record id="vat_code_a4X" model="account.tax.code">
             <field name="name">Notes de credit et corrections negatives</field>
             <field name="parent_id" ref="vat_code_out"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a48">
+        <record id="vat_code_a48" model="account.tax.code">
             <field name="name">Notes de credit aux operations grille 46</field>
             <field name="code">48</field>
-            <field name="sign" eval="-1"/>
+            <field eval="-1" name="sign"/>
             <field name="parent_id" ref="vat_code_a4X"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a49">
+        <record id="vat_code_a49" model="account.tax.code">
             <field name="name">Notes de credit aux operations du point II</field>
             <field name="code">49</field>
-            <field name="sign" eval="-1"/>
+            <field eval="-1" name="sign"/>
             <field name="parent_id" ref="vat_code_a4X"/>
         </record>
         
@@ -6451,51 +6451,51 @@
         
         
         
-        <record model="account.tax.code" id="vat_code_autres">
+        <record id="vat_code_autres" model="account.tax.code">
             <field name="name">Autres</field>
         </record>
-        <record model="account.tax.code" id="vat_code_autres_period">
+        <record id="vat_code_autres_period" model="account.tax.code">
             <field name="name">TVA due pour la période du 1er au 20 décembre</field>
             <field name="code">91</field>
             <field name="parent_id" ref="vat_code_autres"/>
         </record>
         
-        <record model="account.tax.code" id="vat_code_tax_balance">
+        <record id="vat_code_tax_balance" model="account.tax.code">
             <field name="name">V. Solde des taxes dues a l'Etat</field>
             <field name="code">71-72</field>
         </record>
-        <record model="account.tax.code" id="vat_code_tax_out">
+        <record id="vat_code_tax_out" model="account.tax.code">
             <field name="name">IV. Taxes dues</field>
             <field name="code">xx</field>
             <field name="parent_id" ref="vat_code_tax_balance"/>
         </record>
         
-        <record model="account.tax.code" id="vat_code_a54">
+        <record id="vat_code_a54" model="account.tax.code">
             <field name="code">54</field>
             <field name="name">TVA sur operations des grilles 01,02,03</field>
             <field name="parent_id" ref="vat_code_tax_out"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a55">
+        <record id="vat_code_a55" model="account.tax.code">
             <field name="code">55</field>
             <field name="name">TVA sur operations des grilles 86</field>
             <field name="parent_id" ref="vat_code_tax_out"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a56">
+        <record id="vat_code_a56" model="account.tax.code">
             <field name="code">56</field>
             <field name="name">TVA sur operations des grilles 87</field>
             <field name="parent_id" ref="vat_code_tax_out"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a57">
+        <record id="vat_code_a57" model="account.tax.code">
             <field name="code">57</field>
             <field name="name">TVA relatives aux importations</field>
             <field name="parent_id" ref="vat_code_tax_out"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a61">
+        <record id="vat_code_a61" model="account.tax.code">
             <field name="code">61</field>
             <field name="name">Diverses regularisations en faveur de l'Etat</field>
             <field name="parent_id" ref="vat_code_tax_out"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a63">
+        <record id="vat_code_a63" model="account.tax.code">
             <field name="code">63</field>
             <field name="name">TVA a reverser sur notes de credit recues</field>
             <field name="parent_id" ref="vat_code_tax_out"/>
@@ -6505,73 +6505,73 @@
         
         
         
-        <record model="account.tax.code" id="vat_code_tax_in">
+        <record id="vat_code_tax_in" model="account.tax.code">
             <field name="name">V. Taxes deductibles</field>
             <field name="code">yy</field>
-            <field name="sign" eval="-1"/>
+            <field eval="-1" name="sign"/>
             <field name="parent_id" ref="vat_code_tax_balance"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a59">
+        <record id="vat_code_a59" model="account.tax.code">
             <field name="code">59</field>
             <field name="name">T.V.A. deductible</field>
             <field name="parent_id" ref="vat_code_tax_in"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a62">
+        <record id="vat_code_a62" model="account.tax.code">
             <field name="code">62</field>
             <field name="name">Regularisations TVA en faveur du declarant</field>
             <field name="parent_id" ref="vat_code_tax_in"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a64">
+        <record id="vat_code_a64" model="account.tax.code">
             <field name="code">64</field>
             <field name="name">TVA a recuperer sur notes de credit delivrees</field>
             <field name="parent_id" ref="vat_code_tax_in"/>
         </record>
         
-        <record model="account.tax.code" id="vat_code_in">
+        <record id="vat_code_in" model="account.tax.code">
             <field name="name">III. Operations a l'entree</field>
-            <field name="sign" eval="-1"/>
+            <field eval="-1" name="sign"/>
             <field name="parent_id" ref="vat_code_op_base"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a81">
+        <record id="vat_code_a81" model="account.tax.code">
             <field name="code">81</field>
             <field name="name">Marchandises, matieres premieres et auxiliaires</field>
             <field name="parent_id" ref="vat_code_in"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a82">
+        <record id="vat_code_a82" model="account.tax.code">
             <field name="code">82</field>
             <field name="name">Services et biens divers</field>
             <field name="parent_id" ref="vat_code_in"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a83">
+        <record id="vat_code_a83" model="account.tax.code">
             <field name="code">83</field>
             <field name="name">Biens d'investissement</field>
             <field name="parent_id" ref="vat_code_in"/>
         </record>
         
-        <record model="account.tax.code" id="vat_code_in_nc">
-            <field name="code"></field>
+        <record id="vat_code_in_nc" model="account.tax.code">
+            <field name="code"/>
             <field name="name">Notes de credits</field>
             <field name="parent_id" ref="vat_code_in"/>
         </record>
         
-        <record model="account.tax.code" id="vat_code_a84">
+        <record id="vat_code_a84" model="account.tax.code">
             <field name="code">84</field>
-            <field name="sign" eval="-1"/>
+            <field eval="-1" name="sign"/>
             <field name="name">Notes de credits sur operations case 86</field>
             <field name="parent_id" ref="vat_code_in_nc"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a85">
+        <record id="vat_code_a85" model="account.tax.code">
             <field name="code">85</field>
-            <field name="sign" eval="-1"/>
+            <field eval="-1" name="sign"/>
             <field name="name">Notes de credits autres operations</field>
             <field name="parent_id" ref="vat_code_in_nc"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a86">
+        <record id="vat_code_a86" model="account.tax.code">
             <field name="code">86</field>
             <field name="name">Acquisition intra-communautaires et ventes ABC</field>
             <field name="parent_id" ref="vat_code_in"/>
         </record>
-        <record model="account.tax.code" id="vat_code_a87">
+        <record id="vat_code_a87" model="account.tax.code">
             <field name="code">87</field>
             <field name="name">Autres operations</field>
             <field name="parent_id" ref="vat_code_in"/>
@@ -6579,9 +6579,9 @@
         
         
         <!-- TVA - Taxe sur la Valeur Ajoutée -->
-        <record model="account.tax" id="vat_6">
+        <record id="vat_6" model="account.tax">
             <field name="name">VAT 6% - Ventes</field>
-            <field name="amount" eval="0.06"/>
+            <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable06"/>
             <field name="account_paid_id" ref="vat_refund06"/>
@@ -6592,34 +6592,34 @@
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
         </record>
         
-        <record model="account.tax" id="vat_6_buy">
+        <record id="vat_6_buy" model="account.tax">
             <field name="name">VAT 6% - Achats</field>
-            <field name="amount" eval="0.06"/>
+            <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_refund06"/>
             <field name="account_paid_id" ref="vat_payable06"/>
             
         </record>
         
-        <record model="account.tax" id="vat_12">
+        <record id="vat_12" model="account.tax">
             <field name="name">VAT 12% - Ventes</field>
-            <field name="amount" eval="0.12"/>
+            <field eval="0.12" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable12"/>
             <field name="account_paid_id" ref="vat_refund12"/>
         </record>
         
-        <record model="account.tax" id="vat_12_buy">
+        <record id="vat_12_buy" model="account.tax">
             <field name="name">VAT 12% - Achats</field>
-            <field name="amount" eval="0.12"/>
+            <field eval="0.12" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_refund12"/>
             <field name="account_paid_id" ref="vat_payable12"/>
         </record>
         
-        <record model="account.tax" id="vat_21">
+        <record id="vat_21" model="account.tax">
             <field name="name">VAT 21% - Ventes</field>
-            <field name="amount" eval="0.21"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable21"/>
             <field name="account_paid_id" ref="vat_refund21"/>
@@ -6628,16 +6628,16 @@
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
         </record>
-        <record model="account.tax" id="vat_21_buy">
+        <record id="vat_21_buy" model="account.tax">
             <field name="name">VAT 21% - Achats</field>
-            <field name="amount" eval="1.0"/>
+            <field eval="1.0" name="amount"/>
             <field name="type">percent</field>
-            <field name="child_depend" eval="1"/>
+            <field eval="1" name="child_depend"/>
         </record>
-        <record model="account.tax" id="vat_21_buy_1">
+        <record id="vat_21_buy_1" model="account.tax">
             <field name="parent_id" ref="vat_21_buy"/>
             <field name="name">VAT 21% - Achats</field>
-            <field name="amount" eval="0.21"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_refund21"/>
             <field name="account_paid_id" ref="vat_payable21"/>
@@ -6646,139 +6646,139 @@
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
         </record>
-        <record model="account.tax" id="vat_21_buy_2">
+        <record id="vat_21_buy_2" model="account.tax">
             <field name="parent_id" ref="vat_21_buy"/>
             <field name="name">VAT 21% - Achats</field>
-            <field name="amount" eval="0.0"/>
+            <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
-            <field name="ref_base_sign" eval="-1"/>
+            <field eval="-1" name="ref_base_sign"/>
         </record>
         
-        <record model="account.tax" id="vat_0">
+        <record id="vat_0" model="account.tax">
             <field name="name">VAT 0%</field>
-            <field name="amount" eval="0.00"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
         </record>
         
-        <record model="account.tax" id="vat_CO">
+        <record id="vat_CO" model="account.tax">
             <field name="name">VAT 0% Cocontractants</field>
-            <field name="amount" eval="0.21"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
-            <field name="base_code_id" eval="vat_code_a82"/>
-            <field name="ref_base_code_id" eval="vat_code_a82"/>
-            <field name="child_depend" eval="True"/>
+            <field eval="vat_code_a82" name="base_code_id"/>
+            <field eval="vat_code_a82" name="ref_base_code_id"/>
+            <field eval="True" name="child_depend"/>
         </record>
-        <record model="account.tax" id="vat_CO_0">
+        <record id="vat_CO_0" model="account.tax">
             <field name="name">VAT 0% Cocontractants</field>
-            <field name="amount" eval="1.00"/>
+            <field eval="1.00" name="amount"/>
             <field name="type">percent</field>
-            <field name="parent_id" eval="vat_CO"/>
+            <field eval="vat_CO" name="parent_id"/>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
-            <field name="tax_code_id" eval="vat_code_a59"/>
-            <field name="ref_tax_code_id" eval="vat_code_a59"/>
+            <field eval="vat_code_a59" name="tax_code_id"/>
+            <field eval="vat_code_a59" name="ref_tax_code_id"/>
         </record>
-        <record model="account.tax" id="vat_CO_1">
+        <record id="vat_CO_1" model="account.tax">
             <field name="name">VAT 0% Cocontractants</field>
-            <field name="amount" eval="-1.00"/>
+            <field eval="-1.00" name="amount"/>
             <field name="type">percent</field>
-            <field name="parent_id" eval="vat_CO"/>
+            <field eval="vat_CO" name="parent_id"/>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
-            <field name="tax_code_id" eval="vat_code_a56"/>
-            <field name="ref_tax_code_id" eval="vat_code_a56"/>
+            <field eval="vat_code_a56" name="tax_code_id"/>
+            <field eval="vat_code_a56" name="ref_tax_code_id"/>
         </record>
         
-        <record model="account.tax" id="vat_Ex">
+        <record id="vat_Ex" model="account.tax">
             <field name="name">VAT - Exonéré</field>
-            <field name="amount" eval="0.00"/>
+            <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
         </record>
         
-        <record model="account.tax" id="vat_I0">
+        <record id="vat_I0" model="account.tax">
             <field name="name">VAT 0% Intracommunautaire</field>
-            <field name="amount" eval="0.21"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="child_depend" eval="True"/>
-            <field name="base_code_id" eval="vat_code_a81"/>
-            <field name="ref_base_code_id" eval="vat_code_a81"/>
+            <field eval="True" name="child_depend"/>
+            <field eval="vat_code_a81" name="base_code_id"/>
+            <field eval="vat_code_a81" name="ref_base_code_id"/>
             <!--
 				<field name="account_collected_id" ref="vat_payable0"/>
 				<field name="account_paid_id" ref="vat_refund0"/>
 			-->
         </record>
-        <record model="account.tax" id="vat_I0_1">
+        <record id="vat_I0_1" model="account.tax">
             <field name="name">VAT 0% Intracommunautaire</field>
-            <field name="amount" eval="1.00"/>
+            <field eval="1.00" name="amount"/>
             <field name="type">percent</field>
             <field name="parent_id" ref="vat_I0"/>
             <field name="account_collected_id" ref="vat_refund0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
-            <field name="tax_code_id" eval="vat_code_a59"/>
-            <field name="ref_tax_code_id" eval="vat_code_a59"/>
+            <field eval="vat_code_a59" name="tax_code_id"/>
+            <field eval="vat_code_a59" name="ref_tax_code_id"/>
         </record>
-        <record model="account.tax" id="vat_I0_2">
+        <record id="vat_I0_2" model="account.tax">
             <field name="name">VAT 0% Intracommunautaire</field>
-            <field name="amount" eval="-1.00"/>
+            <field eval="-1.00" name="amount"/>
             <field name="type">percent</field>
             <field name="parent_id" ref="vat_I0"/>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_payable0"/>
-            <field name="tax_code_id" eval="vat_code_a55"/>
-            <field name="ref_tax_code_id" eval="vat_code_a55"/>
+            <field eval="vat_code_a55" name="tax_code_id"/>
+            <field eval="vat_code_a55" name="ref_tax_code_id"/>
         </record>
         
-        <record model="account.tax" id="vat_XO">
+        <record id="vat_XO" model="account.tax">
             <field name="name">VAT 0% Exportations</field>
-            <field name="amount" eval="0.21"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
-            <field name="child_depend" eval="True"/>
+            <field eval="True" name="child_depend"/>
         </record>
-        <record model="account.tax" id="vat_XO_1">
+        <record id="vat_XO_1" model="account.tax">
             <field name="name">VAT 0% Exportations</field>
-            <field name="amount" eval="1.00"/>
+            <field eval="1.00" name="amount"/>
             <field name="type">percent</field>
             <field name="parent_id" ref="vat_XO"/>
             <field name="account_collected_id" ref="vat_refund0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
-            <field name="tax_code_id" eval="vat_code_a59"/>
-            <field name="ref_tax_code_id" eval="vat_code_a59"/>
+            <field eval="vat_code_a59" name="tax_code_id"/>
+            <field eval="vat_code_a59" name="ref_tax_code_id"/>
         </record>
-        <record model="account.tax" id="vat_XO_2">
+        <record id="vat_XO_2" model="account.tax">
             <field name="name">VAT 0% Exportations</field>
-            <field name="amount" eval="-1.00"/>
+            <field eval="-1.00" name="amount"/>
             <field name="type">percent</field>
             <field name="parent_id" ref="vat_XO"/>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_payable0"/>
-            <field name="tax_code_id" eval="vat_code_a57"/>
-            <field name="ref_tax_code_id" eval="vat_code_a57"/>
+            <field eval="vat_code_a57" name="tax_code_id"/>
+            <field eval="vat_code_a57" name="ref_tax_code_id"/>
         </record>
         
         
-        <record model="account.journal" id="account.sales_journal">
+        <record id="account.sales_journal" model="account.journal">
             <field name="default_credit_account_id" ref="a_recv"/>
             <field name="default_debit_account_id" ref="a_recv"/>
         </record>
         
-        <record model="account.journal" id="account.expenses_journal">
+        <record id="account.expenses_journal" model="account.journal">
             <field name="default_credit_account_id" ref="a_pay"/>
             <field name="default_debit_account_id" ref="a_pay"/>
         </record>
         
-        <record model="account.journal" id="account.bank_journal">
+        <record id="account.bank_journal" model="account.journal">
             <field name="default_credit_account_id" ref="cash"/>
             <field name="default_debit_account_id" ref="cash"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index 610111549ac..455509d5947 100755
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -1,7 +1,4 @@
-<?xml version="1.0"?>
-
-
-
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     
     
@@ -22,11 +19,11 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[]" />
+            <field eval="[]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -41,11 +38,11 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('chart0')])]" />
+            <field eval="[(6, 0, [ref('chart0')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -56,11 +53,11 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('bal')])]" />
+            <field eval="[(6, 0, [ref('bal')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -71,11 +68,11 @@
             
             <field name="close_method">balance</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('fas')])]" />
+            <field eval="[(6, 0, [ref('fas')])]" name="parent_id"/>
             
             <field name="type">asset</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -86,11 +83,11 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('bal')])]" />
+            <field eval="[(6, 0, [ref('bal')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -101,52 +98,52 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('nca')])]" />
+            <field eval="[(6, 0, [ref('nca')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
         
         <record id="stk" model="account.account">
             
-            <field name="code"></field>
+            <field name="code"/>
             
             <field name="name">Purchased Stocks</field>
             
             <field name="close_method">unreconciled</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('cas')])]" />
+            <field eval="[(6, 0, [ref('cas')])]" name="parent_id"/>
             
             <field name="type">asset</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
         
         <record id="a_recv" model="account.account">
             
-            <field name="code"></field>
+            <field name="code"/>
             
             <field name="name">Debtors</field>
             
             <field name="close_method">balance</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('cas')])]" />
+            <field eval="[(6, 0, [ref('cas')])]" name="parent_id"/>
             
             <field name="type">receivable</field>
             
-            <field name="sign" eval="1"/>
-            <field name="reconcile" eval="True"/>
+            <field eval="1" name="sign"/>
+            <field eval="True" name="reconcile"/>
             
         </record>
         
-        <record model="ir.property" id="account.property_account_receivable">
+        <record id="account.property_account_receivable" model="ir.property">
             
-            <field name="value" eval="'account.account,'+str(a_recv)"/>
+            <field eval="'account.account,'+str(a_recv)" name="value"/>
             
         </record>
         
@@ -158,11 +155,11 @@
             
             <field name="close_method">balance</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('cas')])]" />
+            <field eval="[(6, 0, [ref('cas')])]" name="parent_id"/>
             
             <field name="type">tax</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -173,28 +170,28 @@
             
             <field name="close_method">balance</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('cas')])]" />
+            <field eval="[(6, 0, [ref('cas')])]" name="parent_id"/>
             
             <field name="type">cash</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
         
         <record id="cash" model="account.account">
             
-            <field name="code"></field>
+            <field name="code"/>
             
             <field name="name">Cash</field>
             
             <field name="close_method">balance</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('cas')])]" />
+            <field eval="[(6, 0, [ref('cas')])]" name="parent_id"/>
             
             <field name="type">cash</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -205,35 +202,35 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('nca')])]" />
+            <field eval="[(6, 0, [ref('nca')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
         
         <record id="a_pay" model="account.account">
             
-            <field name="code"></field>
+            <field name="code"/>
             
             <field name="name">Creditors</field>
             
             <field name="close_method">balance</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('cli')])]" />
+            <field eval="[(6, 0, [ref('cli')])]" name="parent_id"/>
             
             <field name="type">payable</field>
             
-            <field name="sign" eval="1"/>
-            <field name="reconcile" eval="True"/>
+            <field eval="1" name="sign"/>
+            <field eval="True" name="reconcile"/>
             
         </record>
         
-        <record model="ir.property" id="account.property_account_payable">
+        <record id="account.property_account_payable" model="ir.property">
             
-            <field name="value" eval="'account.account,'+str(a_pay)"/>
+            <field eval="'account.account,'+str(a_pay)" name="value"/>
             
         </record>
         
@@ -245,11 +242,11 @@
             
             <field name="close_method">balance</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('cli')])]" />
+            <field eval="[(6, 0, [ref('cli')])]" name="parent_id"/>
             
             <field name="type">tax</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -264,11 +261,11 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('chart0')])]" />
+            <field eval="[(6, 0, [ref('chart0')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -279,33 +276,33 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('gpf')])]" />
+            <field eval="[(6, 0, [ref('gpf')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
         
         <record id="a_sale" model="account.account">
             
-            <field name="code"></field>
+            <field name="code"/>
             
             <field name="name">Product Sales</field>
             
             <field name="close_method">unreconciled</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('rev')])]" />
+            <field eval="[(6, 0, [ref('rev')])]" name="parent_id"/>
             
             <field name="type">income</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_income_categ">
+        <record id="account.property_account_income_categ" model="ir.property">
             
-            <field name="value" eval="'account.account,'+str(a_sale)"/>
+            <field eval="'account.account,'+str(a_sale)" name="value"/>
             
         </record>
         
@@ -317,28 +314,28 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('gpf')])]" />
+            <field eval="[(6, 0, [ref('gpf')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
         
         <record id="cog" model="account.account">
             
-            <field name="code"></field>
+            <field name="code"/>
             
             <field name="name">Cost of Goods Sold</field>
             
             <field name="close_method">unreconciled</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('cos')])]" />
+            <field eval="[(6, 0, [ref('cos')])]" name="parent_id"/>
             
             <field name="type">expense</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
@@ -349,33 +346,33 @@
             
             <field name="close_method">none</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('gpf')])]" />
+            <field eval="[(6, 0, [ref('gpf')])]" name="parent_id"/>
             
             <field name="type">view</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
         
         
         <record id="a_expense" model="account.account">
             
-            <field name="code"></field>
+            <field name="code"/>
             
             <field name="name">Expenses</field>
             
             <field name="close_method">unreconciled</field>
             
-            <field name="parent_id" eval="[(6, 0, [ref('ovr')])]" />
+            <field eval="[(6, 0, [ref('ovr')])]" name="parent_id"/>
             
             <field name="type">expense</field>
             
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_expense_categ">
+        <record id="account.property_account_expense_categ" model="ir.property">
             
-            <field name="value" eval="'account.account,'+str(a_expense)"/>
+            <field eval="'account.account,'+str(a_expense)" name="value"/>
             
         </record>
         
@@ -387,5 +384,4 @@
     
     
     
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/account_tax.xml
index ffb315709ac..eb1902929ea 100755
--- a/addons/l10n_chart_uk_minimal/account_tax.xml
+++ b/addons/l10n_chart_uk_minimal/account_tax.xml
@@ -1,7 +1,4 @@
-<?xml version="1.0"?>
-
-
-
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     
     
@@ -22,7 +19,7 @@
         
         
         
-        <record model="account.tax.code" id="vat_code_balance_net">
+        <record id="vat_code_balance_net" model="account.tax.code">
             
             <field name="name">VAT balance to pay</field>
             
@@ -30,31 +27,31 @@
         
         
         
-        <record model="account.tax.code" id="vat_code_input">
+        <record id="vat_code_input" model="account.tax.code">
             
             <field name="name">Input VAT</field>
             
-            <field name="parent_id" ref="vat_code_balance_net" />
+            <field name="parent_id" ref="vat_code_balance_net"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_input_S">
+        <record id="vat_code_input_S" model="account.tax.code">
             
             <field name="name">Input VAT rate S (17.5%)</field>
             
-            <field name="parent_id" ref="vat_code_input" />
+            <field name="parent_id" ref="vat_code_input"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_input_R">
+        <record id="vat_code_input_R" model="account.tax.code">
             
             <field name="name">Input VAT rate R (5%)</field>
             
-            <field name="parent_id" ref="vat_code_input" />
+            <field name="parent_id" ref="vat_code_input"/>
             
         </record>
         
@@ -64,31 +61,31 @@
         
         
         
-        <record model="account.tax.code" id="vat_code_output">
+        <record id="vat_code_output" model="account.tax.code">
             
             <field name="name">Output VAT</field>
             
-            <field name="parent_id" ref="vat_code_balance_net" />
+            <field name="parent_id" ref="vat_code_balance_net"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_output_S">
+        <record id="vat_code_output_S" model="account.tax.code">
             
             <field name="name">Output VAT rate S (17.5%)</field>
             
-            <field name="parent_id" ref="vat_code_output" />
+            <field name="parent_id" ref="vat_code_output"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_output_R">
+        <record id="vat_code_output_R" model="account.tax.code">
             
             <field name="name">Output VAT rate R (5%)</field>
             
-            <field name="parent_id" ref="vat_code_output" />
+            <field name="parent_id" ref="vat_code_output"/>
             
         </record>
         
@@ -102,7 +99,7 @@
         
         
         
-        <record model="account.tax.code" id="vat_code_base_net">
+        <record id="vat_code_base_net" model="account.tax.code">
             
             <field name="name">Tax bases</field>
             
@@ -110,61 +107,61 @@
         
         
         
-        <record model="account.tax.code" id="vat_code_base_purchases">
+        <record id="vat_code_base_purchases" model="account.tax.code">
             
             <field name="name">Taxable purchases base</field>
             
-            <field name="parent_id" ref="vat_code_base_net" />
+            <field name="parent_id" ref="vat_code_base_net"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_purch_S">
+        <record id="vat_code_purch_S" model="account.tax.code">
             
             <field name="name">Taxable purchases rated S (17.5%)</field>
             
-            <field name="parent_id" ref="vat_code_base_purchases" />
+            <field name="parent_id" ref="vat_code_base_purchases"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_purch_R">
+        <record id="vat_code_purch_R" model="account.tax.code">
             
             <field name="name">Taxable purchases rated R (5%)</field>
             
-            <field name="parent_id" ref="vat_code_base_purchases" />
+            <field name="parent_id" ref="vat_code_base_purchases"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_purch_Z">
+        <record id="vat_code_purch_Z" model="account.tax.code">
             
             <field name="name">Taxable purchases rated Z (0%)</field>
             
-            <field name="parent_id" ref="vat_code_base_purchases" />
+            <field name="parent_id" ref="vat_code_base_purchases"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_purch_X">
+        <record id="vat_code_purch_X" model="account.tax.code">
             
             <field name="name">Taxable purchases type X (Exempt)</field>
             
-            <field name="parent_id" ref="vat_code_base_purchases" />
+            <field name="parent_id" ref="vat_code_base_purchases"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_purch_O">
+        <record id="vat_code_purch_O" model="account.tax.code">
             
             <field name="name">Taxable purchases type O (Out of scope)</field>
             
-            <field name="parent_id" ref="vat_code_base_purchases" />
+            <field name="parent_id" ref="vat_code_base_purchases"/>
             
         </record>
         
@@ -174,61 +171,61 @@
         
         
         
-        <record model="account.tax.code" id="vat_code_base_sales">
+        <record id="vat_code_base_sales" model="account.tax.code">
             
             <field name="name">Base of taxable sales</field>
             
-            <field name="parent_id" ref="vat_code_base_net" />
+            <field name="parent_id" ref="vat_code_base_net"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_sales_S">
+        <record id="vat_code_sales_S" model="account.tax.code">
             
             <field name="name">Taxable sales rated S (17.5%)</field>
             
-            <field name="parent_id" ref="vat_code_base_sales" />
+            <field name="parent_id" ref="vat_code_base_sales"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_sales_R">
+        <record id="vat_code_sales_R" model="account.tax.code">
             
             <field name="name">Taxable sales rated R (5%)</field>
             
-            <field name="parent_id" ref="vat_code_base_sales" />
+            <field name="parent_id" ref="vat_code_base_sales"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_sales_Z">
+        <record id="vat_code_sales_Z" model="account.tax.code">
             
             <field name="name">Taxable sales rated Z (0%)</field>
             
-            <field name="parent_id" ref="vat_code_base_sales" />
+            <field name="parent_id" ref="vat_code_base_sales"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_sales_X">
+        <record id="vat_code_sales_X" model="account.tax.code">
             
             <field name="name">Taxable sales type X (Exempt)</field>
             
-            <field name="parent_id" ref="vat_code_base_sales" />
+            <field name="parent_id" ref="vat_code_base_sales"/>
             
         </record>
         
         
         
-        <record model="account.tax.code" id="vat_code_sales_O">
+        <record id="vat_code_sales_O" model="account.tax.code">
             
             <field name="name">Taxable sales type O (Out of scope)</field>
             
-            <field name="parent_id" ref="vat_code_base_sales" />
+            <field name="parent_id" ref="vat_code_base_sales"/>
             
         </record>
         
@@ -244,11 +241,11 @@
         
         
         
-        <record model="account.tax" id="ivats">
+        <record id="ivats" model="account.tax">
             
             <field name="name">IVAT S</field>
             
-            <field name="amount" eval="0.175"/>
+            <field eval="0.175" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -268,11 +265,11 @@
         
         
         
-        <record model="account.tax" id="ivatr">
+        <record id="ivatr" model="account.tax">
             
             <field name="name">IVAT R</field>
             
-            <field name="amount" eval="0.005"/>
+            <field eval="0.005" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -292,11 +289,11 @@
         
         
         
-        <record model="account.tax" id="ivatz">
+        <record id="ivatz" model="account.tax">
             
             <field name="name">IVAT Z</field>
             
-            <field name="amount" eval="0.0"/>
+            <field eval="0.0" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -308,11 +305,11 @@
         
         
         
-        <record model="account.tax" id="ivatx">
+        <record id="ivatx" model="account.tax">
             
             <field name="name">IVAT X</field>
             
-            <field name="amount" eval="0.0"/>
+            <field eval="0.0" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -324,11 +321,11 @@
         
         
         
-        <record model="account.tax" id="ivato">
+        <record id="ivato" model="account.tax">
             
             <field name="name">IVAT O</field>
             
-            <field name="amount" eval="0.0"/>
+            <field eval="0.0" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -344,11 +341,11 @@
         
         
         
-        <record model="account.tax" id="ovats">
+        <record id="ovats" model="account.tax">
             
             <field name="name">OVAT S</field>
             
-            <field name="amount" eval="0.175"/>
+            <field eval="0.175" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -368,11 +365,11 @@
         
         
         
-        <record model="account.tax" id="ovatr">
+        <record id="ovatr" model="account.tax">
             
             <field name="name">OVAT R</field>
             
-            <field name="amount" eval="0.005"/>
+            <field eval="0.005" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -392,11 +389,11 @@
         
         
         
-        <record model="account.tax" id="ovatz">
+        <record id="ovatz" model="account.tax">
             
             <field name="name">OVAT Z</field>
             
-            <field name="amount" eval="0.0"/>
+            <field eval="0.0" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -408,11 +405,11 @@
         
         
         
-        <record model="account.tax" id="ovatx">
+        <record id="ovatx" model="account.tax">
             
             <field name="name">OVAT X</field>
             
-            <field name="amount" eval="0.0"/>
+            <field eval="0.0" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -424,11 +421,11 @@
         
         
         
-        <record model="account.tax" id="ovato">
+        <record id="ovato" model="account.tax">
             
             <field name="name">OVAT O</field>
             
-            <field name="amount" eval="0.0"/>
+            <field eval="0.0" name="amount"/>
             
             <field name="type">percent</field>
             
@@ -444,5 +441,4 @@
     
     
     
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/l10n_fr/fr_wizard.xml b/addons/l10n_fr/fr_wizard.xml
index 5206ed4899c..d0b77ee7ce1 100755
--- a/addons/l10n_fr/fr_wizard.xml
+++ b/addons/l10n_fr/fr_wizard.xml
@@ -1,15 +1,11 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
 
-        <wizard name='account.chart.report' id='wizard_chart_report' model='account.account' menu='False' string='Account Report'/>
+        <wizard id="wizard_chart_report" menu="False" model="account.account" name="account.chart.report" string="Account Report"/>
 
-        <menuitem
-            name='Financial Management/Reporting/CERFA Declaration' 
-            action='wizard_chart_report' 
-            type='wizard' 
-            id='menu_fr_chart_report'/>
+        <menuitem action="wizard_chart_report" id="menu_fr_chart_report" parent="account.menu_finance_reporting" type="wizard"/>
 
 
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/l10n_fr/plan-99-03_societe.xml b/addons/l10n_fr/plan-99-03_societe.xml
index f53ef1d5f6e..fe224094bf2 100644
--- a/addons/l10n_fr/plan-99-03_societe.xml
+++ b/addons/l10n_fr/plan-99-03_societe.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!--
@@ -25,15 +25,15 @@
             <field name="code">0</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
         </record>
         <record id="pcg_Classes_1_a_5" model="account.account">
             <field name="name">Comptes de bilan</field>
             <field name="code">Classes_1_a_5</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_0])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_0])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_1" model="account.account">
             <field name="name">Comptes de capitaux</field>
@@ -41,16 +41,16 @@
             <field name="type">view</field>
             <field name="note">Capitaux propres, autres fonds propres, emprunts et dettes assimilées</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_1_a_5])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Classes_1_a_5])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_10" model="account.account">
             <field name="name">Capital et réserves</field>
             <field name="code">Comptes_10</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_101000" model="account.account">
             <field name="name">Capital</field>
@@ -58,264 +58,264 @@
             <field name="type">asset</field>
             <field name="note">pour sociétés (SARL, SA) : choix statuts, montage : cf site erp-libre.info</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_10])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_10])]" name="parent_id"/>
         </record>
         <record id="pcg_101100" model="account.account">
             <field name="name">Capital souscrit - non appelé</field>
             <field name="code">101100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_101000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_101000])]" name="parent_id"/>
         </record>
         <record id="pcg_101200" model="account.account">
             <field name="name">Capital souscrit - appelé non versé</field>
             <field name="code">101200</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_101000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_101000])]" name="parent_id"/>
         </record>
         <record id="pcg_101300" model="account.account">
             <field name="name">Capital souscrit - appelé versé</field>
             <field name="code">101300</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_101000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_101000])]" name="parent_id"/>
         </record>
         <record id="pcg_101310" model="account.account">
             <field name="name">Capital non amorti</field>
             <field name="code">101310</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_101300])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_101300])]" name="parent_id"/>
         </record>
         <record id="pcg_101320" model="account.account">
             <field name="name">Capital amorti</field>
             <field name="code">101320</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_101300])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_101300])]" name="parent_id"/>
         </record>
         <record id="pcg_101800" model="account.account">
             <field name="name">Capital souscrit soumis à des réglementations particulières</field>
             <field name="code">101800</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_101000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_101000])]" name="parent_id"/>
         </record>
         <record id="pcg_104000" model="account.account">
             <field name="name">Primes liées au capital social</field>
             <field name="code">104000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_10])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_10])]" name="parent_id"/>
         </record>
         <record id="pcg_104100" model="account.account">
             <field name="name">Primes d'émission</field>
             <field name="code">104100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_104000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_104000])]" name="parent_id"/>
         </record>
         <record id="pcg_104200" model="account.account">
             <field name="name">Primes de fusion</field>
             <field name="code">104200</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_104000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_104000])]" name="parent_id"/>
         </record>
         <record id="pcg_104300" model="account.account">
             <field name="name">Primes d'apport</field>
             <field name="code">104300</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_104000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_104000])]" name="parent_id"/>
         </record>
         <record id="pcg_104400" model="account.account">
             <field name="name">Primes de conversion d'obligations en actions</field>
             <field name="code">104400</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_104000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_104000])]" name="parent_id"/>
         </record>
         <record id="pcg_104500" model="account.account">
             <field name="name">Bons de souscription d'actions</field>
             <field name="code">104500</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_104000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_104000])]" name="parent_id"/>
         </record>
         <record id="pcg_105000" model="account.account">
             <field name="name">Écarts de réévaluation</field>
             <field name="code">105000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_10])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_10])]" name="parent_id"/>
         </record>
         <record id="pcg_105100" model="account.account">
             <field name="name">Réserve spéciale de réévaluation</field>
             <field name="code">105100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_105000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_105000])]" name="parent_id"/>
         </record>
         <record id="pcg_105200" model="account.account">
             <field name="name">Écart de réévaluation libre</field>
             <field name="code">105200</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_105000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_105000])]" name="parent_id"/>
         </record>
         <record id="pcg_105300" model="account.account">
             <field name="name">Réserve de réévaluation</field>
             <field name="code">105300</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_105000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_105000])]" name="parent_id"/>
         </record>
         <record id="pcg_105500" model="account.account">
             <field name="name">Écarts de réévaluation (autres opérations légales)</field>
             <field name="code">105500</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_105000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_105000])]" name="parent_id"/>
         </record>
         <record id="pcg_105700" model="account.account">
             <field name="name">Autres écarts de réévaluation en France</field>
             <field name="code">105700</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_105000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_105000])]" name="parent_id"/>
         </record>
         <record id="pcg_105800" model="account.account">
             <field name="name">Autres écarts de réévaluation à l'étranger</field>
             <field name="code">105800</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_105000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_105000])]" name="parent_id"/>
         </record>
         <record id="pcg_106000" model="account.account">
             <field name="name">Réserves</field>
             <field name="code">106000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_10])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_10])]" name="parent_id"/>
         </record>
         <record id="pcg_106100" model="account.account">
             <field name="name">Réserve légale</field>
             <field name="code">106100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106000])]" name="parent_id"/>
         </record>
         <record id="pcg_106110" model="account.account">
             <field name="name">Réserve légale proprement dite</field>
             <field name="code">106110</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106100])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106100])]" name="parent_id"/>
         </record>
         <record id="pcg_106120" model="account.account">
             <field name="name">Plus-values nettes à long terme</field>
             <field name="code">106120</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106100])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106100])]" name="parent_id"/>
         </record>
         <record id="pcg_106200" model="account.account">
             <field name="name">Réserves indisponibles</field>
             <field name="code">106200</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106000])]" name="parent_id"/>
         </record>
         <record id="pcg_106300" model="account.account">
             <field name="name">Réserves statutaires ou contractuelles </field>
             <field name="code">106300</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106000])]" name="parent_id"/>
         </record>
         <record id="pcg_106400" model="account.account">
             <field name="name">Réserves réglementées</field>
             <field name="code">106400</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106000])]" name="parent_id"/>
         </record>
         <record id="pcg_106410" model="account.account">
             <field name="name">Plus-values nettes à long terme </field>
             <field name="code">106410</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106400])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106400])]" name="parent_id"/>
         </record>
         <record id="pcg_106480" model="account.account">
             <field name="name">Autres réserves réglementées</field>
             <field name="code">106480</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106400])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106400])]" name="parent_id"/>
         </record>
         <record id="pcg_106800" model="account.account">
             <field name="name">Autres réserves</field>
             <field name="code">106800</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106000])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106000])]" name="parent_id"/>
         </record>
         <record id="pcg_106810" model="account.account">
             <field name="name">Réserve de propre assureur</field>
             <field name="code">106810</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106800])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106800])]" name="parent_id"/>
         </record>
         <record id="pcg_106880" model="account.account">
             <field name="name">Réserves diverses</field>
             <field name="code">106880</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_106800])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_106800])]" name="parent_id"/>
         </record>
         <record id="pcg_107000" model="account.account">
             <field name="name">Écarts d'équivalence</field>
             <field name="code">107000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_10])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_10])]" name="parent_id"/>
         </record>
         <record id="pcg_108000" model="account.account">
             <field name="name">Compte de l'exploitant</field>
@@ -323,863 +323,863 @@
             <field name="type">asset</field>
             <field name="note">pour les entreprises individuelles</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_10])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_10])]" name="parent_id"/>
         </record>
         <record id="pcg_109000" model="account.account">
             <field name="name">Actionnaires: capital souscrit - non appelé</field>
             <field name="code">109000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_10])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_10])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_11" model="account.account">
             <field name="name">Report à nouveau (solde créditeur ou débiteur)</field>
             <field name="code">Comptes_11</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_110000" model="account.account">
             <field name="name">Report à nouveau (solde créditeur)</field>
             <field name="code">110000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_11])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_11])]" name="parent_id"/>
         </record>
         <record id="pcg_119000" model="account.account">
             <field name="name">Report à nouveau (solde débiteur)</field>
             <field name="code">119000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_11])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_11])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_12" model="account.account">
             <field name="name">Résultat de l'exercice (bénéfice ou perte)</field>
             <field name="code">Comptes_12</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_120000" model="account.account">
             <field name="name">Résultat de l'exercice (bénéfice)</field>
             <field name="code">120000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_12])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_12])]" name="parent_id"/>
         </record>
         <record id="pcg_129000" model="account.account">
             <field name="name">Résultat de l'exercice (perte)</field>
             <field name="code">129000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_12])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_12])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_13" model="account.account">
             <field name="name">Subventions d'investissement</field>
             <field name="code">Comptes_13</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_131000" model="account.account">
             <field name="name">Subventions d'équipement</field>
             <field name="code">131000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_13])]"/>
+            <field eval="1" name="sign"/>
+            <field eval="[(6,0,[pcg_Comptes_13])]" name="parent_id"/>
         </record>
         <record id="pcg_131100" model="account.account">
             <field name="name">État</field>
             <field name="code">131100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_131000])]"/>
+            <field eval="[(6,0,[pcg_131000])]" name="parent_id"/>
         </record>
         <record id="pcg_131200" model="account.account">
             <field name="name">Régions</field>
             <field name="code">131200</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_131000])]"/>
+            <field eval="[(6,0,[pcg_131000])]" name="parent_id"/>
         </record>
         <record id="pcg_131300" model="account.account">
             <field name="name">Départements</field>
             <field name="code">131300</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_131000])]"/>
+            <field eval="[(6,0,[pcg_131000])]" name="parent_id"/>
         </record>
         <record id="pcg_131400" model="account.account">
             <field name="name">Communes</field>
             <field name="code">131400</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_131000])]"/>
+            <field eval="[(6,0,[pcg_131000])]" name="parent_id"/>
         </record>
         <record id="pcg_131500" model="account.account">
             <field name="name">Collectivités publiques</field>
             <field name="code">131500</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_131000])]"/>
+            <field eval="[(6,0,[pcg_131000])]" name="parent_id"/>
         </record>
         <record id="pcg_131600" model="account.account">
             <field name="name">Entreprises publiques</field>
             <field name="code">131600</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_131000])]"/>
+            <field eval="[(6,0,[pcg_131000])]" name="parent_id"/>
         </record>
         <record id="pcg_131700" model="account.account">
             <field name="name">Entreprises et organismes privés</field>
             <field name="code">131700</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_131000])]"/>
+            <field eval="[(6,0,[pcg_131000])]" name="parent_id"/>
         </record>
         <record id="pcg_131800" model="account.account">
             <field name="name">Autres</field>
             <field name="code">131800</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_131000])]"/>
+            <field eval="[(6,0,[pcg_131000])]" name="parent_id"/>
         </record>
         <record id="pcg_138000" model="account.account">
             <field name="name">Autres subventions d'investissement</field>
             <field name="code">138000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_13])]"/>
+            <field eval="[(6,0,[pcg_Comptes_13])]" name="parent_id"/>
         </record>
         <record id="pcg_139000" model="account.account">
             <field name="name">Subventions d'investissement inscrites au compte de résultat</field>
             <field name="code">139000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_13])]"/>
+            <field eval="[(6,0,[pcg_Comptes_13])]" name="parent_id"/>
         </record>
         <record id="pcg_139100" model="account.account">
             <field name="name">Subventions d'équipement</field>
             <field name="code">139100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139000])]"/>
+            <field eval="[(6,0,[pcg_139000])]" name="parent_id"/>
         </record>
         <record id="pcg_139110" model="account.account">
             <field name="name">Etat</field>
             <field name="code">139110</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139100])]"/>
+            <field eval="[(6,0,[pcg_139100])]" name="parent_id"/>
         </record>
         <record id="pcg_139120" model="account.account">
             <field name="name">Régions</field>
             <field name="code">139120</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139100])]"/>
+            <field eval="[(6,0,[pcg_139100])]" name="parent_id"/>
         </record>
         <record id="pcg_139130" model="account.account">
             <field name="name">Départements</field>
             <field name="code">139130</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139100])]"/>
+            <field eval="[(6,0,[pcg_139100])]" name="parent_id"/>
         </record>
         <record id="pcg_139140" model="account.account">
             <field name="name">Communes</field>
             <field name="code">139140</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139100])]"/>
+            <field eval="[(6,0,[pcg_139100])]" name="parent_id"/>
         </record>
         <record id="pcg_139150" model="account.account">
             <field name="name">Collectivités publiques</field>
             <field name="code">139150</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139100])]"/>
+            <field eval="[(6,0,[pcg_139100])]" name="parent_id"/>
         </record>
         <record id="pcg_139160" model="account.account">
             <field name="name">Entreprises publiques</field>
             <field name="code">139160</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139100])]"/>
+            <field eval="[(6,0,[pcg_139100])]" name="parent_id"/>
         </record>
         <record id="pcg_139170" model="account.account">
             <field name="name">Entreprises et organismes privés </field>
             <field name="code">139170</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139100])]"/>
+            <field eval="[(6,0,[pcg_139100])]" name="parent_id"/>
         </record>
         <record id="pcg_139180" model="account.account">
             <field name="name">Autres</field>
             <field name="code">139180</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139100])]"/>
+            <field eval="[(6,0,[pcg_139100])]" name="parent_id"/>
         </record>
         <record id="pcg_139800" model="account.account">
             <field name="name">Autres subventions d'investissement</field>
             <field name="code">139800</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_139000])]"/>
+            <field eval="[(6,0,[pcg_139000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_14" model="account.account">
             <field name="name">Provisions réglementées</field>
             <field name="code">Comptes_14</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_142000" model="account.account">
             <field name="name">Provisions réglementées relatives aux immobilisations</field>
             <field name="code">142000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_14])]"/>
+            <field eval="[(6,0,[pcg_Comptes_14])]" name="parent_id"/>
         </record>
         <record id="pcg_142300" model="account.account">
             <field name="name">Provisions reconstitution des gisements miniers et pétroliers</field>
             <field name="code">142300</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_142000])]"/>
+            <field eval="[(6,0,[pcg_142000])]" name="parent_id"/>
         </record>
         <record id="pcg_142400" model="account.account">
             <field name="name">Provisions pour investissement (participation des salariés)</field>
             <field name="code">142400</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_142000])]"/>
+            <field eval="[(6,0,[pcg_142000])]" name="parent_id"/>
         </record>
         <record id="pcg_143000" model="account.account">
             <field name="name">Provisions réglementées relatives aux stocks</field>
             <field name="code">143000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_14])]"/>
+            <field eval="[(6,0,[pcg_Comptes_14])]" name="parent_id"/>
         </record>
         <record id="pcg_143100" model="account.account">
             <field name="name">Hausse des prix</field>
             <field name="code">143100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_143000])]"/>
+            <field eval="[(6,0,[pcg_143000])]" name="parent_id"/>
         </record>
         <record id="pcg_143200" model="account.account">
             <field name="name">Fluctuation des cours</field>
             <field name="code">143200</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_143000])]"/>
+            <field eval="[(6,0,[pcg_143000])]" name="parent_id"/>
         </record>
         <record id="pcg_144000" model="account.account">
             <field name="name">Provisions réglementées relatives aux autres éléments de l'actif</field>
             <field name="code">144000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_14])]"/>
+            <field eval="[(6,0,[pcg_Comptes_14])]" name="parent_id"/>
         </record>
         <record id="pcg_145000" model="account.account">
             <field name="name">Amortissements dérogatoires</field>
             <field name="code">145000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_14])]"/>
+            <field eval="[(6,0,[pcg_Comptes_14])]" name="parent_id"/>
         </record>
         <record id="pcg_146000" model="account.account">
             <field name="name">Provision spéciale de réévaluation</field>
             <field name="code">146000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_14])]"/>
+            <field eval="[(6,0,[pcg_Comptes_14])]" name="parent_id"/>
         </record>
         <record id="pcg_147000" model="account.account">
             <field name="name">Plus-values réinvesties</field>
             <field name="code">147000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_14])]"/>
+            <field eval="[(6,0,[pcg_Comptes_14])]" name="parent_id"/>
         </record>
         <record id="pcg_148000" model="account.account">
             <field name="name">Autres provisions réglementées</field>
             <field name="code">148000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_14])]"/>
+            <field eval="[(6,0,[pcg_Comptes_14])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_15" model="account.account">
             <field name="name">Provisions pour risques et charges</field>
             <field name="code">Comptes_15</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_151000" model="account.account">
             <field name="name">Provisions pour risques</field>
             <field name="code">151000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_15])]"/>
+            <field eval="[(6,0,[pcg_Comptes_15])]" name="parent_id"/>
         </record>
         <record id="pcg_151100" model="account.account">
             <field name="name">Provisions pour litiges</field>
             <field name="code">151100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_151000])]"/>
+            <field eval="[(6,0,[pcg_151000])]" name="parent_id"/>
         </record>
         <record id="pcg_151200" model="account.account">
             <field name="name">Provisions pour garanties données aux clients</field>
             <field name="code">151200</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_151000])]"/>
+            <field eval="[(6,0,[pcg_151000])]" name="parent_id"/>
         </record>
         <record id="pcg_151300" model="account.account">
             <field name="name">Provisions pour pertes sur marchés à terme</field>
             <field name="code">151300</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_151000])]"/>
+            <field eval="[(6,0,[pcg_151000])]" name="parent_id"/>
         </record>
         <record id="pcg_151400" model="account.account">
             <field name="name">Provisions pour amendes et pénalités</field>
             <field name="code">151400</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_151000])]"/>
+            <field eval="[(6,0,[pcg_151000])]" name="parent_id"/>
         </record>
         <record id="pcg_151500" model="account.account">
             <field name="name">Provisions pour pertes de change</field>
             <field name="code">151500</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_151000])]"/>
+            <field eval="[(6,0,[pcg_151000])]" name="parent_id"/>
         </record>
         <record id="pcg_151600" model="account.account">
             <field name="name">Provisions pour pertes sur contrats</field>
             <field name="code">151600</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_151000])]"/>
+            <field eval="[(6,0,[pcg_151000])]" name="parent_id"/>
         </record>
         <record id="pcg_151800" model="account.account">
             <field name="name">Autres provisions pour risques</field>
             <field name="code">151800</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_151000])]"/>
+            <field eval="[(6,0,[pcg_151000])]" name="parent_id"/>
         </record>
         <record id="pcg_153000" model="account.account">
             <field name="name">Provisions pour pensions et obligations similaires</field>
             <field name="code">153000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_15])]"/>
+            <field eval="[(6,0,[pcg_Comptes_15])]" name="parent_id"/>
         </record>
         <record id="pcg_154000" model="account.account">
             <field name="name">Provisions pour restructurations</field>
             <field name="code">154000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_15])]"/>
+            <field eval="[(6,0,[pcg_Comptes_15])]" name="parent_id"/>
         </record>
         <record id="pcg_155000" model="account.account">
             <field name="name">Provisions pour impôts</field>
             <field name="code">155000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_15])]"/>
+            <field eval="[(6,0,[pcg_Comptes_15])]" name="parent_id"/>
         </record>
         <record id="pcg_156000" model="account.account">
             <field name="name">Provisions pour renouvellement des immobilisations (entreprises concessionnaires)</field>
             <field name="code">156000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_15])]"/>
+            <field eval="[(6,0,[pcg_Comptes_15])]" name="parent_id"/>
         </record>
         <record id="pcg_157000" model="account.account">
             <field name="name">Provisions pour charges à répartir sur plusieurs exercices</field>
             <field name="code">157000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_15])]"/>
+            <field eval="[(6,0,[pcg_Comptes_15])]" name="parent_id"/>
         </record>
         <record id="pcg_157200" model="account.account">
             <field name="name">Provisions pour gros entretien ou grandes révisions </field>
             <field name="code">157200</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_157000])]"/>
+            <field eval="[(6,0,[pcg_157000])]" name="parent_id"/>
         </record>
         <record id="pcg_158000" model="account.account">
             <field name="name">Autres provisions pour charges</field>
             <field name="code">158000</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_15])]"/>
+            <field eval="[(6,0,[pcg_Comptes_15])]" name="parent_id"/>
         </record>
         <record id="pcg_158100" model="account.account">
             <field name="name">Provisions pour remises en état</field>
             <field name="code">158100</field>
             <field name="type">asset</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_158000])]"/>
+            <field eval="[(6,0,[pcg_158000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_16" model="account.account">
             <field name="name">Emprunts et dettes assimilées</field>
             <field name="code">Comptes_16</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_161000" model="account.account">
             <field name="name">Emprunts obligataires convertibles</field>
             <field name="code">161000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_16])]"/>
+            <field eval="[(6,0,[pcg_Comptes_16])]" name="parent_id"/>
         </record>
         <record id="pcg_163000" model="account.account">
             <field name="name">Autres emprunts obligataires </field>
             <field name="code">163000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_16])]"/>
+            <field eval="[(6,0,[pcg_Comptes_16])]" name="parent_id"/>
         </record>
         <record id="pcg_164000" model="account.account">
             <field name="name">Emprunts auprès des établissements de crédit</field>
             <field name="code">164000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_16])]"/>
+            <field eval="[(6,0,[pcg_Comptes_16])]" name="parent_id"/>
         </record>
         <record id="pcg_165000" model="account.account">
             <field name="name">Dépôts et cautionnements reçus</field>
             <field name="code">165000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_16])]"/>
+            <field eval="[(6,0,[pcg_Comptes_16])]" name="parent_id"/>
         </record>
         <record id="pcg_165100" model="account.account">
             <field name="name">Dépôts</field>
             <field name="code">165100</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_165000])]"/>
+            <field eval="[(6,0,[pcg_165000])]" name="parent_id"/>
         </record>
         <record id="pcg_165500" model="account.account">
             <field name="name">Cautionnements</field>
             <field name="code">165500</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_165000])]"/>
+            <field eval="[(6,0,[pcg_165000])]" name="parent_id"/>
         </record>
         <record id="pcg_166000" model="account.account">
             <field name="name">Participation des salariés aux résultats</field>
             <field name="code">166000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_16])]"/>
+            <field eval="[(6,0,[pcg_Comptes_16])]" name="parent_id"/>
         </record>
         <record id="pcg_166100" model="account.account">
             <field name="name">Comptes bloqués</field>
             <field name="code">166100</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_166000])]"/>
+            <field eval="[(6,0,[pcg_166000])]" name="parent_id"/>
         </record>
         <record id="pcg_166200" model="account.account">
             <field name="name">Fonds de participation</field>
             <field name="code">166200</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_166000])]"/>
+            <field eval="[(6,0,[pcg_166000])]" name="parent_id"/>
         </record>
         <record id="pcg_167000" model="account.account">
             <field name="name">Emprunts et dettes assortis de conditions particulières</field>
             <field name="code">167000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_16])]"/>
+            <field eval="[(6,0,[pcg_Comptes_16])]" name="parent_id"/>
         </record>
         <record id="pcg_167100" model="account.account">
             <field name="name">Emissions de titres participatifs</field>
             <field name="code">167100</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_167000])]"/>
+            <field eval="[(6,0,[pcg_167000])]" name="parent_id"/>
         </record>
         <record id="pcg_167400" model="account.account">
             <field name="name">Avances conditionnées de l'État</field>
             <field name="code">167400</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_167000])]"/>
+            <field eval="[(6,0,[pcg_167000])]" name="parent_id"/>
         </record>
         <record id="pcg_167500" model="account.account">
             <field name="name">Emprunts participatifs</field>
             <field name="code">167500</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_167000])]"/>
+            <field eval="[(6,0,[pcg_167000])]" name="parent_id"/>
         </record>
         <record id="pcg_168000" model="account.account">
             <field name="name">Autres emprunts et dettes assimilées</field>
             <field name="code">168000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_16])]"/>
+            <field eval="[(6,0,[pcg_Comptes_16])]" name="parent_id"/>
         </record>
         <record id="pcg_168100" model="account.account">
             <field name="name">Autres emprunts</field>
             <field name="code">168100</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168000])]"/>
+            <field eval="[(6,0,[pcg_168000])]" name="parent_id"/>
         </record>
         <record id="pcg_168500" model="account.account">
             <field name="name">Rentes viagères capitalisées</field>
             <field name="code">168500</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168000])]"/>
+            <field eval="[(6,0,[pcg_168000])]" name="parent_id"/>
         </record>
         <record id="pcg_168700" model="account.account">
             <field name="name">Autres dettes</field>
             <field name="code">168700</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168000])]"/>
+            <field eval="[(6,0,[pcg_168000])]" name="parent_id"/>
         </record>
         <record id="pcg_168800" model="account.account">
             <field name="name">Intérêts courus</field>
             <field name="code">168800</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168000])]"/>
+            <field eval="[(6,0,[pcg_168000])]" name="parent_id"/>
         </record>
         <record id="pcg_168810" model="account.account">
             <field name="name">Sur emprunts obligataires convertibles </field>
             <field name="code">168810</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168800])]"/>
+            <field eval="[(6,0,[pcg_168800])]" name="parent_id"/>
         </record>
         <record id="pcg_168830" model="account.account">
             <field name="name">Sur autres emprunts obligataires</field>
             <field name="code">168830</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168800])]"/>
+            <field eval="[(6,0,[pcg_168800])]" name="parent_id"/>
         </record>
         <record id="pcg_168840" model="account.account">
             <field name="name">Sur emprunts auprès des établissements de crédit</field>
             <field name="code">168840</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168800])]"/>
+            <field eval="[(6,0,[pcg_168800])]" name="parent_id"/>
         </record>
         <record id="pcg_168850" model="account.account">
             <field name="name">Sur dépôts et cautionnements reçus</field>
             <field name="code">168850</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168800])]"/>
+            <field eval="[(6,0,[pcg_168800])]" name="parent_id"/>
         </record>
         <record id="pcg_168860" model="account.account">
             <field name="name">Sur participation des salariés aux résultats</field>
             <field name="code">168860</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168800])]"/>
+            <field eval="[(6,0,[pcg_168800])]" name="parent_id"/>
         </record>
         <record id="pcg_168870" model="account.account">
             <field name="name">Sur emprunts et dettes assortis de conditions particulières</field>
             <field name="code">168870</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168800])]"/>
+            <field eval="[(6,0,[pcg_168800])]" name="parent_id"/>
         </record>
         <record id="pcg_168880" model="account.account">
             <field name="name">Sur autres emprunts et dettes assimilées</field>
             <field name="code">168880</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_168800])]"/>
+            <field eval="[(6,0,[pcg_168800])]" name="parent_id"/>
         </record>
         <record id="pcg_169000" model="account.account">
             <field name="name">Primes de remboursement des obligations</field>
             <field name="code">169000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_16])]"/>
+            <field eval="[(6,0,[pcg_Comptes_16])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_17" model="account.account">
             <field name="name">Dettes rattachées à des participations</field>
             <field name="code">Comptes_17</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_171000" model="account.account">
             <field name="name">Dettes rattachées à des participations (groupe)</field>
             <field name="code">171000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_17])]"/>
+            <field eval="[(6,0,[pcg_Comptes_17])]" name="parent_id"/>
         </record>
         <record id="pcg_174000" model="account.account">
             <field name="name">Dettes rattachées à des participations (hors groupe)</field>
             <field name="code">174000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_17])]"/>
+            <field eval="[(6,0,[pcg_Comptes_17])]" name="parent_id"/>
         </record>
         <record id="pcg_178000" model="account.account">
             <field name="name">Dettes rattachées à des sociétés en participation</field>
             <field name="code">178000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_17])]"/>
+            <field eval="[(6,0,[pcg_Comptes_17])]" name="parent_id"/>
         </record>
         <record id="pcg_178100" model="account.account">
             <field name="name">Principal</field>
             <field name="code">178100</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_178000])]"/>
+            <field eval="[(6,0,[pcg_178000])]" name="parent_id"/>
         </record>
         <record id="pcg_178800" model="account.account">
             <field name="name">Intérêts courus</field>
             <field name="code">178800</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_178000])]"/>
+            <field eval="[(6,0,[pcg_178000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_18" model="account.account">
             <field name="name">Comptes de liaison des établissements et sociétés en participation</field>
             <field name="code">Comptes_18</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_1])]"/>
+            <field eval="[(6,0,[pcg_Classe_1])]" name="parent_id"/>
         </record>
         <record id="pcg_181000" model="account.account">
             <field name="name">Comptes de liaison des établissements</field>
             <field name="code">181000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_18])]"/>
+            <field eval="[(6,0,[pcg_Comptes_18])]" name="parent_id"/>
         </record>
         <record id="pcg_186000" model="account.account">
             <field name="name">Biens et prestations de services échangés entre établissements (charges)</field>
             <field name="code">186000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_18])]"/>
+            <field eval="[(6,0,[pcg_Comptes_18])]" name="parent_id"/>
         </record>
         <record id="pcg_187000" model="account.account">
             <field name="name">Biens et prestations de services échangés entre établissements (produits)</field>
             <field name="code">187000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_18])]"/>
+            <field eval="[(6,0,[pcg_Comptes_18])]" name="parent_id"/>
         </record>
         <record id="pcg_188000" model="account.account">
             <field name="name">Comptes de liaison des sociétés en participation</field>
             <field name="code">188000</field>
             <field name="type">dettes</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_18])]"/>
+            <field eval="[(6,0,[pcg_Comptes_18])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_2" model="account.account">
             <field name="name">Comptes d'immobilisations</field>
@@ -1187,9 +1187,9 @@
             <field name="type">view</field>
             <field name="note">Les comptes de la classe 2 regroupent les immobilisations incorporelles, les immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_1_a_5])]"/>
+            <field eval="[(6,0,[pcg_Classes_1_a_5])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_20" model="account.account">
             <field name="name">Immobilisations incorporelles</field>
@@ -1197,9 +1197,9 @@
             <field name="type">view</field>
             <field name="note">corporelles, les immobilisations financières, les amortissements et provisions relatifs aux</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_201000" model="account.account">
             <field name="name">Frais d'établissement</field>
@@ -1207,99 +1207,99 @@
             <field name="type">immobilisations</field>
             <field name="note">immobilisations.</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_20])]"/>
+            <field eval="[(6,0,[pcg_Comptes_20])]" name="parent_id"/>
         </record>
         <record id="pcg_201100" model="account.account">
             <field name="name">Frais de constitution</field>
             <field name="code">201100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_201000])]"/>
+            <field eval="[(6,0,[pcg_201000])]" name="parent_id"/>
         </record>
         <record id="pcg_201200" model="account.account">
             <field name="name">Frais de premier établissement</field>
             <field name="code">201200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_201000])]"/>
+            <field eval="[(6,0,[pcg_201000])]" name="parent_id"/>
         </record>
         <record id="pcg_201210" model="account.account">
             <field name="name">Frais de prospection</field>
             <field name="code">201210</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_201200])]"/>
+            <field eval="[(6,0,[pcg_201200])]" name="parent_id"/>
         </record>
         <record id="pcg_201220" model="account.account">
             <field name="name">Frais de publicité</field>
             <field name="code">201220</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_201200])]"/>
+            <field eval="[(6,0,[pcg_201200])]" name="parent_id"/>
         </record>
         <record id="pcg_201300" model="account.account">
             <field name="name">Frais d'augmentation de capital et d'opérations diverses (fusions scissions transformations)</field>
             <field name="code">201300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_201000])]"/>
+            <field eval="[(6,0,[pcg_201000])]" name="parent_id"/>
         </record>
         <record id="pcg_203000" model="account.account">
             <field name="name">Frais de recherche et de développement</field>
             <field name="code">203000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_20])]"/>
+            <field eval="[(6,0,[pcg_Comptes_20])]" name="parent_id"/>
         </record>
         <record id="pcg_205000" model="account.account">
             <field name="name">Concessions et droits similaires brevets licences marques procédés logiciels droits et valeurs similaires</field>
             <field name="code">205000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_20])]"/>
+            <field eval="[(6,0,[pcg_Comptes_20])]" name="parent_id"/>
         </record>
         <record id="pcg_206000" model="account.account">
             <field name="name">Droit au bail</field>
             <field name="code">206000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_20])]"/>
+            <field eval="[(6,0,[pcg_Comptes_20])]" name="parent_id"/>
         </record>
         <record id="pcg_207000" model="account.account">
             <field name="name">Fonds commercial</field>
             <field name="code">207000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_20])]"/>
+            <field eval="[(6,0,[pcg_Comptes_20])]" name="parent_id"/>
         </record>
         <record id="pcg_208000" model="account.account">
             <field name="name">Autres immobilisations incorporelles</field>
             <field name="code">208000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_20])]"/>
+            <field eval="[(6,0,[pcg_Comptes_20])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_21" model="account.account">
             <field name="name">Immobilisations corporelles</field>
@@ -1307,450 +1307,450 @@
             <field name="type">view</field>
             <field name="note">dès valeur unitaire supérieure à 500 Euros HT</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_211000" model="account.account">
             <field name="name">Terrains</field>
             <field name="code">211000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_21])]"/>
+            <field eval="[(6,0,[pcg_Comptes_21])]" name="parent_id"/>
         </record>
         <record id="pcg_211100" model="account.account">
             <field name="name">Terrains nus</field>
             <field name="code">211100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211000])]"/>
+            <field eval="[(6,0,[pcg_211000])]" name="parent_id"/>
         </record>
         <record id="pcg_211200" model="account.account">
             <field name="name">Terrains aménagés</field>
             <field name="code">211200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211000])]"/>
+            <field eval="[(6,0,[pcg_211000])]" name="parent_id"/>
         </record>
         <record id="pcg_211300" model="account.account">
             <field name="name">Sous-sols et sur-sols</field>
             <field name="code">211300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211000])]"/>
+            <field eval="[(6,0,[pcg_211000])]" name="parent_id"/>
         </record>
         <record id="pcg_211400" model="account.account">
             <field name="name">Terrains de gisement</field>
             <field name="code">211400</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211000])]"/>
+            <field eval="[(6,0,[pcg_211000])]" name="parent_id"/>
         </record>
         <record id="pcg_211410" model="account.account">
             <field name="name">Carrières</field>
             <field name="code">211410</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211400])]"/>
+            <field eval="[(6,0,[pcg_211400])]" name="parent_id"/>
         </record>
         <record id="pcg_211500" model="account.account">
             <field name="name">Terrains bâtis</field>
             <field name="code">211500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211000])]"/>
+            <field eval="[(6,0,[pcg_211000])]" name="parent_id"/>
         </record>
         <record id="pcg_211510" model="account.account">
             <field name="name">Ensembles immobiliers industriels (A B)</field>
             <field name="code">211510</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211500])]"/>
+            <field eval="[(6,0,[pcg_211500])]" name="parent_id"/>
         </record>
         <record id="pcg_211550" model="account.account">
             <field name="name">Ensembles immobiliers administratifs et commerciaux (A B)</field>
             <field name="code">211550</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211500])]"/>
+            <field eval="[(6,0,[pcg_211500])]" name="parent_id"/>
         </record>
         <record id="pcg_211580" model="account.account">
             <field name="name">Autres ensembles immobiliers</field>
             <field name="code">211580</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211500])]"/>
+            <field eval="[(6,0,[pcg_211500])]" name="parent_id"/>
         </record>
         <record id="pcg_211581" model="account.account">
             <field name="name">Affectés aux opérations professionnelles (A B)</field>
             <field name="code">211581</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211580])]"/>
+            <field eval="[(6,0,[pcg_211580])]" name="parent_id"/>
         </record>
         <record id="pcg_211588" model="account.account">
             <field name="name">Affectés aux opérations non professionnelles (A B)</field>
             <field name="code">211588</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211580])]"/>
+            <field eval="[(6,0,[pcg_211580])]" name="parent_id"/>
         </record>
         <record id="pcg_211600" model="account.account">
             <field name="name">Compte d'ordre sur immobilisations (art 6 du décret n° 78-737 du 11 juillet 1978)</field>
             <field name="code">211600</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_211000])]"/>
+            <field eval="[(6,0,[pcg_211000])]" name="parent_id"/>
         </record>
         <record id="pcg_212000" model="account.account">
             <field name="name">Agencements et aménagements de terrains</field>
             <field name="code">212000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_21])]"/>
+            <field eval="[(6,0,[pcg_Comptes_21])]" name="parent_id"/>
         </record>
         <record id="pcg_213000" model="account.account">
             <field name="name">Constructions</field>
             <field name="code">213000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_21])]"/>
+            <field eval="[(6,0,[pcg_Comptes_21])]" name="parent_id"/>
         </record>
         <record id="pcg_213100" model="account.account">
             <field name="name">Bâtiments</field>
             <field name="code">213100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213000])]"/>
+            <field eval="[(6,0,[pcg_213000])]" name="parent_id"/>
         </record>
         <record id="pcg_213110" model="account.account">
             <field name="name">Ensembles immobiliers industriels (A B)</field>
             <field name="code">213110</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213100])]"/>
+            <field eval="[(6,0,[pcg_213100])]" name="parent_id"/>
         </record>
         <record id="pcg_213150" model="account.account">
             <field name="name">Ensembles immobiliers administratifs et commerciaux (A B)</field>
             <field name="code">213150</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213100])]"/>
+            <field eval="[(6,0,[pcg_213100])]" name="parent_id"/>
         </record>
         <record id="pcg_213180" model="account.account">
             <field name="name">Autres ensembles immobiliers</field>
             <field name="code">213180</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213100])]"/>
+            <field eval="[(6,0,[pcg_213100])]" name="parent_id"/>
         </record>
         <record id="pcg_213181" model="account.account">
             <field name="name">Affectés aux opérations professionnelles (A B)</field>
             <field name="code">213181</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213180])]"/>
+            <field eval="[(6,0,[pcg_213180])]" name="parent_id"/>
         </record>
         <record id="pcg_213188" model="account.account">
             <field name="name">Affectés aux opérations non professionnelles (A B)</field>
             <field name="code">213188</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213180])]"/>
+            <field eval="[(6,0,[pcg_213180])]" name="parent_id"/>
         </record>
         <record id="pcg_213500" model="account.account">
             <field name="name">Installations générales agencements aménagements des constructions</field>
             <field name="code">213500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213000])]"/>
+            <field eval="[(6,0,[pcg_213000])]" name="parent_id"/>
         </record>
         <record id="pcg_213800" model="account.account">
             <field name="name">Ouvrages d'infrastructure</field>
             <field name="code">213800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213000])]"/>
+            <field eval="[(6,0,[pcg_213000])]" name="parent_id"/>
         </record>
         <record id="pcg_213810" model="account.account">
             <field name="name">Voies de terre</field>
             <field name="code">213810</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213800])]"/>
+            <field eval="[(6,0,[pcg_213800])]" name="parent_id"/>
         </record>
         <record id="pcg_213820" model="account.account">
             <field name="name">Voies de fer</field>
             <field name="code">213820</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213800])]"/>
+            <field eval="[(6,0,[pcg_213800])]" name="parent_id"/>
         </record>
         <record id="pcg_213830" model="account.account">
             <field name="name">Voies d'eau</field>
             <field name="code">213830</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213800])]"/>
+            <field eval="[(6,0,[pcg_213800])]" name="parent_id"/>
         </record>
         <record id="pcg_213840" model="account.account">
             <field name="name">Barrages</field>
             <field name="code">213840</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213800])]"/>
+            <field eval="[(6,0,[pcg_213800])]" name="parent_id"/>
         </record>
         <record id="pcg_213850" model="account.account">
             <field name="name">Pistes d'aérodromes</field>
             <field name="code">213850</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_213800])]"/>
+            <field eval="[(6,0,[pcg_213800])]" name="parent_id"/>
         </record>
         <record id="pcg_214000" model="account.account">
             <field name="name">Constructions sur sol d'autrui</field>
             <field name="code">214000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_21])]"/>
+            <field eval="[(6,0,[pcg_Comptes_21])]" name="parent_id"/>
         </record>
         <record id="pcg_215000" model="account.account">
             <field name="name">Installations techniques matériels et outillages industriels</field>
             <field name="code">215000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_21])]"/>
+            <field eval="[(6,0,[pcg_Comptes_21])]" name="parent_id"/>
         </record>
         <record id="pcg_215100" model="account.account">
             <field name="name">Installations complexes spécialisées</field>
             <field name="code">215100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215000])]"/>
+            <field eval="[(6,0,[pcg_215000])]" name="parent_id"/>
         </record>
         <record id="pcg_215110" model="account.account">
             <field name="name">Sur sol propre</field>
             <field name="code">215110</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215100])]"/>
+            <field eval="[(6,0,[pcg_215100])]" name="parent_id"/>
         </record>
         <record id="pcg_215140" model="account.account">
             <field name="name">Sur sol d'autrui</field>
             <field name="code">215140</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215100])]"/>
+            <field eval="[(6,0,[pcg_215100])]" name="parent_id"/>
         </record>
         <record id="pcg_215300" model="account.account">
             <field name="name">Installations à caractère spécifique</field>
             <field name="code">215300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215000])]"/>
+            <field eval="[(6,0,[pcg_215000])]" name="parent_id"/>
         </record>
         <record id="pcg_215310" model="account.account">
             <field name="name">Sur sol propre</field>
             <field name="code">215310</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215300])]"/>
+            <field eval="[(6,0,[pcg_215300])]" name="parent_id"/>
         </record>
         <record id="pcg_215340" model="account.account">
             <field name="name">Sur sol d'autrui</field>
             <field name="code">215340</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215300])]"/>
+            <field eval="[(6,0,[pcg_215300])]" name="parent_id"/>
         </record>
         <record id="pcg_215400" model="account.account">
             <field name="name">Matériel industriel</field>
             <field name="code">215400</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215000])]"/>
+            <field eval="[(6,0,[pcg_215000])]" name="parent_id"/>
         </record>
         <record id="pcg_215500" model="account.account">
             <field name="name">Outillage industriel</field>
             <field name="code">215500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215000])]"/>
+            <field eval="[(6,0,[pcg_215000])]" name="parent_id"/>
         </record>
         <record id="pcg_215700" model="account.account">
             <field name="name">Agencements et aménagements du matériel et outillage industriels</field>
             <field name="code">215700</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_215000])]"/>
+            <field eval="[(6,0,[pcg_215000])]" name="parent_id"/>
         </record>
         <record id="pcg_218000" model="account.account">
             <field name="name">Autres immobilisations corporelles</field>
             <field name="code">218000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_21])]"/>
+            <field eval="[(6,0,[pcg_Comptes_21])]" name="parent_id"/>
         </record>
         <record id="pcg_218100" model="account.account">
             <field name="name">Installations générales agencements aménagements divers</field>
             <field name="code">218100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_218000])]"/>
+            <field eval="[(6,0,[pcg_218000])]" name="parent_id"/>
         </record>
         <record id="pcg_218200" model="account.account">
             <field name="name">Matériel de transport</field>
             <field name="code">218200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_218000])]"/>
+            <field eval="[(6,0,[pcg_218000])]" name="parent_id"/>
         </record>
         <record id="pcg_218300" model="account.account">
             <field name="name">Matériel de bureau et matériel informatique </field>
             <field name="code">218300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_218000])]"/>
+            <field eval="[(6,0,[pcg_218000])]" name="parent_id"/>
         </record>
         <record id="pcg_218400" model="account.account">
             <field name="name">Mobilier</field>
             <field name="code">218400</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_218000])]"/>
+            <field eval="[(6,0,[pcg_218000])]" name="parent_id"/>
         </record>
         <record id="pcg_218500" model="account.account">
             <field name="name">Cheptel</field>
             <field name="code">218500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_218000])]"/>
+            <field eval="[(6,0,[pcg_218000])]" name="parent_id"/>
         </record>
         <record id="pcg_218600" model="account.account">
             <field name="name">Emballages récupérables</field>
             <field name="code">218600</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_218000])]"/>
+            <field eval="[(6,0,[pcg_218000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_22" model="account.account">
             <field name="name">Immobilisations mises en concession</field>
             <field name="code">Comptes_22</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_23" model="account.account">
             <field name="name">Immobilisations en cours</field>
             <field name="code">Comptes_23</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_231000" model="account.account">
             <field name="name">Immobilisations corporelles en cours</field>
             <field name="code">231000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_23])]"/>
+            <field eval="[(6,0,[pcg_Comptes_23])]" name="parent_id"/>
         </record>
         <record id="pcg_231200" model="account.account">
             <field name="name">Terrains</field>
@@ -1758,117 +1758,117 @@
             <field name="type">immobilisations</field>
             <field name="note">ne s'amortissent pas</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_231000])]"/>
+            <field eval="[(6,0,[pcg_231000])]" name="parent_id"/>
         </record>
         <record id="pcg_231300" model="account.account">
             <field name="name">Constructions</field>
             <field name="code">231300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_231000])]"/>
+            <field eval="[(6,0,[pcg_231000])]" name="parent_id"/>
         </record>
         <record id="pcg_231500" model="account.account">
             <field name="name">Installations techniques matériel et outillage industriels</field>
             <field name="code">231500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_231000])]"/>
+            <field eval="[(6,0,[pcg_231000])]" name="parent_id"/>
         </record>
         <record id="pcg_231800" model="account.account">
             <field name="name">Autres immobilisations corporelles</field>
             <field name="code">231800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_231000])]"/>
+            <field eval="[(6,0,[pcg_231000])]" name="parent_id"/>
         </record>
         <record id="pcg_232000" model="account.account">
             <field name="name">Immobilisations incorporelles en cours </field>
             <field name="code">232000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_23])]"/>
+            <field eval="[(6,0,[pcg_Comptes_23])]" name="parent_id"/>
         </record>
         <record id="pcg_237000" model="account.account">
             <field name="name">Avances et acomptes versés sur immobilisations incorporelles</field>
             <field name="code">237000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_23])]"/>
+            <field eval="[(6,0,[pcg_Comptes_23])]" name="parent_id"/>
         </record>
         <record id="pcg_238000" model="account.account">
             <field name="name">Avances et acomptes versés sur commandes d'immobilisations corporelles</field>
             <field name="code">238000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_23])]"/>
+            <field eval="[(6,0,[pcg_Comptes_23])]" name="parent_id"/>
         </record>
         <record id="pcg_238200" model="account.account">
             <field name="name">Terrains</field>
             <field name="code">238200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_238000])]"/>
+            <field eval="[(6,0,[pcg_238000])]" name="parent_id"/>
         </record>
         <record id="pcg_238300" model="account.account">
             <field name="name">Constructions</field>
             <field name="code">238300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_238000])]"/>
+            <field eval="[(6,0,[pcg_238000])]" name="parent_id"/>
         </record>
         <record id="pcg_238500" model="account.account">
             <field name="name">Installations techniques matériel et outillage industriels</field>
             <field name="code">238500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_238000])]"/>
+            <field eval="[(6,0,[pcg_238000])]" name="parent_id"/>
         </record>
         <record id="pcg_238800" model="account.account">
             <field name="name">Autres immobilisations corporelles</field>
             <field name="code">238800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_238000])]"/>
+            <field eval="[(6,0,[pcg_238000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_25" model="account.account">
             <field name="name">Parts dans des entreprises liées et créances dans des entreprises liées</field>
             <field name="code">Comptes_25</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_26" model="account.account">
             <field name="name">Participations et créances rattachées à des participations</field>
             <field name="code">Comptes_26</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_261000" model="account.account">
             <field name="name">Titres de participation</field>
@@ -1876,27 +1876,27 @@
             <field name="type">immobilisations</field>
             <field name="note">ne s'amortissent pas</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_26])]"/>
+            <field eval="[(6,0,[pcg_Comptes_26])]" name="parent_id"/>
         </record>
         <record id="pcg_261100" model="account.account">
             <field name="name">Actions</field>
             <field name="code">261100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_261000])]"/>
+            <field eval="[(6,0,[pcg_261000])]" name="parent_id"/>
         </record>
         <record id="pcg_261800" model="account.account">
             <field name="name">Autres titres</field>
             <field name="code">261800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_261000])]"/>
+            <field eval="[(6,0,[pcg_261000])]" name="parent_id"/>
         </record>
         <record id="pcg_266000" model="account.account">
             <field name="name">Autres formes de participation</field>
@@ -1904,108 +1904,108 @@
             <field name="type">immobilisations</field>
             <field name="note">ne s'amortissent pas</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_26])]"/>
+            <field eval="[(6,0,[pcg_Comptes_26])]" name="parent_id"/>
         </record>
         <record id="pcg_267000" model="account.account">
             <field name="name">Créances rattachées à des participations</field>
             <field name="code">267000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_26])]"/>
+            <field eval="[(6,0,[pcg_Comptes_26])]" name="parent_id"/>
         </record>
         <record id="pcg_267100" model="account.account">
             <field name="name">Créances rattachées à des participations (groupe)</field>
             <field name="code">267100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_267000])]"/>
+            <field eval="[(6,0,[pcg_267000])]" name="parent_id"/>
         </record>
         <record id="pcg_267400" model="account.account">
             <field name="name">Créances rattachées à des participations (hors groupe)</field>
             <field name="code">267400</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_267000])]"/>
+            <field eval="[(6,0,[pcg_267000])]" name="parent_id"/>
         </record>
         <record id="pcg_267500" model="account.account">
             <field name="name">Versements représentatifs d'apports non capitalisés (appel de fonds)</field>
             <field name="code">267500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_267000])]"/>
+            <field eval="[(6,0,[pcg_267000])]" name="parent_id"/>
         </record>
         <record id="pcg_267600" model="account.account">
             <field name="name">Avances consolidables</field>
             <field name="code">267600</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_267000])]"/>
+            <field eval="[(6,0,[pcg_267000])]" name="parent_id"/>
         </record>
         <record id="pcg_267700" model="account.account">
             <field name="name">Autres créances rattachées à des participations </field>
             <field name="code">267700</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_267000])]"/>
+            <field eval="[(6,0,[pcg_267000])]" name="parent_id"/>
         </record>
         <record id="pcg_267800" model="account.account">
             <field name="name">Intérêts courus</field>
             <field name="code">267800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_267000])]"/>
+            <field eval="[(6,0,[pcg_267000])]" name="parent_id"/>
         </record>
         <record id="pcg_268000" model="account.account">
             <field name="name">Créances rattachées à des sociétés en participation</field>
             <field name="code">268000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_26])]"/>
+            <field eval="[(6,0,[pcg_Comptes_26])]" name="parent_id"/>
         </record>
         <record id="pcg_268100" model="account.account">
             <field name="name">Principal</field>
             <field name="code">268100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_268000])]"/>
+            <field eval="[(6,0,[pcg_268000])]" name="parent_id"/>
         </record>
         <record id="pcg_268800" model="account.account">
             <field name="name">Intérêts courus</field>
             <field name="code">268800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_268000])]"/>
+            <field eval="[(6,0,[pcg_268000])]" name="parent_id"/>
         </record>
         <record id="pcg_269000" model="account.account">
             <field name="name">Versements restant à effectuer sur titres de participation non libérés</field>
             <field name="code">269000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_26])]"/>
+            <field eval="[(6,0,[pcg_Comptes_26])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_27" model="account.account">
             <field name="name">Autres immobilisations financières</field>
@@ -2013,117 +2013,117 @@
             <field name="type">view</field>
             <field name="note">ne s'amortissent pas</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_271000" model="account.account">
             <field name="name">Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille (droit de propriété)</field>
             <field name="code">271000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_27])]"/>
+            <field eval="[(6,0,[pcg_Comptes_27])]" name="parent_id"/>
         </record>
         <record id="pcg_271100" model="account.account">
             <field name="name">Actions</field>
             <field name="code">271100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_271000])]"/>
+            <field eval="[(6,0,[pcg_271000])]" name="parent_id"/>
         </record>
         <record id="pcg_271800" model="account.account">
             <field name="name">Autres titres</field>
             <field name="code">271800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_271000])]"/>
+            <field eval="[(6,0,[pcg_271000])]" name="parent_id"/>
         </record>
         <record id="pcg_272000" model="account.account">
             <field name="name">Titres immobilisés (droit de créance)</field>
             <field name="code">272000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_27])]"/>
+            <field eval="[(6,0,[pcg_Comptes_27])]" name="parent_id"/>
         </record>
         <record id="pcg_272100" model="account.account">
             <field name="name">Obligations</field>
             <field name="code">272100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_272000])]"/>
+            <field eval="[(6,0,[pcg_272000])]" name="parent_id"/>
         </record>
         <record id="pcg_272200" model="account.account">
             <field name="name">Bons</field>
             <field name="code">272200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_272000])]"/>
+            <field eval="[(6,0,[pcg_272000])]" name="parent_id"/>
         </record>
         <record id="pcg_273000" model="account.account">
             <field name="name">Titres immobilisés de l'activité de portefeuille</field>
             <field name="code">273000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_27])]"/>
+            <field eval="[(6,0,[pcg_Comptes_27])]" name="parent_id"/>
         </record>
         <record id="pcg_274000" model="account.account">
             <field name="name">Prêts</field>
             <field name="code">274000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_27])]"/>
+            <field eval="[(6,0,[pcg_Comptes_27])]" name="parent_id"/>
         </record>
         <record id="pcg_274100" model="account.account">
             <field name="name">Prêts participatifs</field>
             <field name="code">274100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_274000])]"/>
+            <field eval="[(6,0,[pcg_274000])]" name="parent_id"/>
         </record>
         <record id="pcg_274200" model="account.account">
             <field name="name">Prêts aux associés</field>
             <field name="code">274200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_274000])]"/>
+            <field eval="[(6,0,[pcg_274000])]" name="parent_id"/>
         </record>
         <record id="pcg_274300" model="account.account">
             <field name="name">Prêts au personnel</field>
             <field name="code">274300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_274000])]"/>
+            <field eval="[(6,0,[pcg_274000])]" name="parent_id"/>
         </record>
         <record id="pcg_274800" model="account.account">
             <field name="name">Autres prêts</field>
             <field name="code">274800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_274000])]"/>
+            <field eval="[(6,0,[pcg_274000])]" name="parent_id"/>
         </record>
         <record id="pcg_275000" model="account.account">
             <field name="name">Dépôts et cautionnements versés</field>
@@ -2131,126 +2131,126 @@
             <field name="type">immobilisations</field>
             <field name="note">ex : badge autoroute...</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_27])]"/>
+            <field eval="[(6,0,[pcg_Comptes_27])]" name="parent_id"/>
         </record>
         <record id="pcg_275100" model="account.account">
             <field name="name">Dépôts</field>
             <field name="code">275100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_275000])]"/>
+            <field eval="[(6,0,[pcg_275000])]" name="parent_id"/>
         </record>
         <record id="pcg_275500" model="account.account">
             <field name="name">Cautionnements</field>
             <field name="code">275500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_275000])]"/>
+            <field eval="[(6,0,[pcg_275000])]" name="parent_id"/>
         </record>
         <record id="pcg_276000" model="account.account">
             <field name="name">Autres créances immobilisées</field>
             <field name="code">276000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_27])]"/>
+            <field eval="[(6,0,[pcg_Comptes_27])]" name="parent_id"/>
         </record>
         <record id="pcg_276100" model="account.account">
             <field name="name">Créances diverses</field>
             <field name="code">276100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_276000])]"/>
+            <field eval="[(6,0,[pcg_276000])]" name="parent_id"/>
         </record>
         <record id="pcg_276800" model="account.account">
             <field name="name">Intérêts courus</field>
             <field name="code">276800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_276000])]"/>
+            <field eval="[(6,0,[pcg_276000])]" name="parent_id"/>
         </record>
         <record id="pcg_276820" model="account.account">
             <field name="name">Sur titres immobilisés (droits de créance)</field>
             <field name="code">276820</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_276800])]"/>
+            <field eval="[(6,0,[pcg_276800])]" name="parent_id"/>
         </record>
         <record id="pcg_276840" model="account.account">
             <field name="name">Sur prêts</field>
             <field name="code">276840</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_276800])]"/>
+            <field eval="[(6,0,[pcg_276800])]" name="parent_id"/>
         </record>
         <record id="pcg_276850" model="account.account">
             <field name="name">Sur dépôts et cautionnements</field>
             <field name="code">276850</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_276800])]"/>
+            <field eval="[(6,0,[pcg_276800])]" name="parent_id"/>
         </record>
         <record id="pcg_276880" model="account.account">
             <field name="name">Sur créances diverses</field>
             <field name="code">276880</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_276800])]"/>
+            <field eval="[(6,0,[pcg_276800])]" name="parent_id"/>
         </record>
         <record id="pcg_277000" model="account.account">
             <field name="name">Actions propres ou parts propres</field>
             <field name="code">277000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_27])]"/>
+            <field eval="[(6,0,[pcg_Comptes_27])]" name="parent_id"/>
         </record>
         <record id="pcg_277100" model="account.account">
             <field name="name">Actions propres ou parts propres</field>
             <field name="code">277100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_277000])]"/>
+            <field eval="[(6,0,[pcg_277000])]" name="parent_id"/>
         </record>
         <record id="pcg_277200" model="account.account">
             <field name="name">Actions propres ou parts propres en voie d'annulation</field>
             <field name="code">277200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_277000])]"/>
+            <field eval="[(6,0,[pcg_277000])]" name="parent_id"/>
         </record>
         <record id="pcg_279000" model="account.account">
             <field name="name">Versements restant à effectuer sur titres immobilisés non libérés</field>
             <field name="code">279000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_27])]"/>
+            <field eval="[(6,0,[pcg_Comptes_27])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_28" model="account.account">
             <field name="name">Amortissement des immobilisations</field>
@@ -2258,135 +2258,135 @@
             <field name="type">view</field>
             <field name="note">cf tableau des taux sur erp-libre.info</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_280000" model="account.account">
             <field name="name">Amortissements des immobilisations incorporelles</field>
             <field name="code">280000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_28])]"/>
+            <field eval="[(6,0,[pcg_Comptes_28])]" name="parent_id"/>
         </record>
         <record id="pcg_280100" model="account.account">
             <field name="name">Frais d'établissement (même ventilation que celle du compte 201) </field>
             <field name="code">280100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_280000])]"/>
+            <field eval="[(6,0,[pcg_280000])]" name="parent_id"/>
         </record>
         <record id="pcg_280300" model="account.account">
             <field name="name">Frais de recherche et de développement </field>
             <field name="code">280300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_280000])]"/>
+            <field eval="[(6,0,[pcg_280000])]" name="parent_id"/>
         </record>
         <record id="pcg_280500" model="account.account">
             <field name="name">Concessions et droits similaires brevets licences logiciels droits et valeurs similaires</field>
             <field name="code">280500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_280000])]"/>
+            <field eval="[(6,0,[pcg_280000])]" name="parent_id"/>
         </record>
         <record id="pcg_280700" model="account.account">
             <field name="name">Fonds commercial</field>
             <field name="code">280700</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_280000])]"/>
+            <field eval="[(6,0,[pcg_280000])]" name="parent_id"/>
         </record>
         <record id="pcg_280800" model="account.account">
             <field name="name">Autres immobilisations incorporelles</field>
             <field name="code">280800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_280000])]"/>
+            <field eval="[(6,0,[pcg_280000])]" name="parent_id"/>
         </record>
         <record id="pcg_281000" model="account.account">
             <field name="name">Amortissements des immobilisations corporelles</field>
             <field name="code">281000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_28])]"/>
+            <field eval="[(6,0,[pcg_Comptes_28])]" name="parent_id"/>
         </record>
         <record id="pcg_281100" model="account.account">
             <field name="name">Terrains de gisement</field>
             <field name="code">281100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_281000])]"/>
+            <field eval="[(6,0,[pcg_281000])]" name="parent_id"/>
         </record>
         <record id="pcg_281200" model="account.account">
             <field name="name">Agencements aménagements de terrains (même ventilation que celle du compte 212)</field>
             <field name="code">281200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_281000])]"/>
+            <field eval="[(6,0,[pcg_281000])]" name="parent_id"/>
         </record>
         <record id="pcg_281300" model="account.account">
             <field name="name">Constructions (même ventilation que celle du compte 213)</field>
             <field name="code">281300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_281000])]"/>
+            <field eval="[(6,0,[pcg_281000])]" name="parent_id"/>
         </record>
         <record id="pcg_281400" model="account.account">
             <field name="name">Constructions sur sol d'autrui (même ventilation que celle du compte 214)</field>
             <field name="code">281400</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_281000])]"/>
+            <field eval="[(6,0,[pcg_281000])]" name="parent_id"/>
         </record>
         <record id="pcg_281500" model="account.account">
             <field name="name">Installations matériel et outillage industriels (même ventilation que celle du compte 215)</field>
             <field name="code">281500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_281000])]"/>
+            <field eval="[(6,0,[pcg_281000])]" name="parent_id"/>
         </record>
         <record id="pcg_281800" model="account.account">
             <field name="name">Autres immobilisations corporelles (même ventilation que celle du compte 218)</field>
             <field name="code">281800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_281000])]"/>
+            <field eval="[(6,0,[pcg_281000])]" name="parent_id"/>
         </record>
         <record id="pcg_282000" model="account.account">
             <field name="name">Amortissements des immobilisations mises en concession</field>
             <field name="code">282000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_28])]"/>
+            <field eval="[(6,0,[pcg_Comptes_28])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_29" model="account.account">
             <field name="name">Dépréciation des immobilisations</field>
@@ -2394,216 +2394,216 @@
             <field name="type">view</field>
             <field name="note">sur immos non amorties mais qui déprécient</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_2])]"/>
+            <field eval="[(6,0,[pcg_Classe_2])]" name="parent_id"/>
         </record>
         <record id="pcg_290000" model="account.account">
             <field name="name">Dépréciations des immobilisations incorporelles</field>
             <field name="code">290000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_29])]"/>
+            <field eval="[(6,0,[pcg_Comptes_29])]" name="parent_id"/>
         </record>
         <record id="pcg_290500" model="account.account">
             <field name="name">Marques procédés droits et valeurs similaires </field>
             <field name="code">290500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_290000])]"/>
+            <field eval="[(6,0,[pcg_290000])]" name="parent_id"/>
         </record>
         <record id="pcg_290600" model="account.account">
             <field name="name">Droit au bail</field>
             <field name="code">290600</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_290000])]"/>
+            <field eval="[(6,0,[pcg_290000])]" name="parent_id"/>
         </record>
         <record id="pcg_290700" model="account.account">
             <field name="name">Fonds commercial</field>
             <field name="code">290700</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_290000])]"/>
+            <field eval="[(6,0,[pcg_290000])]" name="parent_id"/>
         </record>
         <record id="pcg_290800" model="account.account">
             <field name="name">Autres immobilisations incorporelles</field>
             <field name="code">290800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_290000])]"/>
+            <field eval="[(6,0,[pcg_290000])]" name="parent_id"/>
         </record>
         <record id="pcg_291000" model="account.account">
             <field name="name">Dépréciations des immobilisations corporelles (même ventilation que celle du compte 21)</field>
             <field name="code">291000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_29])]"/>
+            <field eval="[(6,0,[pcg_Comptes_29])]" name="parent_id"/>
         </record>
         <record id="pcg_291100" model="account.account">
             <field name="name">Terrains (autres que terrains de gisement)</field>
             <field name="code">291100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_291000])]"/>
+            <field eval="[(6,0,[pcg_291000])]" name="parent_id"/>
         </record>
         <record id="pcg_292000" model="account.account">
             <field name="name">Dépréciations des immobilisations mises en concession</field>
             <field name="code">292000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_29])]"/>
+            <field eval="[(6,0,[pcg_Comptes_29])]" name="parent_id"/>
         </record>
         <record id="pcg_293000" model="account.account">
             <field name="name">Dépréciations des immobilisations en cours</field>
             <field name="code">293000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_29])]"/>
+            <field eval="[(6,0,[pcg_Comptes_29])]" name="parent_id"/>
         </record>
         <record id="pcg_293100" model="account.account">
             <field name="name">Immobilisations corporelles en cours</field>
             <field name="code">293100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_293000])]"/>
+            <field eval="[(6,0,[pcg_293000])]" name="parent_id"/>
         </record>
         <record id="pcg_293200" model="account.account">
             <field name="name">Immobilisations incorporelles en cours</field>
             <field name="code">293200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_293000])]"/>
+            <field eval="[(6,0,[pcg_293000])]" name="parent_id"/>
         </record>
         <record id="pcg_296000" model="account.account">
             <field name="name">Provisions pour dépréciation des participations et créances rattachées à des participations</field>
             <field name="code">296000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_29])]"/>
+            <field eval="[(6,0,[pcg_Comptes_29])]" name="parent_id"/>
         </record>
         <record id="pcg_296100" model="account.account">
             <field name="name">Titres de participation</field>
             <field name="code">296100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_296000])]"/>
+            <field eval="[(6,0,[pcg_296000])]" name="parent_id"/>
         </record>
         <record id="pcg_296600" model="account.account">
             <field name="name">Autres formes de participation</field>
             <field name="code">296600</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_296000])]"/>
+            <field eval="[(6,0,[pcg_296000])]" name="parent_id"/>
         </record>
         <record id="pcg_296700" model="account.account">
             <field name="name">Créances rattachées à des participations (même ventilation que celle du compte 267)</field>
             <field name="code">296700</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_296000])]"/>
+            <field eval="[(6,0,[pcg_296000])]" name="parent_id"/>
         </record>
         <record id="pcg_296800" model="account.account">
             <field name="name">Créances rattachées à des sociétés en participation (même ventilation que elle du compte 268)</field>
             <field name="code">296800</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_296000])]"/>
+            <field eval="[(6,0,[pcg_296000])]" name="parent_id"/>
         </record>
         <record id="pcg_297000" model="account.account">
             <field name="name">Provisions pour dépréciation des autres immobilisations financières</field>
             <field name="code">297000</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_29])]"/>
+            <field eval="[(6,0,[pcg_Comptes_29])]" name="parent_id"/>
         </record>
         <record id="pcg_297100" model="account.account">
             <field name="name">Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille - droit de propriété </field>
             <field name="code">297100</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_297000])]"/>
+            <field eval="[(6,0,[pcg_297000])]" name="parent_id"/>
         </record>
         <record id="pcg_297200" model="account.account">
             <field name="name">Titres immobilisés - droit de créance (même ventilation que celle du compte 272) </field>
             <field name="code">297200</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_297000])]"/>
+            <field eval="[(6,0,[pcg_297000])]" name="parent_id"/>
         </record>
         <record id="pcg_297300" model="account.account">
             <field name="name">Titres immobilisés de l'activité de portefeuille</field>
             <field name="code">297300</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_297000])]"/>
+            <field eval="[(6,0,[pcg_297000])]" name="parent_id"/>
         </record>
         <record id="pcg_297400" model="account.account">
             <field name="name">Prêts (même ventilation que celle du compte 274)</field>
             <field name="code">297400</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_297000])]"/>
+            <field eval="[(6,0,[pcg_297000])]" name="parent_id"/>
         </record>
         <record id="pcg_297500" model="account.account">
             <field name="name">Dépôts et cautionnements versés (même ventilation que celle du compte 275)</field>
             <field name="code">297500</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_297000])]"/>
+            <field eval="[(6,0,[pcg_297000])]" name="parent_id"/>
         </record>
         <record id="pcg_297600" model="account.account">
             <field name="name">Autres créances immobilisées (même ventilation que celle du compte 276)</field>
             <field name="code">297600</field>
             <field name="type">immobilisations</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_297000])]"/>
+            <field eval="[(6,0,[pcg_297000])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_3" model="account.account">
             <field name="name">Comptes de stocks et d'en-cours</field>
@@ -2611,657 +2611,657 @@
             <field name="type">view</field>
             <field name="note">valorisation aux inventaires voir erp-libre.info</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_1_a_5])]"/>
+            <field eval="[(6,0,[pcg_Classes_1_a_5])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_31" model="account.account">
             <field name="name">Matières premières et fournitures</field>
             <field name="code">Comptes_31</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_311000" model="account.account">
             <field name="name">Matière (ou groupe) A</field>
             <field name="code">311000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_31])]"/>
+            <field eval="[(6,0,[pcg_Comptes_31])]" name="parent_id"/>
         </record>
         <record id="pcg_312000" model="account.account">
             <field name="name">Matière (ou groupe) B</field>
             <field name="code">312000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_31])]"/>
+            <field eval="[(6,0,[pcg_Comptes_31])]" name="parent_id"/>
         </record>
         <record id="pcg_317000" model="account.account">
             <field name="name">Fournitures A B C</field>
             <field name="code">317000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_31])]"/>
+            <field eval="[(6,0,[pcg_Comptes_31])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_32" model="account.account">
             <field name="name">Autres approvisionnements</field>
             <field name="code">Comptes_32</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_321000" model="account.account">
             <field name="name">Matières consommables</field>
             <field name="code">321000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_32])]"/>
+            <field eval="[(6,0,[pcg_Comptes_32])]" name="parent_id"/>
         </record>
         <record id="pcg_321100" model="account.account">
             <field name="name">Matière (ou groupe) C</field>
             <field name="code">321100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_321000])]"/>
+            <field eval="[(6,0,[pcg_321000])]" name="parent_id"/>
         </record>
         <record id="pcg_321200" model="account.account">
             <field name="name">Matière (ou groupe) D</field>
             <field name="code">321200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_321000])]"/>
+            <field eval="[(6,0,[pcg_321000])]" name="parent_id"/>
         </record>
         <record id="pcg_322000" model="account.account">
             <field name="name">Fournitures consommables</field>
             <field name="code">322000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_32])]"/>
+            <field eval="[(6,0,[pcg_Comptes_32])]" name="parent_id"/>
         </record>
         <record id="pcg_322100" model="account.account">
             <field name="name">Combustibles</field>
             <field name="code">322100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_322000])]"/>
+            <field eval="[(6,0,[pcg_322000])]" name="parent_id"/>
         </record>
         <record id="pcg_322200" model="account.account">
             <field name="name">Produits d'entretien</field>
             <field name="code">322200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_322000])]"/>
+            <field eval="[(6,0,[pcg_322000])]" name="parent_id"/>
         </record>
         <record id="pcg_322300" model="account.account">
             <field name="name">Fournitures d'atelier et d usine</field>
             <field name="code">322300</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_322000])]"/>
+            <field eval="[(6,0,[pcg_322000])]" name="parent_id"/>
         </record>
         <record id="pcg_322400" model="account.account">
             <field name="name">Fournitures de magasin</field>
             <field name="code">322400</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_322000])]"/>
+            <field eval="[(6,0,[pcg_322000])]" name="parent_id"/>
         </record>
         <record id="pcg_322500" model="account.account">
             <field name="name">Fournitures de bureau</field>
             <field name="code">322500</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_322000])]"/>
+            <field eval="[(6,0,[pcg_322000])]" name="parent_id"/>
         </record>
         <record id="pcg_326000" model="account.account">
             <field name="name">Emballages</field>
             <field name="code">326000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_32])]"/>
+            <field eval="[(6,0,[pcg_Comptes_32])]" name="parent_id"/>
         </record>
         <record id="pcg_326100" model="account.account">
             <field name="name">Emballages perdus</field>
             <field name="code">326100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_326000])]"/>
+            <field eval="[(6,0,[pcg_326000])]" name="parent_id"/>
         </record>
         <record id="pcg_326500" model="account.account">
             <field name="name">Emballages récupérables non identifiables</field>
             <field name="code">326500</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_326000])]"/>
+            <field eval="[(6,0,[pcg_326000])]" name="parent_id"/>
         </record>
         <record id="pcg_326700" model="account.account">
             <field name="name">Emballages à usage mixte</field>
             <field name="code">326700</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_326000])]"/>
+            <field eval="[(6,0,[pcg_326000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_33" model="account.account">
             <field name="name">En-cours de production de biens</field>
             <field name="code">Comptes_33</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_331000" model="account.account">
             <field name="name">Produits en cours</field>
             <field name="code">331000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_33])]"/>
+            <field eval="[(6,0,[pcg_Comptes_33])]" name="parent_id"/>
         </record>
         <record id="pcg_331100" model="account.account">
             <field name="name">Produit en cours P 1</field>
             <field name="code">331100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_331000])]"/>
+            <field eval="[(6,0,[pcg_331000])]" name="parent_id"/>
         </record>
         <record id="pcg_331200" model="account.account">
             <field name="name">Produit en cours P 2</field>
             <field name="code">331200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_331000])]"/>
+            <field eval="[(6,0,[pcg_331000])]" name="parent_id"/>
         </record>
         <record id="pcg_335000" model="account.account">
             <field name="name">Travaux en cours</field>
             <field name="code">335000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_33])]"/>
+            <field eval="[(6,0,[pcg_Comptes_33])]" name="parent_id"/>
         </record>
         <record id="pcg_335100" model="account.account">
             <field name="name">Travaux en cours T 1</field>
             <field name="code">335100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_335000])]"/>
+            <field eval="[(6,0,[pcg_335000])]" name="parent_id"/>
         </record>
         <record id="pcg_335200" model="account.account">
             <field name="name">Travaux en cours T 2</field>
             <field name="code">335200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_335000])]"/>
+            <field eval="[(6,0,[pcg_335000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_34" model="account.account">
             <field name="name">En-cours de production de services</field>
             <field name="code">Comptes_34</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_341000" model="account.account">
             <field name="name">Études en cours</field>
             <field name="code">341000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_34])]"/>
+            <field eval="[(6,0,[pcg_Comptes_34])]" name="parent_id"/>
         </record>
         <record id="pcg_341100" model="account.account">
             <field name="name">Études en cours E 1</field>
             <field name="code">341100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_341000])]"/>
+            <field eval="[(6,0,[pcg_341000])]" name="parent_id"/>
         </record>
         <record id="pcg_341200" model="account.account">
             <field name="name">Études en cours E 2</field>
             <field name="code">341200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_341000])]"/>
+            <field eval="[(6,0,[pcg_341000])]" name="parent_id"/>
         </record>
         <record id="pcg_345000" model="account.account">
             <field name="name">Prestations de services en cours</field>
             <field name="code">345000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_34])]"/>
+            <field eval="[(6,0,[pcg_Comptes_34])]" name="parent_id"/>
         </record>
         <record id="pcg_345100" model="account.account">
             <field name="name">Prestations de services S 1</field>
             <field name="code">345100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_345000])]"/>
+            <field eval="[(6,0,[pcg_345000])]" name="parent_id"/>
         </record>
         <record id="pcg_345200" model="account.account">
             <field name="name"> Prestations de services S 2</field>
             <field name="code">345200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_345000])]"/>
+            <field eval="[(6,0,[pcg_345000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_35" model="account.account">
             <field name="name">Stocks de produits</field>
             <field name="code">Comptes_35</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_351000" model="account.account">
             <field name="name">Produits intermédiaires</field>
             <field name="code">351000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_35])]"/>
+            <field eval="[(6,0,[pcg_Comptes_35])]" name="parent_id"/>
         </record>
         <record id="pcg_351100" model="account.account">
             <field name="name">Produits intermédiaires (ou groupe) A </field>
             <field name="code">351100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_351000])]"/>
+            <field eval="[(6,0,[pcg_351000])]" name="parent_id"/>
         </record>
         <record id="pcg_351200" model="account.account">
             <field name="name">Produits intermédiaires (ou groupe) B</field>
             <field name="code">351200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_351000])]"/>
+            <field eval="[(6,0,[pcg_351000])]" name="parent_id"/>
         </record>
         <record id="pcg_355000" model="account.account">
             <field name="name">Produits finis</field>
             <field name="code">355000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_35])]"/>
+            <field eval="[(6,0,[pcg_Comptes_35])]" name="parent_id"/>
         </record>
         <record id="pcg_355100" model="account.account">
             <field name="name">Produits finis (ou groupe) A</field>
             <field name="code">355100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_355000])]"/>
+            <field eval="[(6,0,[pcg_355000])]" name="parent_id"/>
         </record>
         <record id="pcg_355200" model="account.account">
             <field name="name">Produits finis (ou groupe) B</field>
             <field name="code">355200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_355000])]"/>
+            <field eval="[(6,0,[pcg_355000])]" name="parent_id"/>
         </record>
         <record id="pcg_358000" model="account.account">
             <field name="name">Produits résiduels (ou matières de récupération)</field>
             <field name="code">358000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_35])]"/>
+            <field eval="[(6,0,[pcg_Comptes_35])]" name="parent_id"/>
         </record>
         <record id="pcg_358100" model="account.account">
             <field name="name">Déchets</field>
             <field name="code">358100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_358000])]"/>
+            <field eval="[(6,0,[pcg_358000])]" name="parent_id"/>
         </record>
         <record id="pcg_358500" model="account.account">
             <field name="name">Rebuts</field>
             <field name="code">358500</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_358000])]"/>
+            <field eval="[(6,0,[pcg_358000])]" name="parent_id"/>
         </record>
         <record id="pcg_358600" model="account.account">
             <field name="name">Matières de récupération</field>
             <field name="code">358600</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_358000])]"/>
+            <field eval="[(6,0,[pcg_358000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_36" model="account.account">
             <field name="name">Stocks provenant d'immobilisations</field>
             <field name="code">Comptes_36</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_37" model="account.account">
             <field name="name">Stocks de marchandises</field>
             <field name="code">Comptes_37</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_371000" model="account.account">
             <field name="name">Marchandises (ou groupe) A</field>
             <field name="code">371000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_37])]"/>
+            <field eval="[(6,0,[pcg_Comptes_37])]" name="parent_id"/>
         </record>
         <record id="pcg_372000" model="account.account">
             <field name="name">Marchandises (ou groupe) B</field>
             <field name="code">372000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_37])]"/>
+            <field eval="[(6,0,[pcg_Comptes_37])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_38" model="account.account">
             <field name="name">Stocks en voie d'acheminement</field>
             <field name="code">Comptes_38</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_39" model="account.account">
             <field name="name">Provisions pour dépréciation des stocks et en-cours</field>
             <field name="code">Comptes_39</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_3])]"/>
+            <field eval="[(6,0,[pcg_Classe_3])]" name="parent_id"/>
         </record>
         <record id="pcg_391000" model="account.account">
             <field name="name">Provisions pour dépréciation des matières premières (et fournitures)</field>
             <field name="code">391000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_39])]"/>
+            <field eval="[(6,0,[pcg_Comptes_39])]" name="parent_id"/>
         </record>
         <record id="pcg_391100" model="account.account">
             <field name="name">Matières (ou groupe) A</field>
             <field name="code">391100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_391000])]"/>
+            <field eval="[(6,0,[pcg_391000])]" name="parent_id"/>
         </record>
         <record id="pcg_391200" model="account.account">
             <field name="name">Matières (ou groupe) B</field>
             <field name="code">391200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_391000])]"/>
+            <field eval="[(6,0,[pcg_391000])]" name="parent_id"/>
         </record>
         <record id="pcg_391700" model="account.account">
             <field name="name">Fournitures A B C</field>
             <field name="code">391700</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_391000])]"/>
+            <field eval="[(6,0,[pcg_391000])]" name="parent_id"/>
         </record>
         <record id="pcg_392000" model="account.account">
             <field name="name">Provisions pour dépréciation des autres approvisionnements</field>
             <field name="code">392000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_39])]"/>
+            <field eval="[(6,0,[pcg_Comptes_39])]" name="parent_id"/>
         </record>
         <record id="pcg_392100" model="account.account">
             <field name="name">Matières consommables (même ventilation que celle du compte 321)</field>
             <field name="code">392100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_392000])]"/>
+            <field eval="[(6,0,[pcg_392000])]" name="parent_id"/>
         </record>
         <record id="pcg_392200" model="account.account">
             <field name="name">Fournitures consommables (même ventilation que celle du compte 322)</field>
             <field name="code">392200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_392000])]"/>
+            <field eval="[(6,0,[pcg_392000])]" name="parent_id"/>
         </record>
         <record id="pcg_392600" model="account.account">
             <field name="name">Emballages (même ventilation que celle du compte 326)</field>
             <field name="code">392600</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_392000])]"/>
+            <field eval="[(6,0,[pcg_392000])]" name="parent_id"/>
         </record>
         <record id="pcg_393000" model="account.account">
             <field name="name">Provisions pour dépréciation des en-cours de production de biens</field>
             <field name="code">393000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_39])]"/>
+            <field eval="[(6,0,[pcg_Comptes_39])]" name="parent_id"/>
         </record>
         <record id="pcg_393100" model="account.account">
             <field name="name">Produits en cours (même ventilation que celle du compte 331)</field>
             <field name="code">393100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_393000])]"/>
+            <field eval="[(6,0,[pcg_393000])]" name="parent_id"/>
         </record>
         <record id="pcg_393500" model="account.account">
             <field name="name">Travaux en cours (même ventilation que celle du compte 335)</field>
             <field name="code">393500</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_393000])]"/>
+            <field eval="[(6,0,[pcg_393000])]" name="parent_id"/>
         </record>
         <record id="pcg_394000" model="account.account">
             <field name="name">Provisions pour dépréciation des en-cours de production de services</field>
             <field name="code">394000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_39])]"/>
+            <field eval="[(6,0,[pcg_Comptes_39])]" name="parent_id"/>
         </record>
         <record id="pcg_394100" model="account.account">
             <field name="name">Études en cours (même ventilation que celle du compte 341)</field>
             <field name="code">394100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_394000])]"/>
+            <field eval="[(6,0,[pcg_394000])]" name="parent_id"/>
         </record>
         <record id="pcg_394500" model="account.account">
             <field name="name">Prestations de services en cours (même ventilation que celle du compte 345)</field>
             <field name="code">394500</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_394000])]"/>
+            <field eval="[(6,0,[pcg_394000])]" name="parent_id"/>
         </record>
         <record id="pcg_395000" model="account.account">
             <field name="name">Provisions pour dépréciation des stocks de produits</field>
             <field name="code">395000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_39])]"/>
+            <field eval="[(6,0,[pcg_Comptes_39])]" name="parent_id"/>
         </record>
         <record id="pcg_395100" model="account.account">
             <field name="name">Produits intermédiaires (même ventilation que celle du compte 351)</field>
             <field name="code">395100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_395000])]"/>
+            <field eval="[(6,0,[pcg_395000])]" name="parent_id"/>
         </record>
         <record id="pcg_395500" model="account.account">
             <field name="name">Produits finis (même ventilation que celle du compte 3551</field>
             <field name="code">395500</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_395000])]"/>
+            <field eval="[(6,0,[pcg_395000])]" name="parent_id"/>
         </record>
         <record id="pcg_397000" model="account.account">
             <field name="name">Provisions pour dépréciation des stocks de marchandises</field>
             <field name="code">397000</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_39])]"/>
+            <field eval="[(6,0,[pcg_Comptes_39])]" name="parent_id"/>
         </record>
         <record id="pcg_397100" model="account.account">
             <field name="name">Marchandises (ou groupe) A</field>
             <field name="code">397100</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_397000])]"/>
+            <field eval="[(6,0,[pcg_397000])]" name="parent_id"/>
         </record>
         <record id="pcg_397200" model="account.account">
             <field name="name">Marchandises (ou groupe) B</field>
             <field name="code">397200</field>
             <field name="type">stocks</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_397000])]"/>
+            <field eval="[(6,0,[pcg_397000])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_4" model="account.account">
             <field name="name">Comptes de tiers</field>
             <field name="code">Classe_4</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_1_a_5])]"/>
+            <field eval="[(6,0,[pcg_Classes_1_a_5])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_40" model="account.account">
             <field name="name">Fournisseurs et comptes rattachés</field>
             <field name="code">Comptes_40</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_400000" model="account.account">
             <field name="name">Fournisseurs et comptes rattachés </field>
             <field name="code">400000</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_40])]"/>
+            <field eval="[(6,0,[pcg_Comptes_40])]" name="parent_id"/>
         </record>
         <record id="pcg_401000" model="account.account">
             <field name="name">Fournisseurs</field>
@@ -3269,180 +3269,180 @@
             <field name="type">payable</field>
             <field name="note">1 compte par fournisseur + 1 divers occasionnel</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_40])]"/>
+            <field eval="[(6,0,[pcg_Comptes_40])]" name="parent_id"/>
         </record>
         <record id="pcg_401700" model="account.account">
             <field name="name">Fournisseurs - Retenues de garantie</field>
             <field name="code">401700</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_401000])]"/>
+            <field eval="[(6,0,[pcg_401000])]" name="parent_id"/>
         </record>
         <record id="pcg_403000" model="account.account">
             <field name="name">Fournisseurs - Effets à payer</field>
             <field name="code">403000</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_40])]"/>
+            <field eval="[(6,0,[pcg_Comptes_40])]" name="parent_id"/>
         </record>
         <record id="pcg_404000" model="account.account">
             <field name="name">Fournisseurs d'immobilisations</field>
             <field name="code">404000</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_40])]"/>
+            <field eval="[(6,0,[pcg_Comptes_40])]" name="parent_id"/>
         </record>
         <record id="pcg_404100" model="account.account">
             <field name="name">Fournisseurs - Achats d'immobilisations</field>
             <field name="code">404100</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_404000])]"/>
+            <field eval="[(6,0,[pcg_404000])]" name="parent_id"/>
         </record>
         <record id="pcg_404700" model="account.account">
             <field name="name">Fournisseurs d'immobilisations - Retenues de garantie</field>
             <field name="code">404700</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_404000])]"/>
+            <field eval="[(6,0,[pcg_404000])]" name="parent_id"/>
         </record>
         <record id="pcg_405000" model="account.account">
             <field name="name">Fournisseurs d'immobilisations - Effets à payer</field>
             <field name="code">405000</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_40])]"/>
+            <field eval="[(6,0,[pcg_Comptes_40])]" name="parent_id"/>
         </record>
         <record id="pcg_408000" model="account.account">
             <field name="name">Fournisseurs - Factures non parvenues</field>
             <field name="code">408000</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_40])]"/>
+            <field eval="[(6,0,[pcg_Comptes_40])]" name="parent_id"/>
         </record>
         <record id="pcg_408100" model="account.account">
             <field name="name">Fournisseurs</field>
             <field name="code">408100</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_408000])]"/>
+            <field eval="[(6,0,[pcg_408000])]" name="parent_id"/>
         </record>
         <record id="pcg_408400" model="account.account">
             <field name="name">Fournisseurs d'immobilisations </field>
             <field name="code">408400</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_408000])]"/>
+            <field eval="[(6,0,[pcg_408000])]" name="parent_id"/>
         </record>
         <record id="pcg_408800" model="account.account">
             <field name="name">Fournisseurs - Intérêts courus</field>
             <field name="code">408800</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_408000])]"/>
+            <field eval="[(6,0,[pcg_408000])]" name="parent_id"/>
         </record>
         <record id="pcg_409000" model="account.account">
             <field name="name">Fournisseurs débiteurs</field>
             <field name="code">409000</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_40])]"/>
+            <field eval="[(6,0,[pcg_Comptes_40])]" name="parent_id"/>
         </record>
         <record id="pcg_409100" model="account.account">
             <field name="name">Fournisseurs - Avances et acomptes versés sur commandes</field>
             <field name="code">409100</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_409000])]"/>
+            <field eval="[(6,0,[pcg_409000])]" name="parent_id"/>
         </record>
         <record id="pcg_409600" model="account.account">
             <field name="name">Fournisseurs - Créances pour emballages et matériel à rendre</field>
             <field name="code">409600</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_409000])]"/>
+            <field eval="[(6,0,[pcg_409000])]" name="parent_id"/>
         </record>
         <record id="pcg_409700" model="account.account">
             <field name="name">Fournisseurs - Autres avoirs</field>
             <field name="code">409700</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_409000])]"/>
+            <field eval="[(6,0,[pcg_409000])]" name="parent_id"/>
         </record>
         <record id="pcg_409710" model="account.account">
             <field name="name">Fournisseurs d'exploitation</field>
             <field name="code">409710</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_409700])]"/>
+            <field eval="[(6,0,[pcg_409700])]" name="parent_id"/>
         </record>
         <record id="pcg_409740" model="account.account">
             <field name="name">Fournisseurs d'immobilisations</field>
             <field name="code">409740</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_409700])]"/>
+            <field eval="[(6,0,[pcg_409700])]" name="parent_id"/>
         </record>
         <record id="pcg_409800" model="account.account">
             <field name="name">Rabais remises ristournes à obtenir et autres avoirs non encore reçus</field>
             <field name="code">409800</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_409000])]"/>
+            <field eval="[(6,0,[pcg_409000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_41" model="account.account">
             <field name="name">Clients et comptes rattachés</field>
             <field name="code">Comptes_41</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_410000" model="account.account">
             <field name="name">Clients et comptes rattachés </field>
             <field name="code">410000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_41])]"/>
+            <field eval="[(6,0,[pcg_Comptes_41])]" name="parent_id"/>
         </record>
         <record id="pcg_411000" model="account.account">
             <field name="name">Clients</field>
@@ -3450,567 +3450,567 @@
             <field name="type">receivable</field>
             <field name="note">1 compte par client 1 divers occasionnel</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_41])]"/>
+            <field eval="[(6,0,[pcg_Comptes_41])]" name="parent_id"/>
         </record>
         <record id="pcg_411700" model="account.account">
             <field name="name">Clients - Retenues de garantie</field>
             <field name="code">411700</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_411000])]"/>
+            <field eval="[(6,0,[pcg_411000])]" name="parent_id"/>
         </record>
         <record id="pcg_413000" model="account.account">
             <field name="name">Clients - Effets à recevoir</field>
             <field name="code">413000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_41])]"/>
+            <field eval="[(6,0,[pcg_Comptes_41])]" name="parent_id"/>
         </record>
         <record id="pcg_416000" model="account.account">
             <field name="name">Clients douteux ou litigieux</field>
             <field name="code">416000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_41])]"/>
+            <field eval="[(6,0,[pcg_Comptes_41])]" name="parent_id"/>
         </record>
         <record id="pcg_418000" model="account.account">
             <field name="name">Clients - Produits non encore facturés</field>
             <field name="code">418000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_41])]"/>
+            <field eval="[(6,0,[pcg_Comptes_41])]" name="parent_id"/>
         </record>
         <record id="pcg_418100" model="account.account">
             <field name="name">Clients - Factures à établir </field>
             <field name="code">418100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_418000])]"/>
+            <field eval="[(6,0,[pcg_418000])]" name="parent_id"/>
         </record>
         <record id="pcg_418800" model="account.account">
             <field name="name">Clients - Intérêts courus</field>
             <field name="code">418800</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_418000])]"/>
+            <field eval="[(6,0,[pcg_418000])]" name="parent_id"/>
         </record>
         <record id="pcg_419000" model="account.account">
             <field name="name">Clients créditeurs</field>
             <field name="code">419000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_41])]"/>
+            <field eval="[(6,0,[pcg_Comptes_41])]" name="parent_id"/>
         </record>
         <record id="pcg_419100" model="account.account">
             <field name="name">Clients - Avances et acomptes reçus sur commandes</field>
             <field name="code">419100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_419000])]"/>
+            <field eval="[(6,0,[pcg_419000])]" name="parent_id"/>
         </record>
         <record id="pcg_419600" model="account.account">
             <field name="name">Clients - Dettes pour emballages et matériels consignés </field>
             <field name="code">419600</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_419000])]"/>
+            <field eval="[(6,0,[pcg_419000])]" name="parent_id"/>
         </record>
         <record id="pcg_419700" model="account.account">
             <field name="name">Clients - Autres avoirs </field>
             <field name="code">419700</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_419000])]"/>
+            <field eval="[(6,0,[pcg_419000])]" name="parent_id"/>
         </record>
         <record id="pcg_419800" model="account.account">
             <field name="name">Rabais remises ristournes à accorder et autres avoirs à établir</field>
             <field name="code">419800</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_419000])]"/>
+            <field eval="[(6,0,[pcg_419000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_42" model="account.account">
             <field name="name">Personnel et comptes rattachés</field>
             <field name="code">Comptes_42</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_421000" model="account.account">
             <field name="name">Personnel - Rémunérations dues</field>
             <field name="code">421000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_42])]"/>
+            <field eval="[(6,0,[pcg_Comptes_42])]" name="parent_id"/>
         </record>
         <record id="pcg_422000" model="account.account">
             <field name="name">Comités d'entreprise d'établissement </field>
             <field name="code">422000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_42])]"/>
+            <field eval="[(6,0,[pcg_Comptes_42])]" name="parent_id"/>
         </record>
         <record id="pcg_424000" model="account.account">
             <field name="name">Participation des salariés aux résultats</field>
             <field name="code">424000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_42])]"/>
+            <field eval="[(6,0,[pcg_Comptes_42])]" name="parent_id"/>
         </record>
         <record id="pcg_424600" model="account.account">
             <field name="name">Réserve spéciale (art L 442-2 du Code du travail)</field>
             <field name="code">424600</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_424000])]"/>
+            <field eval="[(6,0,[pcg_424000])]" name="parent_id"/>
         </record>
         <record id="pcg_424800" model="account.account">
             <field name="name">Comptes courants</field>
             <field name="code">424800</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_424000])]"/>
+            <field eval="[(6,0,[pcg_424000])]" name="parent_id"/>
         </record>
         <record id="pcg_425000" model="account.account">
             <field name="name">Personnel- Avances et acomptes</field>
             <field name="code">425000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_42])]"/>
+            <field eval="[(6,0,[pcg_Comptes_42])]" name="parent_id"/>
         </record>
         <record id="pcg_426000" model="account.account">
             <field name="name">Personnel - Dépôts</field>
             <field name="code">426000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_42])]"/>
+            <field eval="[(6,0,[pcg_Comptes_42])]" name="parent_id"/>
         </record>
         <record id="pcg_427000" model="account.account">
             <field name="name">Personnel - Oppositions</field>
             <field name="code">427000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_42])]"/>
+            <field eval="[(6,0,[pcg_Comptes_42])]" name="parent_id"/>
         </record>
         <record id="pcg_428000" model="account.account">
             <field name="name">Personnel- Charges à payer et produits à recevoir</field>
             <field name="code">428000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_42])]"/>
+            <field eval="[(6,0,[pcg_Comptes_42])]" name="parent_id"/>
         </record>
         <record id="pcg_428200" model="account.account">
             <field name="name">Dettes provisionnées pour congés à payer</field>
             <field name="code">428200</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_428000])]"/>
+            <field eval="[(6,0,[pcg_428000])]" name="parent_id"/>
         </record>
         <record id="pcg_428400" model="account.account">
             <field name="name">Dettes provisionnées pour participation des salariés aux résultats</field>
             <field name="code">428400</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_428000])]"/>
+            <field eval="[(6,0,[pcg_428000])]" name="parent_id"/>
         </record>
         <record id="pcg_428600" model="account.account">
             <field name="name">Autres charges à payer</field>
             <field name="code">428600</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_428000])]"/>
+            <field eval="[(6,0,[pcg_428000])]" name="parent_id"/>
         </record>
         <record id="pcg_428700" model="account.account">
             <field name="name">Produits à recevoir</field>
             <field name="code">428700</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_428000])]"/>
+            <field eval="[(6,0,[pcg_428000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_43" model="account.account">
             <field name="name">Sécurité Sociale et autres organismes sociaux</field>
             <field name="code">Comptes_43</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_431000" model="account.account">
             <field name="name">Sécurité Sociale</field>
             <field name="code">431000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_43])]"/>
+            <field eval="[(6,0,[pcg_Comptes_43])]" name="parent_id"/>
         </record>
         <record id="pcg_437000" model="account.account">
             <field name="name">Autres organismes sociaux</field>
             <field name="code">437000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_43])]"/>
+            <field eval="[(6,0,[pcg_Comptes_43])]" name="parent_id"/>
         </record>
         <record id="pcg_438000" model="account.account">
             <field name="name">Organismes sociaux - Charges à payer et produits à recevoir</field>
             <field name="code">438000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_43])]"/>
+            <field eval="[(6,0,[pcg_Comptes_43])]" name="parent_id"/>
         </record>
         <record id="pcg_438200" model="account.account">
             <field name="name">Charges sociales sur congés à payer </field>
             <field name="code">438200</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_438000])]"/>
+            <field eval="[(6,0,[pcg_438000])]" name="parent_id"/>
         </record>
         <record id="pcg_438600" model="account.account">
             <field name="name">Autres charges à payer</field>
             <field name="code">438600</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_438000])]"/>
+            <field eval="[(6,0,[pcg_438000])]" name="parent_id"/>
         </record>
         <record id="pcg_438700" model="account.account">
             <field name="name">Produits à recevoir</field>
             <field name="code">438700</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_438000])]"/>
+            <field eval="[(6,0,[pcg_438000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_44" model="account.account">
             <field name="name">Etat et autres collectivités publiques</field>
             <field name="code">Comptes_44</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_441000" model="account.account">
             <field name="name">État - Subventions à recevoir</field>
             <field name="code">441000</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_44])]"/>
+            <field eval="[(6,0,[pcg_Comptes_44])]" name="parent_id"/>
         </record>
         <record id="pcg_441100" model="account.account">
             <field name="name">Subventions d'investissement</field>
             <field name="code">441100</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_441000])]"/>
+            <field eval="[(6,0,[pcg_441000])]" name="parent_id"/>
         </record>
         <record id="pcg_441700" model="account.account">
             <field name="name">Subventions d'exploitation</field>
             <field name="code">441700</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_441000])]"/>
+            <field eval="[(6,0,[pcg_441000])]" name="parent_id"/>
         </record>
         <record id="pcg_441800" model="account.account">
             <field name="name">Subventions d'équilibre</field>
             <field name="code">441800</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_441000])]"/>
+            <field eval="[(6,0,[pcg_441000])]" name="parent_id"/>
         </record>
         <record id="pcg_441900" model="account.account">
             <field name="name">Avances sur subventions</field>
             <field name="code">441900</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_441000])]"/>
+            <field eval="[(6,0,[pcg_441000])]" name="parent_id"/>
         </record>
         <record id="pcg_442000" model="account.account">
             <field name="name">État -Impôts et taxes recouvrables sur des tiers </field>
             <field name="code">442000</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_44])]"/>
+            <field eval="[(6,0,[pcg_Comptes_44])]" name="parent_id"/>
         </record>
         <record id="pcg_442400" model="account.account">
             <field name="name">Obligataires</field>
             <field name="code">442400</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_442000])]"/>
+            <field eval="[(6,0,[pcg_442000])]" name="parent_id"/>
         </record>
         <record id="pcg_442500" model="account.account">
             <field name="name">Associés</field>
             <field name="code">442500</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_442000])]"/>
+            <field eval="[(6,0,[pcg_442000])]" name="parent_id"/>
         </record>
         <record id="pcg_443000" model="account.account">
             <field name="name">Opérations particulières avec l'État les collectivités publiques les organismes internationaux</field>
             <field name="code">443000</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_44])]"/>
+            <field eval="[(6,0,[pcg_Comptes_44])]" name="parent_id"/>
         </record>
         <record id="pcg_443100" model="account.account">
             <field name="name">Créances sur l'État résultant de la suppression de la règle du décalage d'un mois en matière de TVA</field>
             <field name="code">443100</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_443000])]"/>
+            <field eval="[(6,0,[pcg_443000])]" name="parent_id"/>
         </record>
         <record id="pcg_443800" model="account.account">
             <field name="name">Intérêts courus sur créances figurant au compte 4431</field>
             <field name="code">443800</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_443000])]"/>
+            <field eval="[(6,0,[pcg_443000])]" name="parent_id"/>
         </record>
         <record id="pcg_444000" model="account.account">
             <field name="name">État - Impôts sur les bénéfices</field>
             <field name="code">444000</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_44])]"/>
+            <field eval="[(6,0,[pcg_Comptes_44])]" name="parent_id"/>
         </record>
         <record id="pcg_445000" model="account.account">
             <field name="name">État - Taxes sur le chiffre d'affaires</field>
             <field name="code">445000</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_44])]"/>
+            <field eval="[(6,0,[pcg_Comptes_44])]" name="parent_id"/>
         </record>
         <record id="pcg_445200" model="account.account">
             <field name="name">TVA due intracommunautaire</field>
             <field name="code">445200</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445000])]"/>
+            <field eval="[(6,0,[pcg_445000])]" name="parent_id"/>
         </record>
         <record id="pcg_445500" model="account.account">
             <field name="name">Taxes sur le chiffre d'affaires à décaisser</field>
             <field name="code">445500</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445000])]"/>
+            <field eval="[(6,0,[pcg_445000])]" name="parent_id"/>
         </record>
         <record id="pcg_445510" model="account.account">
             <field name="name">TVA à décaisser</field>
             <field name="code">445510</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445500])]"/>
+            <field eval="[(6,0,[pcg_445500])]" name="parent_id"/>
         </record>
         <record id="pcg_445580" model="account.account">
             <field name="name">Taxes assimilées à la TVA</field>
             <field name="code">445580</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445500])]"/>
+            <field eval="[(6,0,[pcg_445500])]" name="parent_id"/>
         </record>
         <record id="pcg_445600" model="account.account">
             <field name="name">Taxes sur le chiffre d'affaires déductibles</field>
             <field name="code">445600</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445000])]"/>
+            <field eval="[(6,0,[pcg_445000])]" name="parent_id"/>
         </record>
         <record id="pcg_445620" model="account.account">
             <field name="name">TVA sur immobilisations</field>
             <field name="code">445620</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445600])]"/>
+            <field eval="[(6,0,[pcg_445600])]" name="parent_id"/>
         </record>
         <record id="pcg_445621" model="account.account">
             <field name="name">TVA sur immobilisations 2,1%</field>
             <field name="code">445621</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445620])]"/>
+            <field eval="[(6,0,[pcg_445620])]" name="parent_id"/>
         </record>
         <record id="pcg_445622" model="account.account">
             <field name="name">TVA sur immobilisations 5,5%</field>
             <field name="code">445622</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445620])]"/>
+            <field eval="[(6,0,[pcg_445620])]" name="parent_id"/>
         </record>
         <record id="pcg_445623" model="account.account">
             <field name="name">TVA sur immobilisations 8,5%</field>
             <field name="code">445623</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445620])]"/>
+            <field eval="[(6,0,[pcg_445620])]" name="parent_id"/>
         </record>
         <record id="pcg_445624" model="account.account">
             <field name="name">TVA sur immobilisations 19,6%</field>
             <field name="code">445624</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445620])]"/>
+            <field eval="[(6,0,[pcg_445620])]" name="parent_id"/>
         </record>
         <record id="pcg_445630" model="account.account">
             <field name="name">TVA transférée par d'autres entreprises</field>
             <field name="code">445630</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445600])]"/>
+            <field eval="[(6,0,[pcg_445600])]" name="parent_id"/>
         </record>
         <record id="pcg_445660" model="account.account">
             <field name="name">TVA sur autres biens et services</field>
             <field name="code">445660</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445600])]"/>
+            <field eval="[(6,0,[pcg_445600])]" name="parent_id"/>
         </record>
         <record id="pcg_445661" model="account.account">
             <field name="name">TVA sur autres biens et services 2,1%</field>
             <field name="code">445661</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445660])]"/>
+            <field eval="[(6,0,[pcg_445660])]" name="parent_id"/>
         </record>
         <record id="pcg_445662" model="account.account">
             <field name="name">TVA sur autres biens et services 5,5%</field>
             <field name="code">445662</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445660])]"/>
+            <field eval="[(6,0,[pcg_445660])]" name="parent_id"/>
         </record>
         <record id="pcg_445663" model="account.account">
             <field name="name">TVA sur autres biens et services 8,5%</field>
             <field name="code">445663</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445660])]"/>
+            <field eval="[(6,0,[pcg_445660])]" name="parent_id"/>
         </record>
         <record id="pcg_445664" model="account.account">
             <field name="name">TVA sur autres biens et services 19,6%</field>
             <field name="code">445664</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445660])]"/>
+            <field eval="[(6,0,[pcg_445660])]" name="parent_id"/>
         </record>
         <record id="pcg_445670" model="account.account">
             <field name="name">Crédit de TVA à reporter</field>
@@ -4018,72 +4018,72 @@
             <field name="type">tax</field>
             <field name="note">Si non demandé le remboursement </field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445600])]"/>
+            <field eval="[(6,0,[pcg_445600])]" name="parent_id"/>
         </record>
         <record id="pcg_445680" model="account.account">
             <field name="name">Taxes assimilées à la TVA</field>
             <field name="code">445680</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445600])]"/>
+            <field eval="[(6,0,[pcg_445600])]" name="parent_id"/>
         </record>
         <record id="pcg_445700" model="account.account">
             <field name="name">Taxes sur le chiffre d'affaires collectées par l'entreprise</field>
             <field name="code">445700</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445000])]"/>
+            <field eval="[(6,0,[pcg_445000])]" name="parent_id"/>
         </record>
         <record id="pcg_445710" model="account.account">
             <field name="name">TVA collectée</field>
             <field name="code">445710</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445700])]"/>
+            <field eval="[(6,0,[pcg_445700])]" name="parent_id"/>
         </record>
         <record id="pcg_445780" model="account.account">
             <field name="name">Taxes assimilées à la TVA</field>
             <field name="code">445780</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445700])]"/>
+            <field eval="[(6,0,[pcg_445700])]" name="parent_id"/>
         </record>
         <record id="pcg_445800" model="account.account">
             <field name="name">Taxes sur le chiffre d'affaires à régulariser ou en attente</field>
             <field name="code">445800</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445000])]"/>
+            <field eval="[(6,0,[pcg_445000])]" name="parent_id"/>
         </record>
         <record id="pcg_445810" model="account.account">
             <field name="name">Acomptes - Régime simplifié d'imposition</field>
             <field name="code">445810</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445800])]"/>
+            <field eval="[(6,0,[pcg_445800])]" name="parent_id"/>
         </record>
         <record id="pcg_445820" model="account.account">
             <field name="name">Acomptes - Régime du forfait</field>
             <field name="code">445820</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445800])]"/>
+            <field eval="[(6,0,[pcg_445800])]" name="parent_id"/>
         </record>
         <record id="pcg_445830" model="account.account">
             <field name="name">Remboursement de taxes sur le chiffre d'affaires demandé</field>
@@ -4091,108 +4091,108 @@
             <field name="type">tax</field>
             <field name="note">voir procédure sur erp-libre.info</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445800])]"/>
+            <field eval="[(6,0,[pcg_445800])]" name="parent_id"/>
         </record>
         <record id="pcg_445840" model="account.account">
             <field name="name">TVA récupérée d'avance</field>
             <field name="code">445840</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445800])]"/>
+            <field eval="[(6,0,[pcg_445800])]" name="parent_id"/>
         </record>
         <record id="pcg_445860" model="account.account">
             <field name="name">Taxes sur le chiffre d'affaires sur factures non parvenues</field>
             <field name="code">445860</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445800])]"/>
+            <field eval="[(6,0,[pcg_445800])]" name="parent_id"/>
         </record>
         <record id="pcg_445870" model="account.account">
             <field name="name">Taxes sur le chiffre d'affaires sur factures à établir</field>
             <field name="code">445870</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_445800])]"/>
+            <field eval="[(6,0,[pcg_445800])]" name="parent_id"/>
         </record>
         <record id="pcg_446000" model="account.account">
             <field name="name">Obligations cautionnées</field>
             <field name="code">446000</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_44])]"/>
+            <field eval="[(6,0,[pcg_Comptes_44])]" name="parent_id"/>
         </record>
         <record id="pcg_447000" model="account.account">
             <field name="name">Autres impôts taxes et versements assimilés</field>
             <field name="code">447000</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_44])]"/>
+            <field eval="[(6,0,[pcg_Comptes_44])]" name="parent_id"/>
         </record>
         <record id="pcg_448000" model="account.account">
             <field name="name">État - Charges à payer et produits à recevoir</field>
             <field name="code">448000</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_44])]"/>
+            <field eval="[(6,0,[pcg_Comptes_44])]" name="parent_id"/>
         </record>
         <record id="pcg_448200" model="account.account">
             <field name="name">Charges fiscales sur congés à payer </field>
             <field name="code">448200</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_448000])]"/>
+            <field eval="[(6,0,[pcg_448000])]" name="parent_id"/>
         </record>
         <record id="pcg_448600" model="account.account">
             <field name="name">Charges à payer</field>
             <field name="code">448600</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_448000])]"/>
+            <field eval="[(6,0,[pcg_448000])]" name="parent_id"/>
         </record>
         <record id="pcg_448700" model="account.account">
             <field name="name">Produits à recevoir</field>
             <field name="code">448700</field>
             <field name="type">tax</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_448000])]"/>
+            <field eval="[(6,0,[pcg_448000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_45" model="account.account">
             <field name="name">Groupe et associés</field>
             <field name="code">Comptes_45</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_451000" model="account.account">
             <field name="name">Groupe</field>
             <field name="code">451000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_45])]"/>
+            <field eval="[(6,0,[pcg_Comptes_45])]" name="parent_id"/>
         </record>
         <record id="pcg_455000" model="account.account">
             <field name="name">Associés - Comptes courants</field>
@@ -4200,243 +4200,243 @@
             <field name="type">receivable</field>
             <field name="note">pour frais avancés personnellement</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_45])]"/>
+            <field eval="[(6,0,[pcg_Comptes_45])]" name="parent_id"/>
         </record>
         <record id="pcg_455100" model="account.account">
             <field name="name">Principal</field>
             <field name="code">455100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_455000])]"/>
+            <field eval="[(6,0,[pcg_455000])]" name="parent_id"/>
         </record>
         <record id="pcg_455800" model="account.account">
             <field name="name">Intérêts courus</field>
             <field name="code">455800</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_455000])]"/>
+            <field eval="[(6,0,[pcg_455000])]" name="parent_id"/>
         </record>
         <record id="pcg_456000" model="account.account">
             <field name="name">Associés - Opérations sur le capital</field>
             <field name="code">456000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_45])]"/>
+            <field eval="[(6,0,[pcg_Comptes_45])]" name="parent_id"/>
         </record>
         <record id="pcg_456100" model="account.account">
             <field name="name">Associés - Comptes d'apport en société</field>
             <field name="code">456100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456000])]"/>
+            <field eval="[(6,0,[pcg_456000])]" name="parent_id"/>
         </record>
         <record id="pcg_456110" model="account.account">
             <field name="name">Apports en nature</field>
             <field name="code">456110</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456100])]"/>
+            <field eval="[(6,0,[pcg_456100])]" name="parent_id"/>
         </record>
         <record id="pcg_456150" model="account.account">
             <field name="name">Apports en numéraire</field>
             <field name="code">456150</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456100])]"/>
+            <field eval="[(6,0,[pcg_456100])]" name="parent_id"/>
         </record>
         <record id="pcg_456200" model="account.account">
             <field name="name">Apporteurs - Capital appelé non versé</field>
             <field name="code">456200</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456000])]"/>
+            <field eval="[(6,0,[pcg_456000])]" name="parent_id"/>
         </record>
         <record id="pcg_456210" model="account.account">
             <field name="name">Actionnaires - Capital souscrit et appelé non versé</field>
             <field name="code">456210</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456200])]"/>
+            <field eval="[(6,0,[pcg_456200])]" name="parent_id"/>
         </record>
         <record id="pcg_456250" model="account.account">
             <field name="name">Associés - Capital appelé non versé</field>
             <field name="code">456250</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456200])]"/>
+            <field eval="[(6,0,[pcg_456200])]" name="parent_id"/>
         </record>
         <record id="pcg_456300" model="account.account">
             <field name="name">Associés - Versements reçus sur augmentation de capital</field>
             <field name="code">456300</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456000])]"/>
+            <field eval="[(6,0,[pcg_456000])]" name="parent_id"/>
         </record>
         <record id="pcg_456400" model="account.account">
             <field name="name">Associés - Versements anticipés</field>
             <field name="code">456400</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456000])]"/>
+            <field eval="[(6,0,[pcg_456000])]" name="parent_id"/>
         </record>
         <record id="pcg_456600" model="account.account">
             <field name="name">Actionnaires défaillants</field>
             <field name="code">456600</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456000])]"/>
+            <field eval="[(6,0,[pcg_456000])]" name="parent_id"/>
         </record>
         <record id="pcg_456700" model="account.account">
             <field name="name">Associés - Capital à rembourser</field>
             <field name="code">456700</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_456000])]"/>
+            <field eval="[(6,0,[pcg_456000])]" name="parent_id"/>
         </record>
         <record id="pcg_457000" model="account.account">
             <field name="name">Associés - Dividendes à payer</field>
             <field name="code">457000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_45])]"/>
+            <field eval="[(6,0,[pcg_Comptes_45])]" name="parent_id"/>
         </record>
         <record id="pcg_458000" model="account.account">
             <field name="name">Associés - Opérations faites en commun et en GIE</field>
             <field name="code">458000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_45])]"/>
+            <field eval="[(6,0,[pcg_Comptes_45])]" name="parent_id"/>
         </record>
         <record id="pcg_458100" model="account.account">
             <field name="name">Opérations courantes</field>
             <field name="code">458100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_458000])]"/>
+            <field eval="[(6,0,[pcg_458000])]" name="parent_id"/>
         </record>
         <record id="pcg_458800" model="account.account">
             <field name="name">Intérêts courus</field>
             <field name="code">458800</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_458000])]"/>
+            <field eval="[(6,0,[pcg_458000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_46" model="account.account">
             <field name="name">Débiteurs divers et créditeurs divers</field>
             <field name="code">Comptes_46</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_462000" model="account.account">
             <field name="name">Créances sur cessions d'immobilisations</field>
             <field name="code">462000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_46])]"/>
+            <field eval="[(6,0,[pcg_Comptes_46])]" name="parent_id"/>
         </record>
         <record id="pcg_464000" model="account.account">
             <field name="name">Dettes sur acquisitions de valeurs mobilières de placement</field>
             <field name="code">464000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_46])]"/>
+            <field eval="[(6,0,[pcg_Comptes_46])]" name="parent_id"/>
         </record>
         <record id="pcg_465000" model="account.account">
             <field name="name">Créances sur cessions de valeurs mobilières de placement</field>
             <field name="code">465000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_46])]"/>
+            <field eval="[(6,0,[pcg_Comptes_46])]" name="parent_id"/>
         </record>
         <record id="pcg_467000" model="account.account">
             <field name="name">Autres comptes débiteurs ou créditeurs</field>
             <field name="code">467000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_46])]"/>
+            <field eval="[(6,0,[pcg_Comptes_46])]" name="parent_id"/>
         </record>
         <record id="pcg_468000" model="account.account">
             <field name="name">Divers - Charges à payer et produits à recevoir</field>
             <field name="code">468000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_46])]"/>
+            <field eval="[(6,0,[pcg_Comptes_46])]" name="parent_id"/>
         </record>
         <record id="pcg_468600" model="account.account">
             <field name="name">Charges à payer</field>
             <field name="code">468600</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_468000])]"/>
+            <field eval="[(6,0,[pcg_468000])]" name="parent_id"/>
         </record>
         <record id="pcg_468700" model="account.account">
             <field name="name">Produits à recevoir</field>
             <field name="code">468700</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_468000])]"/>
+            <field eval="[(6,0,[pcg_468000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_47" model="account.account">
             <field name="name">Comptes transitoires ou d'attente</field>
             <field name="code">Comptes_47</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_471000" model="account.account">
             <field name="name">Comptes d'attente 1</field>
@@ -4444,171 +4444,171 @@
             <field name="type">receivable</field>
             <field name="note">en attente d'affectation question à erp-libre.info</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_47])]"/>
+            <field eval="[(6,0,[pcg_Comptes_47])]" name="parent_id"/>
         </record>
         <record id="pcg_472000" model="account.account">
             <field name="name">Comptes d'attente 2</field>
             <field name="code">472000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_47])]"/>
+            <field eval="[(6,0,[pcg_Comptes_47])]" name="parent_id"/>
         </record>
         <record id="pcg_473000" model="account.account">
             <field name="name">Comptes d'attente 3</field>
             <field name="code">473000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_47])]"/>
+            <field eval="[(6,0,[pcg_Comptes_47])]" name="parent_id"/>
         </record>
         <record id="pcg_474000" model="account.account">
             <field name="name">Comptes d'attente 4</field>
             <field name="code">474000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_47])]"/>
+            <field eval="[(6,0,[pcg_Comptes_47])]" name="parent_id"/>
         </record>
         <record id="pcg_475000" model="account.account">
             <field name="name">Comptes d'attente 5</field>
             <field name="code">475000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_47])]"/>
+            <field eval="[(6,0,[pcg_Comptes_47])]" name="parent_id"/>
         </record>
         <record id="pcg_476000" model="account.account">
             <field name="name">Différences de conversion - ACTIF</field>
             <field name="code">476000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_47])]"/>
+            <field eval="[(6,0,[pcg_Comptes_47])]" name="parent_id"/>
         </record>
         <record id="pcg_476100" model="account.account">
             <field name="name">Diminution des créances</field>
             <field name="code">476100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_476000])]"/>
+            <field eval="[(6,0,[pcg_476000])]" name="parent_id"/>
         </record>
         <record id="pcg_476200" model="account.account">
             <field name="name">Augmentation des dettes</field>
             <field name="code">476200</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_476000])]"/>
+            <field eval="[(6,0,[pcg_476000])]" name="parent_id"/>
         </record>
         <record id="pcg_476800" model="account.account">
             <field name="name">Différences compensées par couverture de change</field>
             <field name="code">476800</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_476000])]"/>
+            <field eval="[(6,0,[pcg_476000])]" name="parent_id"/>
         </record>
         <record id="pcg_477000" model="account.account">
             <field name="name"> Différences de conversion - PASSIF</field>
             <field name="code">477000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_47])]"/>
+            <field eval="[(6,0,[pcg_Comptes_47])]" name="parent_id"/>
         </record>
         <record id="pcg_477100" model="account.account">
             <field name="name">Augmentation des créances</field>
             <field name="code">477100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_477000])]"/>
+            <field eval="[(6,0,[pcg_477000])]" name="parent_id"/>
         </record>
         <record id="pcg_477200" model="account.account">
             <field name="name">Diminution des dettes</field>
             <field name="code">477200</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_477000])]"/>
+            <field eval="[(6,0,[pcg_477000])]" name="parent_id"/>
         </record>
         <record id="pcg_477800" model="account.account">
             <field name="name">Différences compensées par couverture de change</field>
             <field name="code">477800</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_477000])]"/>
+            <field eval="[(6,0,[pcg_477000])]" name="parent_id"/>
         </record>
         <record id="pcg_478000" model="account.account">
             <field name="name">Autres comptes transitoires</field>
             <field name="code">478000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_47])]"/>
+            <field eval="[(6,0,[pcg_Comptes_47])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_48" model="account.account">
             <field name="name">Comptes de régularisation</field>
             <field name="code">Comptes_48</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_481000" model="account.account">
             <field name="name">Charges à répartir sur plusieurs exercices </field>
             <field name="code">481000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_48])]"/>
+            <field eval="[(6,0,[pcg_Comptes_48])]" name="parent_id"/>
         </record>
         <record id="pcg_481100" model="account.account">
             <field name="name">Charges différées</field>
             <field name="code">481100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_481000])]"/>
+            <field eval="[(6,0,[pcg_481000])]" name="parent_id"/>
         </record>
         <record id="pcg_481200" model="account.account">
             <field name="name">Frais d'acquisition des immobilisations </field>
             <field name="code">481200</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_481000])]"/>
+            <field eval="[(6,0,[pcg_481000])]" name="parent_id"/>
         </record>
         <record id="pcg_481600" model="account.account">
             <field name="name">Frais d'émission des emprunts</field>
             <field name="code">481600</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_481000])]"/>
+            <field eval="[(6,0,[pcg_481000])]" name="parent_id"/>
         </record>
         <record id="pcg_481800" model="account.account">
             <field name="name">Charges à étaler</field>
@@ -4616,9 +4616,9 @@
             <field name="type">receivable</field>
             <field name="note">régul fin d'année seulement</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_481000])]"/>
+            <field eval="[(6,0,[pcg_481000])]" name="parent_id"/>
         </record>
         <record id="pcg_486000" model="account.account">
             <field name="name">Charges constatées d'avance</field>
@@ -4626,9 +4626,9 @@
             <field name="type">receivable</field>
             <field name="note">régul fin d'année seulement</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_48])]"/>
+            <field eval="[(6,0,[pcg_Comptes_48])]" name="parent_id"/>
         </record>
         <record id="pcg_487000" model="account.account">
             <field name="name">Produits constatés d'avance</field>
@@ -4636,9 +4636,9 @@
             <field name="type">receivable</field>
             <field name="note">régul fin d'année seulement</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_48])]"/>
+            <field eval="[(6,0,[pcg_Comptes_48])]" name="parent_id"/>
         </record>
         <record id="pcg_488000" model="account.account">
             <field name="name">Comptes de répartition périodique des charges et des produits</field>
@@ -4646,27 +4646,27 @@
             <field name="type">receivable</field>
             <field name="note">régul fin d'année seulement</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_48])]"/>
+            <field eval="[(6,0,[pcg_Comptes_48])]" name="parent_id"/>
         </record>
         <record id="pcg_488600" model="account.account">
             <field name="name">Charges</field>
             <field name="code">488600</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_488000])]"/>
+            <field eval="[(6,0,[pcg_488000])]" name="parent_id"/>
         </record>
         <record id="pcg_488700" model="account.account">
             <field name="name">Produits</field>
             <field name="code">488700</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_488000])]"/>
+            <field eval="[(6,0,[pcg_488000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_49" model="account.account">
             <field name="name">Provision pour dépréciation des comptes de tiers</field>
@@ -4674,306 +4674,306 @@
             <field name="type">view</field>
             <field name="note">litiges et défauts de paiement</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_4])]"/>
+            <field eval="[(6,0,[pcg_Classe_4])]" name="parent_id"/>
         </record>
         <record id="pcg_491000" model="account.account">
             <field name="name">Provisions pour dépréciation des comptes de clients</field>
             <field name="code">491000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_49])]"/>
+            <field eval="[(6,0,[pcg_Comptes_49])]" name="parent_id"/>
         </record>
         <record id="pcg_495000" model="account.account">
             <field name="name">Provisions pour dépréciation des comptes du groupe et des associés</field>
             <field name="code">495000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_49])]"/>
+            <field eval="[(6,0,[pcg_Comptes_49])]" name="parent_id"/>
         </record>
         <record id="pcg_495100" model="account.account">
             <field name="name">Comptes du groupe</field>
             <field name="code">495100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_495000])]"/>
+            <field eval="[(6,0,[pcg_495000])]" name="parent_id"/>
         </record>
         <record id="pcg_495500" model="account.account">
             <field name="name">Comptes courants des associés</field>
             <field name="code">495500</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_495000])]"/>
+            <field eval="[(6,0,[pcg_495000])]" name="parent_id"/>
         </record>
         <record id="pcg_495800" model="account.account">
             <field name="name">Opérations faites en commun et en GIE</field>
             <field name="code">495800</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_495000])]"/>
+            <field eval="[(6,0,[pcg_495000])]" name="parent_id"/>
         </record>
         <record id="pcg_496000" model="account.account">
             <field name="name">Provisions pour dépréciation des comptes de débiteurs divers</field>
             <field name="code">496000</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_49])]"/>
+            <field eval="[(6,0,[pcg_Comptes_49])]" name="parent_id"/>
         </record>
         <record id="pcg_496200" model="account.account">
             <field name="name">Créances sur cessions d'immobilisations</field>
             <field name="code">496200</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_496000])]"/>
+            <field eval="[(6,0,[pcg_496000])]" name="parent_id"/>
         </record>
         <record id="pcg_496500" model="account.account">
             <field name="name">Créances sur cessions de valeurs mobilières de placement</field>
             <field name="code">496500</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_496000])]"/>
+            <field eval="[(6,0,[pcg_496000])]" name="parent_id"/>
         </record>
         <record id="pcg_496700" model="account.account">
             <field name="name">Autres comptes débiteurs</field>
             <field name="code">496700</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_496000])]"/>
+            <field eval="[(6,0,[pcg_496000])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_5" model="account.account">
             <field name="name">Comptes financiers</field>
             <field name="code">Classe_5</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_1_a_5])]"/>
+            <field eval="[(6,0,[pcg_Classes_1_a_5])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_50" model="account.account">
             <field name="name">Valeurs mobilières de placement</field>
             <field name="code">Comptes_50</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_5])]"/>
+            <field eval="[(6,0,[pcg_Classe_5])]" name="parent_id"/>
         </record>
         <record id="pcg_501000" model="account.account">
             <field name="name">Parts dans entreprises liées</field>
             <field name="code">501000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_502000" model="account.account">
             <field name="name">Actions propres</field>
             <field name="code">502000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_503000" model="account.account">
             <field name="name">Actions</field>
             <field name="code">503000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_503100" model="account.account">
             <field name="name">Titres cotés</field>
             <field name="code">503100</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_503000])]"/>
+            <field eval="[(6,0,[pcg_503000])]" name="parent_id"/>
         </record>
         <record id="pcg_503500" model="account.account">
             <field name="name">Titres non cotés</field>
             <field name="code">503500</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_503000])]"/>
+            <field eval="[(6,0,[pcg_503000])]" name="parent_id"/>
         </record>
         <record id="pcg_504000" model="account.account">
             <field name="name">Autres titres conférant un droit de propriété</field>
             <field name="code">504000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_505000" model="account.account">
             <field name="name">Obligations et bons émis par la société et rachetés par elle</field>
             <field name="code">505000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_506000" model="account.account">
             <field name="name">Obligations</field>
             <field name="code">506000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_506100" model="account.account">
             <field name="name">Titres cotés</field>
             <field name="code">506100</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_506000])]"/>
+            <field eval="[(6,0,[pcg_506000])]" name="parent_id"/>
         </record>
         <record id="pcg_506500" model="account.account">
             <field name="name">Titres non cotés</field>
             <field name="code">506500</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_506000])]"/>
+            <field eval="[(6,0,[pcg_506000])]" name="parent_id"/>
         </record>
         <record id="pcg_507000" model="account.account">
             <field name="name">Bons du Trésor et bons de caisse à court terme</field>
             <field name="code">507000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_508000" model="account.account">
             <field name="name">Autres valeurs mobilières de placement et autres créances assimilées</field>
             <field name="code">508000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_508100" model="account.account">
             <field name="name">Autres valeurs mobilières</field>
             <field name="code">508100</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_508000])]"/>
+            <field eval="[(6,0,[pcg_508000])]" name="parent_id"/>
         </record>
         <record id="pcg_508200" model="account.account">
             <field name="name">Bons de souscription</field>
             <field name="code">508200</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_508000])]"/>
+            <field eval="[(6,0,[pcg_508000])]" name="parent_id"/>
         </record>
         <record id="pcg_508800" model="account.account">
             <field name="name">Intérêts courus sur obligations bons et valeurs assimilées</field>
             <field name="code">508800</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_508000])]"/>
+            <field eval="[(6,0,[pcg_508000])]" name="parent_id"/>
         </record>
         <record id="pcg_509000" model="account.account">
             <field name="name">Versements restant à effectuer sur valeurs mobilières de placement non libérées</field>
             <field name="code">509000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_50])]"/>
+            <field eval="[(6,0,[pcg_Comptes_50])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_51" model="account.account">
             <field name="name">Banques établissements financiers et assimilés</field>
             <field name="code">Comptes_51</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_5])]"/>
+            <field eval="[(6,0,[pcg_Classe_5])]" name="parent_id"/>
         </record>
         <record id="pcg_511000" model="account.account">
             <field name="name">Valeurs à l'encaissement</field>
             <field name="code">511000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_51])]"/>
+            <field eval="[(6,0,[pcg_Comptes_51])]" name="parent_id"/>
         </record>
         <record id="pcg_511100" model="account.account">
             <field name="name">Coupons échus à l'encaissement</field>
             <field name="code">511100</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_511000])]"/>
+            <field eval="[(6,0,[pcg_511000])]" name="parent_id"/>
         </record>
         <record id="pcg_511200" model="account.account">
             <field name="name">Chèques à encaisser</field>
             <field name="code">511200</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_511000])]"/>
+            <field eval="[(6,0,[pcg_511000])]" name="parent_id"/>
         </record>
         <record id="pcg_511300" model="account.account">
             <field name="name">Effets à l'encaissement</field>
             <field name="code">511300</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_511000])]"/>
+            <field eval="[(6,0,[pcg_511000])]" name="parent_id"/>
         </record>
         <record id="pcg_511400" model="account.account">
             <field name="name">Effets à l'escompte</field>
             <field name="code">511400</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_511000])]"/>
+            <field eval="[(6,0,[pcg_511000])]" name="parent_id"/>
         </record>
         <record id="pcg_512000" model="account.account">
             <field name="name">Banques</field>
@@ -4981,126 +4981,126 @@
             <field name="type">cash</field>
             <field name="note">1 compte par compte bancaire</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_51])]"/>
+            <field eval="[(6,0,[pcg_Comptes_51])]" name="parent_id"/>
         </record>
         <record id="pcg_512400" model="account.account">
             <field name="name">Comptes en devises</field>
             <field name="code">512400</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_512000])]"/>
+            <field eval="[(6,0,[pcg_512000])]" name="parent_id"/>
         </record>
         <record id="pcg_514000" model="account.account">
             <field name="name">Chèques postaux</field>
             <field name="code">514000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_51])]"/>
+            <field eval="[(6,0,[pcg_Comptes_51])]" name="parent_id"/>
         </record>
         <record id="pcg_515000" model="account.account">
             <field name="name">Caisses du Trésor et des établissements publics</field>
             <field name="code">515000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_51])]"/>
+            <field eval="[(6,0,[pcg_Comptes_51])]" name="parent_id"/>
         </record>
         <record id="pcg_516000" model="account.account">
             <field name="name">Sociétés de bourse</field>
             <field name="code">516000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_51])]"/>
+            <field eval="[(6,0,[pcg_Comptes_51])]" name="parent_id"/>
         </record>
         <record id="pcg_517000" model="account.account">
             <field name="name">Autres organismes financiers</field>
             <field name="code">517000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_51])]"/>
+            <field eval="[(6,0,[pcg_Comptes_51])]" name="parent_id"/>
         </record>
         <record id="pcg_518000" model="account.account">
             <field name="name">Intérêts courus</field>
             <field name="code">518000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_51])]"/>
+            <field eval="[(6,0,[pcg_Comptes_51])]" name="parent_id"/>
         </record>
         <record id="pcg_518100" model="account.account">
             <field name="name">Intérêts courus à payer</field>
             <field name="code">518100</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_518000])]"/>
+            <field eval="[(6,0,[pcg_518000])]" name="parent_id"/>
         </record>
         <record id="pcg_518800" model="account.account">
             <field name="name">Intérêts courus à recevoir</field>
             <field name="code">518800</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_518000])]"/>
+            <field eval="[(6,0,[pcg_518000])]" name="parent_id"/>
         </record>
         <record id="pcg_519000" model="account.account">
             <field name="name">Concours bancaires courants</field>
             <field name="code">519000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_51])]"/>
+            <field eval="[(6,0,[pcg_Comptes_51])]" name="parent_id"/>
         </record>
         <record id="pcg_519100" model="account.account">
             <field name="name">Crédit de mobilisation de créances commerciales (CMCC)</field>
             <field name="code">519100</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_519000])]"/>
+            <field eval="[(6,0,[pcg_519000])]" name="parent_id"/>
         </record>
         <record id="pcg_519300" model="account.account">
             <field name="name">Mobilisation de créances nées à l'étranger</field>
             <field name="code">519300</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_519000])]"/>
+            <field eval="[(6,0,[pcg_519000])]" name="parent_id"/>
         </record>
         <record id="pcg_519800" model="account.account">
             <field name="name">Intérêts courus sur concours bancaires courants</field>
             <field name="code">519800</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_519000])]"/>
+            <field eval="[(6,0,[pcg_519000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_52" model="account.account">
             <field name="name">Instruments de trésorerie</field>
             <field name="code">Comptes_52</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_5])]"/>
+            <field eval="[(6,0,[pcg_Classe_5])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_53" model="account.account">
             <field name="name">Caisse</field>
@@ -5108,153 +5108,153 @@
             <field name="type">view</field>
             <field name="note">non utilisé : espèces= NFperso à rembourser (455)</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_5])]"/>
+            <field eval="[(6,0,[pcg_Classe_5])]" name="parent_id"/>
         </record>
         <record id="pcg_531000" model="account.account">
             <field name="name">Caisse siège social</field>
             <field name="code">531000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_53])]"/>
+            <field eval="[(6,0,[pcg_Comptes_53])]" name="parent_id"/>
         </record>
         <record id="pcg_531100" model="account.account">
             <field name="name">Caisse en monnaie nationale</field>
             <field name="code">531100</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_531000])]"/>
+            <field eval="[(6,0,[pcg_531000])]" name="parent_id"/>
         </record>
         <record id="pcg_531400" model="account.account">
             <field name="name">Caisse en devises</field>
             <field name="code">531400</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_531000])]"/>
+            <field eval="[(6,0,[pcg_531000])]" name="parent_id"/>
         </record>
         <record id="pcg_532000" model="account.account">
             <field name="name">Caisse succursale (ou usine) A</field>
             <field name="code">532000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_53])]"/>
+            <field eval="[(6,0,[pcg_Comptes_53])]" name="parent_id"/>
         </record>
         <record id="pcg_533000" model="account.account">
             <field name="name">Caisse succursale (ou usine) B</field>
             <field name="code">533000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_53])]"/>
+            <field eval="[(6,0,[pcg_Comptes_53])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_54" model="account.account">
             <field name="name">Régies d'avances et accréditifs</field>
             <field name="code">Comptes_54</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_5])]"/>
+            <field eval="[(6,0,[pcg_Classe_5])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_58" model="account.account">
             <field name="name">Virements internes</field>
             <field name="code">Comptes_58</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_5])]"/>
+            <field eval="[(6,0,[pcg_Classe_5])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_59" model="account.account">
             <field name="name">Provisions pour dépréciation des comptes financiers</field>
             <field name="code">Comptes_59</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_5])]"/>
+            <field eval="[(6,0,[pcg_Classe_5])]" name="parent_id"/>
         </record>
         <record id="pcg_590000" model="account.account">
             <field name="name">Provisions pour dépréciation des valeurs mobilières de placement</field>
             <field name="code">590000</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_59])]"/>
+            <field eval="[(6,0,[pcg_Comptes_59])]" name="parent_id"/>
         </record>
         <record id="pcg_590300" model="account.account">
             <field name="name">Actions</field>
             <field name="code">590300</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_590000])]"/>
+            <field eval="[(6,0,[pcg_590000])]" name="parent_id"/>
         </record>
         <record id="pcg_590400" model="account.account">
             <field name="name">Autres titres conférant un droit de propriété </field>
             <field name="code">590400</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_590000])]"/>
+            <field eval="[(6,0,[pcg_590000])]" name="parent_id"/>
         </record>
         <record id="pcg_590600" model="account.account">
             <field name="name">Obligations</field>
             <field name="code">590600</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_590000])]"/>
+            <field eval="[(6,0,[pcg_590000])]" name="parent_id"/>
         </record>
         <record id="pcg_590800" model="account.account">
             <field name="name">Autres valeurs mobilières de placement et créances assimilées (provisions)</field>
             <field name="code">590800</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_590000])]"/>
+            <field eval="[(6,0,[pcg_590000])]" name="parent_id"/>
         </record>
         <record id="pcg_Classes_6_et_7" model="account.account">
             <field name="name">Comptes de gestion</field>
             <field name="code">Classes_6_et_7</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_0])]"/>
+            <field eval="[(6,0,[pcg_0])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_6" model="account.account">
             <field name="name">Comptes de charges</field>
             <field name="code">Classe_6</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_6_et_7])]"/>
+            <field eval="[(6,0,[pcg_Classes_6_et_7])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_60" model="account.account">
             <field name="name">Achats(sauf 603)</field>
             <field name="code">Comptes_60</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_601000" model="account.account">
             <field name="name">Achats stockés - Matières premières (et fournitures)</field>
@@ -5262,9 +5262,9 @@
             <field name="type">expense</field>
             <field name="note">destinés à la production ou revente</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_601300" model="account.account">
             <field name="name">Matières CEE</field>
@@ -5272,9 +5272,9 @@
             <field name="type">expense</field>
             <field name="note">pour déclaration TVA intracommunautaire</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_601000])]"/>
+            <field eval="[(6,0,[pcg_601000])]" name="parent_id"/>
         </record>
         <record id="pcg_601400" model="account.account">
             <field name="name">Matières hors CEE</field>
@@ -5282,18 +5282,18 @@
             <field name="type">expense</field>
             <field name="note">pour déclaration TVA extracommunautaire</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_601000])]"/>
+            <field eval="[(6,0,[pcg_601000])]" name="parent_id"/>
         </record>
         <record id="pcg_601700" model="account.account">
             <field name="name">Fournitures A B C</field>
             <field name="code">601700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_601000])]"/>
+            <field eval="[(6,0,[pcg_601000])]" name="parent_id"/>
         </record>
         <record id="pcg_602000" model="account.account">
             <field name="name">Achats stockés - Autres approvisionnements</field>
@@ -5301,126 +5301,126 @@
             <field name="type">expense</field>
             <field name="note">destinés à la production ou revente</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_602100" model="account.account">
             <field name="name">Matières consommables</field>
             <field name="code">602100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602000])]"/>
+            <field eval="[(6,0,[pcg_602000])]" name="parent_id"/>
         </record>
         <record id="pcg_602110" model="account.account">
             <field name="name">Matières (ou groupe) C</field>
             <field name="code">602110</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602100])]"/>
+            <field eval="[(6,0,[pcg_602100])]" name="parent_id"/>
         </record>
         <record id="pcg_602120" model="account.account">
             <field name="name">Matières (ou groupe) D</field>
             <field name="code">602120</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602100])]"/>
+            <field eval="[(6,0,[pcg_602100])]" name="parent_id"/>
         </record>
         <record id="pcg_602200" model="account.account">
             <field name="name">Fournitures consommables</field>
             <field name="code">602200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602000])]"/>
+            <field eval="[(6,0,[pcg_602000])]" name="parent_id"/>
         </record>
         <record id="pcg_602210" model="account.account">
             <field name="name">Combustibles</field>
             <field name="code">602210</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602200])]"/>
+            <field eval="[(6,0,[pcg_602200])]" name="parent_id"/>
         </record>
         <record id="pcg_602220" model="account.account">
             <field name="name">Produits d'entretien</field>
             <field name="code">602220</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602200])]"/>
+            <field eval="[(6,0,[pcg_602200])]" name="parent_id"/>
         </record>
         <record id="pcg_602230" model="account.account">
             <field name="name">Fournitures d'atelier et d'usine</field>
             <field name="code">602230</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602200])]"/>
+            <field eval="[(6,0,[pcg_602200])]" name="parent_id"/>
         </record>
         <record id="pcg_602240" model="account.account">
             <field name="name">Fournitures de magasin</field>
             <field name="code">602240</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602200])]"/>
+            <field eval="[(6,0,[pcg_602200])]" name="parent_id"/>
         </record>
         <record id="pcg_602250" model="account.account">
             <field name="name">Fournitures de bureau</field>
             <field name="code">602250</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602200])]"/>
+            <field eval="[(6,0,[pcg_602200])]" name="parent_id"/>
         </record>
         <record id="pcg_602600" model="account.account">
             <field name="name">Emballages</field>
             <field name="code">602600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602000])]"/>
+            <field eval="[(6,0,[pcg_602000])]" name="parent_id"/>
         </record>
         <record id="pcg_602610" model="account.account">
             <field name="name">Emballages perdus</field>
             <field name="code">602610</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602600])]"/>
+            <field eval="[(6,0,[pcg_602600])]" name="parent_id"/>
         </record>
         <record id="pcg_602650" model="account.account">
             <field name="name">Emballages récupérables non identifiables</field>
             <field name="code">602650</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602600])]"/>
+            <field eval="[(6,0,[pcg_602600])]" name="parent_id"/>
         </record>
         <record id="pcg_602670" model="account.account">
             <field name="name">Emballages à usage mixte</field>
             <field name="code">602670</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_602600])]"/>
+            <field eval="[(6,0,[pcg_602600])]" name="parent_id"/>
         </record>
         <record id="pcg_603000" model="account.account">
             <field name="name">Variation des stocks (approvisionnements et marchandises)</field>
@@ -5428,54 +5428,54 @@
             <field name="type">expense</field>
             <field name="note">au moment des inventaires</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_603100" model="account.account">
             <field name="name">Variation des stocks de matières premières (et fournitures)</field>
             <field name="code">603100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_603000])]"/>
+            <field eval="[(6,0,[pcg_603000])]" name="parent_id"/>
         </record>
         <record id="pcg_603200" model="account.account">
             <field name="name">Variation des stocks des autres approvisionnements</field>
             <field name="code">603200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_603000])]"/>
+            <field eval="[(6,0,[pcg_603000])]" name="parent_id"/>
         </record>
         <record id="pcg_603700" model="account.account">
             <field name="name">Variation des stocks de marchandises</field>
             <field name="code">603700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_603000])]"/>
+            <field eval="[(6,0,[pcg_603000])]" name="parent_id"/>
         </record>
         <record id="pcg_604000" model="account.account">
             <field name="name">Achats d'études et prestations de services</field>
             <field name="code">604000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_605000" model="account.account">
             <field name="name">Achats de matériel équipements et travaux</field>
             <field name="code">605000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_606000" model="account.account">
             <field name="name">Achats non stockés de matières et fournitures</field>
@@ -5483,45 +5483,45 @@
             <field name="type">expense</field>
             <field name="note">pour l'usage interne à l'entreprise</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_606100" model="account.account">
             <field name="name">Fournitures non stockables (eau énergie) </field>
             <field name="code">606100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_606000])]"/>
+            <field eval="[(6,0,[pcg_606000])]" name="parent_id"/>
         </record>
         <record id="pcg_606300" model="account.account">
             <field name="name">Fournitures d'entretien et de petit équipement</field>
             <field name="code">606300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_606000])]"/>
+            <field eval="[(6,0,[pcg_606000])]" name="parent_id"/>
         </record>
         <record id="pcg_606400" model="account.account">
             <field name="name">Fournitures administratives</field>
             <field name="code">606400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_606000])]"/>
+            <field eval="[(6,0,[pcg_606000])]" name="parent_id"/>
         </record>
         <record id="pcg_606800" model="account.account">
             <field name="name">Autres matières et fournitures</field>
             <field name="code">606800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_606000])]"/>
+            <field eval="[(6,0,[pcg_606000])]" name="parent_id"/>
         </record>
         <record id="pcg_607000" model="account.account">
             <field name="name">Achats de marchandises</field>
@@ -5529,9 +5529,9 @@
             <field name="type">expense</field>
             <field name="note">biens revendus tels quels (707) soit une marge</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_607100" model="account.account">
             <field name="name">Achats de marchandises France</field>
@@ -5539,9 +5539,9 @@
             <field name="type">expense</field>
             <field name="note">pour achats France</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_607000])]"/>
+            <field eval="[(6,0,[pcg_607000])]" name="parent_id"/>
         </record>
         <record id="pcg_607200" model="account.account">
             <field name="name">Achats de marchandises CEE</field>
@@ -5549,9 +5549,9 @@
             <field name="type">expense</field>
             <field name="note">pour déclaration TVA intracommunautaire</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_607000])]"/>
+            <field eval="[(6,0,[pcg_607000])]" name="parent_id"/>
         </record>
         <record id="pcg_607300" model="account.account">
             <field name="name">Achats de marchandises hors CEE</field>
@@ -5559,459 +5559,459 @@
             <field name="type">expense</field>
             <field name="note">pour déclaration TVA extracommunautaire</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_607000])]"/>
+            <field eval="[(6,0,[pcg_607000])]" name="parent_id"/>
         </record>
         <record id="pcg_608000" model="account.account">
             <field name="name">Récapitulation des frais accessoires incorporés aux achats</field>
             <field name="code">608000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_609000" model="account.account">
             <field name="name">Rabais remises et ristournes obtenus sur achats</field>
             <field name="code">609000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_60])]"/>
+            <field eval="[(6,0,[pcg_Comptes_60])]" name="parent_id"/>
         </record>
         <record id="pcg_609100" model="account.account">
             <field name="name">Remises sur achats de matières premières (et fournitures)</field>
             <field name="code">609100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_609000])]"/>
+            <field eval="[(6,0,[pcg_609000])]" name="parent_id"/>
         </record>
         <record id="pcg_609200" model="account.account">
             <field name="name">Remises sur achats d'autres approvisionnements stockés</field>
             <field name="code">609200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_609000])]"/>
+            <field eval="[(6,0,[pcg_609000])]" name="parent_id"/>
         </record>
         <record id="pcg_609400" model="account.account">
             <field name="name">Remises sur achats d'études et prestations de services</field>
             <field name="code">609400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_609000])]"/>
+            <field eval="[(6,0,[pcg_609000])]" name="parent_id"/>
         </record>
         <record id="pcg_609500" model="account.account">
             <field name="name">Remises sur achats de matériel équipements et travaux</field>
             <field name="code">609500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_609000])]"/>
+            <field eval="[(6,0,[pcg_609000])]" name="parent_id"/>
         </record>
         <record id="pcg_609600" model="account.account">
             <field name="name">Remises sur achats d'approvisionnements non stockés</field>
             <field name="code">609600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_609000])]"/>
+            <field eval="[(6,0,[pcg_609000])]" name="parent_id"/>
         </record>
         <record id="pcg_609700" model="account.account">
             <field name="name">Remises sur achats de marchandises</field>
             <field name="code">609700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_609000])]"/>
+            <field eval="[(6,0,[pcg_609000])]" name="parent_id"/>
         </record>
         <record id="pcg_609800" model="account.account">
             <field name="name">Rabais remises et ristournes non affectés</field>
             <field name="code">609800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_609000])]"/>
+            <field eval="[(6,0,[pcg_609000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_61" model="account.account">
             <field name="name">Services extérieurs</field>
             <field name="code">Comptes_61</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_611000" model="account.account">
             <field name="name">Sous-traitance générale</field>
             <field name="code">611000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_612000" model="account.account">
             <field name="name">Redevances de crédit-bail</field>
             <field name="code">612000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_612200" model="account.account">
             <field name="name">Crédit-bail mobilier</field>
             <field name="code">612200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_612000])]"/>
+            <field eval="[(6,0,[pcg_612000])]" name="parent_id"/>
         </record>
         <record id="pcg_612500" model="account.account">
             <field name="name">Crédit-bail immobilier</field>
             <field name="code">612500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_612000])]"/>
+            <field eval="[(6,0,[pcg_612000])]" name="parent_id"/>
         </record>
         <record id="pcg_613000" model="account.account">
             <field name="name">Locations</field>
             <field name="code">613000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_613200" model="account.account">
             <field name="name">Locations immobilières</field>
             <field name="code">613200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_613000])]"/>
+            <field eval="[(6,0,[pcg_613000])]" name="parent_id"/>
         </record>
         <record id="pcg_613500" model="account.account">
             <field name="name">Locations mobilières</field>
             <field name="code">613500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_613000])]"/>
+            <field eval="[(6,0,[pcg_613000])]" name="parent_id"/>
         </record>
         <record id="pcg_613600" model="account.account">
             <field name="name">Malis sur emballages</field>
             <field name="code">613600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_613000])]"/>
+            <field eval="[(6,0,[pcg_613000])]" name="parent_id"/>
         </record>
         <record id="pcg_614000" model="account.account">
             <field name="name">Charges locatives et de copropriété</field>
             <field name="code">614000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_615000" model="account.account">
             <field name="name">Entretien et réparations</field>
             <field name="code">615000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_615200" model="account.account">
             <field name="name">Entretien et réparations sur biens immobiliers</field>
             <field name="code">615200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_615000])]"/>
+            <field eval="[(6,0,[pcg_615000])]" name="parent_id"/>
         </record>
         <record id="pcg_615500" model="account.account">
             <field name="name">Entretien et réparations sur biens mobiliers</field>
             <field name="code">615500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_615000])]"/>
+            <field eval="[(6,0,[pcg_615000])]" name="parent_id"/>
         </record>
         <record id="pcg_615600" model="account.account">
             <field name="name">Maintenance</field>
             <field name="code">615600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_615000])]"/>
+            <field eval="[(6,0,[pcg_615000])]" name="parent_id"/>
         </record>
         <record id="pcg_616000" model="account.account">
             <field name="name">Primes d'assurance</field>
             <field name="code">616000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_616100" model="account.account">
             <field name="name">Multirisques</field>
             <field name="code">616100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_616000])]"/>
+            <field eval="[(6,0,[pcg_616000])]" name="parent_id"/>
         </record>
         <record id="pcg_616200" model="account.account">
             <field name="name">Assurance obligatoire dommage construction </field>
             <field name="code">616200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_616000])]"/>
+            <field eval="[(6,0,[pcg_616000])]" name="parent_id"/>
         </record>
         <record id="pcg_616300" model="account.account">
             <field name="name">Assurance transport</field>
             <field name="code">616300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_616000])]"/>
+            <field eval="[(6,0,[pcg_616000])]" name="parent_id"/>
         </record>
         <record id="pcg_616360" model="account.account">
             <field name="name">Assurance transport sur achats</field>
             <field name="code">616360</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_616300])]"/>
+            <field eval="[(6,0,[pcg_616300])]" name="parent_id"/>
         </record>
         <record id="pcg_616370" model="account.account">
             <field name="name">Assurance transportsur ventes</field>
             <field name="code">616370</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_616300])]"/>
+            <field eval="[(6,0,[pcg_616300])]" name="parent_id"/>
         </record>
         <record id="pcg_616380" model="account.account">
             <field name="name">Assurance transport sur autres biens</field>
             <field name="code">616380</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_616300])]"/>
+            <field eval="[(6,0,[pcg_616300])]" name="parent_id"/>
         </record>
         <record id="pcg_616400" model="account.account">
             <field name="name">Risques d'exploitation</field>
             <field name="code">616400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_616000])]"/>
+            <field eval="[(6,0,[pcg_616000])]" name="parent_id"/>
         </record>
         <record id="pcg_616500" model="account.account">
             <field name="name">Insolvabilité clients</field>
             <field name="code">616500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_616000])]"/>
+            <field eval="[(6,0,[pcg_616000])]" name="parent_id"/>
         </record>
         <record id="pcg_617000" model="account.account">
             <field name="name">Études et recherches</field>
             <field name="code">617000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_618000" model="account.account">
             <field name="name">Divers</field>
             <field name="code">618000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_618100" model="account.account">
             <field name="name">Documentation générale</field>
             <field name="code">618100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_618000])]"/>
+            <field eval="[(6,0,[pcg_618000])]" name="parent_id"/>
         </record>
         <record id="pcg_618300" model="account.account">
             <field name="name">Documentation technique</field>
             <field name="code">618300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_618000])]"/>
+            <field eval="[(6,0,[pcg_618000])]" name="parent_id"/>
         </record>
         <record id="pcg_618500" model="account.account">
             <field name="name">Frais de colloques séminaires conférences</field>
             <field name="code">618500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_618000])]"/>
+            <field eval="[(6,0,[pcg_618000])]" name="parent_id"/>
         </record>
         <record id="pcg_619000" model="account.account">
             <field name="name">Rabais remises et ristournes obtenus sur services extérieurs</field>
             <field name="code">619000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_61])]"/>
+            <field eval="[(6,0,[pcg_Comptes_61])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_62" model="account.account">
             <field name="name">Autres services extérieurs</field>
             <field name="code">Comptes_62</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_621000" model="account.account">
             <field name="name">Personnel extérieur à l'entreprise</field>
             <field name="code">621000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_621100" model="account.account">
             <field name="name">Personnel intérimaire</field>
             <field name="code">621100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_621000])]"/>
+            <field eval="[(6,0,[pcg_621000])]" name="parent_id"/>
         </record>
         <record id="pcg_621400" model="account.account">
             <field name="name">Personnel détaché ou prêté à l'entreprise</field>
             <field name="code">621400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_621000])]"/>
+            <field eval="[(6,0,[pcg_621000])]" name="parent_id"/>
         </record>
         <record id="pcg_622000" model="account.account">
             <field name="name">Rémunérations d'intermédiaires et honoraires </field>
             <field name="code">622000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_622100" model="account.account">
             <field name="name">Commissions et courtages sur achats </field>
             <field name="code">622100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_622000])]"/>
+            <field eval="[(6,0,[pcg_622000])]" name="parent_id"/>
         </record>
         <record id="pcg_622200" model="account.account">
             <field name="name">Commissions et courtages sur ventes</field>
             <field name="code">622200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_622000])]"/>
+            <field eval="[(6,0,[pcg_622000])]" name="parent_id"/>
         </record>
         <record id="pcg_622400" model="account.account">
             <field name="name">Rémunérations des transitaires</field>
             <field name="code">622400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_622000])]"/>
+            <field eval="[(6,0,[pcg_622000])]" name="parent_id"/>
         </record>
         <record id="pcg_622500" model="account.account">
             <field name="name">Rémunérations d'affacturage</field>
             <field name="code">622500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_622000])]"/>
+            <field eval="[(6,0,[pcg_622000])]" name="parent_id"/>
         </record>
         <record id="pcg_622600" model="account.account">
             <field name="name">Honoraires</field>
             <field name="code">622600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_622000])]"/>
+            <field eval="[(6,0,[pcg_622000])]" name="parent_id"/>
         </record>
         <record id="pcg_622700" model="account.account">
             <field name="name">Frais d'actes et de contentieux</field>
             <field name="code">622700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_622000])]"/>
+            <field eval="[(6,0,[pcg_622000])]" name="parent_id"/>
         </record>
         <record id="pcg_622800" model="account.account">
             <field name="name">Divers</field>
             <field name="code">622800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_622000])]"/>
+            <field eval="[(6,0,[pcg_622000])]" name="parent_id"/>
         </record>
         <record id="pcg_623000" model="account.account">
             <field name="name">Publicité publications relations publiques</field>
@@ -6019,36 +6019,36 @@
             <field name="type">expense</field>
             <field name="note">dont annonces légales, greffe, cartes visites</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_623100" model="account.account">
             <field name="name">Annonces et insertions</field>
             <field name="code">623100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_623000])]"/>
+            <field eval="[(6,0,[pcg_623000])]" name="parent_id"/>
         </record>
         <record id="pcg_623200" model="account.account">
             <field name="name">Échantillons</field>
             <field name="code">623200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_623000])]"/>
+            <field eval="[(6,0,[pcg_623000])]" name="parent_id"/>
         </record>
         <record id="pcg_623300" model="account.account">
             <field name="name">Foires et expositions</field>
             <field name="code">623300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_623000])]"/>
+            <field eval="[(6,0,[pcg_623000])]" name="parent_id"/>
         </record>
         <record id="pcg_623400" model="account.account">
             <field name="name">Cadeaux à la clientèle</field>
@@ -6056,162 +6056,162 @@
             <field name="type">expense</field>
             <field name="note">attention déclaration DAS fin d'année</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_623000])]"/>
+            <field eval="[(6,0,[pcg_623000])]" name="parent_id"/>
         </record>
         <record id="pcg_623500" model="account.account">
             <field name="name">Primes</field>
             <field name="code">623500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_623000])]"/>
+            <field eval="[(6,0,[pcg_623000])]" name="parent_id"/>
         </record>
         <record id="pcg_623600" model="account.account">
             <field name="name">Catalogues et imprimés</field>
             <field name="code">623600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_623000])]"/>
+            <field eval="[(6,0,[pcg_623000])]" name="parent_id"/>
         </record>
         <record id="pcg_623700" model="account.account">
             <field name="name">Publications</field>
             <field name="code">623700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_623000])]"/>
+            <field eval="[(6,0,[pcg_623000])]" name="parent_id"/>
         </record>
         <record id="pcg_623800" model="account.account">
             <field name="name">Divers (pourboires dons courants)</field>
             <field name="code">623800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_623000])]"/>
+            <field eval="[(6,0,[pcg_623000])]" name="parent_id"/>
         </record>
         <record id="pcg_624000" model="account.account">
             <field name="name">Transports de biens et transports collectifs du personnel</field>
             <field name="code">624000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_624100" model="account.account">
             <field name="name">Transports sur achats</field>
             <field name="code">624100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_624000])]"/>
+            <field eval="[(6,0,[pcg_624000])]" name="parent_id"/>
         </record>
         <record id="pcg_624200" model="account.account">
             <field name="name">Transports sur ventes</field>
             <field name="code">624200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_624000])]"/>
+            <field eval="[(6,0,[pcg_624000])]" name="parent_id"/>
         </record>
         <record id="pcg_624300" model="account.account">
             <field name="name">Transports entre établissements ou chantiers</field>
             <field name="code">624300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_624000])]"/>
+            <field eval="[(6,0,[pcg_624000])]" name="parent_id"/>
         </record>
         <record id="pcg_624400" model="account.account">
             <field name="name">Transports administratifs</field>
             <field name="code">624400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_624000])]"/>
+            <field eval="[(6,0,[pcg_624000])]" name="parent_id"/>
         </record>
         <record id="pcg_624700" model="account.account">
             <field name="name">Transports collectifs du personnel</field>
             <field name="code">624700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_624000])]"/>
+            <field eval="[(6,0,[pcg_624000])]" name="parent_id"/>
         </record>
         <record id="pcg_624800" model="account.account">
             <field name="name">Divers</field>
             <field name="code">624800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_624000])]"/>
+            <field eval="[(6,0,[pcg_624000])]" name="parent_id"/>
         </record>
         <record id="pcg_625000" model="account.account">
             <field name="name">Déplacements missions et réceptions</field>
             <field name="code">625000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_625100" model="account.account">
             <field name="name">Voyages et déplacements</field>
             <field name="code">625100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_625000])]"/>
+            <field eval="[(6,0,[pcg_625000])]" name="parent_id"/>
         </record>
         <record id="pcg_625500" model="account.account">
             <field name="name">Frais de déménagement</field>
             <field name="code">625500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_625000])]"/>
+            <field eval="[(6,0,[pcg_625000])]" name="parent_id"/>
         </record>
         <record id="pcg_625600" model="account.account">
             <field name="name">Missions</field>
             <field name="code">625600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_625000])]"/>
+            <field eval="[(6,0,[pcg_625000])]" name="parent_id"/>
         </record>
         <record id="pcg_625700" model="account.account">
             <field name="name">Réceptions</field>
             <field name="code">625700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_625000])]"/>
+            <field eval="[(6,0,[pcg_625000])]" name="parent_id"/>
         </record>
         <record id="pcg_626000" model="account.account">
             <field name="name">Frais postaux et frais de télécommunications</field>
             <field name="code">626000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_627000" model="account.account">
             <field name="name">Services bancaires et assimilés</field>
@@ -6219,63 +6219,63 @@
             <field name="type">expense</field>
             <field name="note">frais de tenue de compte...</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_627100" model="account.account">
             <field name="name">Frais sur titres (achat vente garde)</field>
             <field name="code">627100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_627000])]"/>
+            <field eval="[(6,0,[pcg_627000])]" name="parent_id"/>
         </record>
         <record id="pcg_627200" model="account.account">
             <field name="name">Commissions et frais sur émission d'emprunts</field>
             <field name="code">627200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_627000])]"/>
+            <field eval="[(6,0,[pcg_627000])]" name="parent_id"/>
         </record>
         <record id="pcg_627500" model="account.account">
             <field name="name">Frais sur effets</field>
             <field name="code">627500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_627000])]"/>
+            <field eval="[(6,0,[pcg_627000])]" name="parent_id"/>
         </record>
         <record id="pcg_627600" model="account.account">
             <field name="name">Location de coffres</field>
             <field name="code">627600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_627000])]"/>
+            <field eval="[(6,0,[pcg_627000])]" name="parent_id"/>
         </record>
         <record id="pcg_627800" model="account.account">
             <field name="name">Autres frais et commissions sur prestations de services</field>
             <field name="code">627800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_627000])]"/>
+            <field eval="[(6,0,[pcg_627000])]" name="parent_id"/>
         </record>
         <record id="pcg_628000" model="account.account">
             <field name="name">Divers</field>
             <field name="code">628000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_628100" model="account.account">
             <field name="name">Concours divers (cotisations)</field>
@@ -6283,549 +6283,549 @@
             <field name="type">expense</field>
             <field name="note">dont sites internet (hébergement, nom domaine...)</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_628000])]"/>
+            <field eval="[(6,0,[pcg_628000])]" name="parent_id"/>
         </record>
         <record id="pcg_628400" model="account.account">
             <field name="name">Frais de recrutement de personnel</field>
             <field name="code">628400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_628000])]"/>
+            <field eval="[(6,0,[pcg_628000])]" name="parent_id"/>
         </record>
         <record id="pcg_629000" model="account.account">
             <field name="name">Rabais remises et ristournes obtenus sur autres services extérieurs</field>
             <field name="code">629000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_62])]"/>
+            <field eval="[(6,0,[pcg_Comptes_62])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_63" model="account.account">
             <field name="name">Impôts taxes et versements assimilés</field>
             <field name="code">Comptes_63</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_631000" model="account.account">
             <field name="name">Impôts taxes et versements assimilés sur rémunérations (administration des impôts) </field>
             <field name="code">631000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_63])]"/>
+            <field eval="[(6,0,[pcg_Comptes_63])]" name="parent_id"/>
         </record>
         <record id="pcg_631100" model="account.account">
             <field name="name">Taxe sur les salaires</field>
             <field name="code">631100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_631000])]"/>
+            <field eval="[(6,0,[pcg_631000])]" name="parent_id"/>
         </record>
         <record id="pcg_631200" model="account.account">
             <field name="name">Taxe d'apprentissage</field>
             <field name="code">631200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_631000])]"/>
+            <field eval="[(6,0,[pcg_631000])]" name="parent_id"/>
         </record>
         <record id="pcg_631300" model="account.account">
             <field name="name">Participation des employeurs à la formation professionnelle continue</field>
             <field name="code">631300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_631000])]"/>
+            <field eval="[(6,0,[pcg_631000])]" name="parent_id"/>
         </record>
         <record id="pcg_631400" model="account.account">
             <field name="name">Cotisation pour défaut d'investissement obligatoire dans la construction</field>
             <field name="code">631400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_631000])]"/>
+            <field eval="[(6,0,[pcg_631000])]" name="parent_id"/>
         </record>
         <record id="pcg_631800" model="account.account">
             <field name="name">Autres</field>
             <field name="code">631800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_631000])]"/>
+            <field eval="[(6,0,[pcg_631000])]" name="parent_id"/>
         </record>
         <record id="pcg_633000" model="account.account">
             <field name="name">Impôts taxes et versements assimilés sur rémunérations (autres organismes)</field>
             <field name="code">633000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_63])]"/>
+            <field eval="[(6,0,[pcg_Comptes_63])]" name="parent_id"/>
         </record>
         <record id="pcg_633100" model="account.account">
             <field name="name">Versement de transport</field>
             <field name="code">633100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_633000])]"/>
+            <field eval="[(6,0,[pcg_633000])]" name="parent_id"/>
         </record>
         <record id="pcg_633200" model="account.account">
             <field name="name">Allocation logement</field>
             <field name="code">633200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_633000])]"/>
+            <field eval="[(6,0,[pcg_633000])]" name="parent_id"/>
         </record>
         <record id="pcg_633300" model="account.account">
             <field name="name">Participation des employeurs à la formation professionnelle continue</field>
             <field name="code">633300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_633000])]"/>
+            <field eval="[(6,0,[pcg_633000])]" name="parent_id"/>
         </record>
         <record id="pcg_633400" model="account.account">
             <field name="name">Participation des employeurs à l'effort de construction</field>
             <field name="code">633400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_633000])]"/>
+            <field eval="[(6,0,[pcg_633000])]" name="parent_id"/>
         </record>
         <record id="pcg_633500" model="account.account">
             <field name="name">Versements libératoires ouvrant droit à l'exonération de la taxe d'apprentissage</field>
             <field name="code">633500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_633000])]"/>
+            <field eval="[(6,0,[pcg_633000])]" name="parent_id"/>
         </record>
         <record id="pcg_633800" model="account.account">
             <field name="name">Autres</field>
             <field name="code">633800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_633000])]"/>
+            <field eval="[(6,0,[pcg_633000])]" name="parent_id"/>
         </record>
         <record id="pcg_635000" model="account.account">
             <field name="name">Autres impôts taxes et versements assimilés (administration des impôts)</field>
             <field name="code">635000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_63])]"/>
+            <field eval="[(6,0,[pcg_Comptes_63])]" name="parent_id"/>
         </record>
         <record id="pcg_635100" model="account.account">
             <field name="name">Impôts directs (sauf impôts sur les bénéfices)</field>
             <field name="code">635100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635000])]"/>
+            <field eval="[(6,0,[pcg_635000])]" name="parent_id"/>
         </record>
         <record id="pcg_635110" model="account.account">
             <field name="name">Taxe professionnelle</field>
             <field name="code">635110</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635100])]"/>
+            <field eval="[(6,0,[pcg_635100])]" name="parent_id"/>
         </record>
         <record id="pcg_635120" model="account.account">
             <field name="name">Taxes foncières</field>
             <field name="code">635120</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635100])]"/>
+            <field eval="[(6,0,[pcg_635100])]" name="parent_id"/>
         </record>
         <record id="pcg_635130" model="account.account">
             <field name="name">Autres impôts locaux</field>
             <field name="code">635130</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635100])]"/>
+            <field eval="[(6,0,[pcg_635100])]" name="parent_id"/>
         </record>
         <record id="pcg_635140" model="account.account">
             <field name="name">Taxe sur les véhicules des sociétés</field>
             <field name="code">635140</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635100])]"/>
+            <field eval="[(6,0,[pcg_635100])]" name="parent_id"/>
         </record>
         <record id="pcg_635200" model="account.account">
             <field name="name">Taxes sur le chiffre d'affaires non récupérables </field>
             <field name="code">635200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635000])]"/>
+            <field eval="[(6,0,[pcg_635000])]" name="parent_id"/>
         </record>
         <record id="pcg_635300" model="account.account">
             <field name="name">Impôts indirects</field>
             <field name="code">635300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635000])]"/>
+            <field eval="[(6,0,[pcg_635000])]" name="parent_id"/>
         </record>
         <record id="pcg_635400" model="account.account">
             <field name="name">Droits d'enregistrement et de timbre</field>
             <field name="code">635400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635000])]"/>
+            <field eval="[(6,0,[pcg_635000])]" name="parent_id"/>
         </record>
         <record id="pcg_635410" model="account.account">
             <field name="name">Droits de mutation</field>
             <field name="code">635410</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635400])]"/>
+            <field eval="[(6,0,[pcg_635400])]" name="parent_id"/>
         </record>
         <record id="pcg_635800" model="account.account">
             <field name="name">Autres droits</field>
             <field name="code">635800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_635000])]"/>
+            <field eval="[(6,0,[pcg_635000])]" name="parent_id"/>
         </record>
         <record id="pcg_637000" model="account.account">
             <field name="name">Autres impôts taxes et versements assimilés (autres organismes)</field>
             <field name="code">637000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_63])]"/>
+            <field eval="[(6,0,[pcg_Comptes_63])]" name="parent_id"/>
         </record>
         <record id="pcg_637100" model="account.account">
             <field name="name">Contribution sociale de solidarité à la charge des sociétés</field>
             <field name="code">637100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_637000])]"/>
+            <field eval="[(6,0,[pcg_637000])]" name="parent_id"/>
         </record>
         <record id="pcg_637200" model="account.account">
             <field name="name">Taxes perçues par les organismes publics internationaux</field>
             <field name="code">637200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_637000])]"/>
+            <field eval="[(6,0,[pcg_637000])]" name="parent_id"/>
         </record>
         <record id="pcg_637400" model="account.account">
             <field name="name">Impôts et taxes exigibles à l'étranger</field>
             <field name="code">637400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_637000])]"/>
+            <field eval="[(6,0,[pcg_637000])]" name="parent_id"/>
         </record>
         <record id="pcg_637800" model="account.account">
             <field name="name">Taxes diverses</field>
             <field name="code">637800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_637000])]"/>
+            <field eval="[(6,0,[pcg_637000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_64" model="account.account">
             <field name="name">Charges de personnel</field>
             <field name="code">Comptes_64</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_641000" model="account.account">
             <field name="name">Rémunérations du personnel</field>
             <field name="code">641000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_64])]"/>
+            <field eval="[(6,0,[pcg_Comptes_64])]" name="parent_id"/>
         </record>
         <record id="pcg_641100" model="account.account">
             <field name="name">Salaires et appointements</field>
             <field name="code">641100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_641000])]"/>
+            <field eval="[(6,0,[pcg_641000])]" name="parent_id"/>
         </record>
         <record id="pcg_641200" model="account.account">
             <field name="name">Congés payés</field>
             <field name="code">641200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_641000])]"/>
+            <field eval="[(6,0,[pcg_641000])]" name="parent_id"/>
         </record>
         <record id="pcg_641300" model="account.account">
             <field name="name">Primes et gratifications</field>
             <field name="code">641300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_641000])]"/>
+            <field eval="[(6,0,[pcg_641000])]" name="parent_id"/>
         </record>
         <record id="pcg_641400" model="account.account">
             <field name="name">Indemnités et avantages divers</field>
             <field name="code">641400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_641000])]"/>
+            <field eval="[(6,0,[pcg_641000])]" name="parent_id"/>
         </record>
         <record id="pcg_641500" model="account.account">
             <field name="name">Supplément familial</field>
             <field name="code">641500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_641000])]"/>
+            <field eval="[(6,0,[pcg_641000])]" name="parent_id"/>
         </record>
         <record id="pcg_644000" model="account.account">
             <field name="name">Rémunération du travail de l'exploitant</field>
             <field name="code">644000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_64])]"/>
+            <field eval="[(6,0,[pcg_Comptes_64])]" name="parent_id"/>
         </record>
         <record id="pcg_645000" model="account.account">
             <field name="name">Charges de Sécurité sociale et de prévoyance</field>
             <field name="code">645000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_64])]"/>
+            <field eval="[(6,0,[pcg_Comptes_64])]" name="parent_id"/>
         </record>
         <record id="pcg_645100" model="account.account">
             <field name="name">Cotisations à l'URSSAF</field>
             <field name="code">645100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_645000])]"/>
+            <field eval="[(6,0,[pcg_645000])]" name="parent_id"/>
         </record>
         <record id="pcg_645200" model="account.account">
             <field name="name">Cotisations aux mutuelles</field>
             <field name="code">645200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_645000])]"/>
+            <field eval="[(6,0,[pcg_645000])]" name="parent_id"/>
         </record>
         <record id="pcg_645300" model="account.account">
             <field name="name">Cotisations aux caisses de retraites</field>
             <field name="code">645300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_645000])]"/>
+            <field eval="[(6,0,[pcg_645000])]" name="parent_id"/>
         </record>
         <record id="pcg_645400" model="account.account">
             <field name="name">Cotisations aux ASSEDIC</field>
             <field name="code">645400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_645000])]"/>
+            <field eval="[(6,0,[pcg_645000])]" name="parent_id"/>
         </record>
         <record id="pcg_645800" model="account.account">
             <field name="name">Cotisations aux autres organismes sociaux</field>
             <field name="code">645800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_645000])]"/>
+            <field eval="[(6,0,[pcg_645000])]" name="parent_id"/>
         </record>
         <record id="pcg_646000" model="account.account">
             <field name="name">Cotisations sociales personnelles de l'exploitant</field>
             <field name="code">646000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_64])]"/>
+            <field eval="[(6,0,[pcg_Comptes_64])]" name="parent_id"/>
         </record>
         <record id="pcg_647000" model="account.account">
             <field name="name">Autres charges sociales</field>
             <field name="code">647000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_64])]"/>
+            <field eval="[(6,0,[pcg_Comptes_64])]" name="parent_id"/>
         </record>
         <record id="pcg_647100" model="account.account">
             <field name="name">Prestations directes</field>
             <field name="code">647100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_647000])]"/>
+            <field eval="[(6,0,[pcg_647000])]" name="parent_id"/>
         </record>
         <record id="pcg_647200" model="account.account">
             <field name="name">Versements aux comités d'entreprise et d'établissement</field>
             <field name="code">647200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_647000])]"/>
+            <field eval="[(6,0,[pcg_647000])]" name="parent_id"/>
         </record>
         <record id="pcg_647300" model="account.account">
             <field name="name">Versements aux comités d'hygiène et de sécurité</field>
             <field name="code">647300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_647000])]"/>
+            <field eval="[(6,0,[pcg_647000])]" name="parent_id"/>
         </record>
         <record id="pcg_647400" model="account.account">
             <field name="name">Versements aux autres oeuvres sociales</field>
             <field name="code">647400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_647000])]"/>
+            <field eval="[(6,0,[pcg_647000])]" name="parent_id"/>
         </record>
         <record id="pcg_647500" model="account.account">
             <field name="name">Médecine du travail pharmacie</field>
             <field name="code">647500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_647000])]"/>
+            <field eval="[(6,0,[pcg_647000])]" name="parent_id"/>
         </record>
         <record id="pcg_648000" model="account.account">
             <field name="name">Autres charges de personnel</field>
             <field name="code">648000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_64])]"/>
+            <field eval="[(6,0,[pcg_Comptes_64])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_65" model="account.account">
             <field name="name">Autres charges de gestion courante</field>
             <field name="code">Comptes_65</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_651000" model="account.account">
             <field name="name">Redevances pour concessions brevets licences marques procédés logiciels droits et valeurs similaires</field>
             <field name="code">651000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_65])]"/>
+            <field eval="[(6,0,[pcg_Comptes_65])]" name="parent_id"/>
         </record>
         <record id="pcg_651100" model="account.account">
             <field name="name">Redevances pour concessions brevets licences marques procédés logiciels </field>
             <field name="code">651100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_651000])]"/>
+            <field eval="[(6,0,[pcg_651000])]" name="parent_id"/>
         </record>
         <record id="pcg_651600" model="account.account">
             <field name="name">Droits d'auteur et de reproduction</field>
             <field name="code">651600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_651000])]"/>
+            <field eval="[(6,0,[pcg_651000])]" name="parent_id"/>
         </record>
         <record id="pcg_651800" model="account.account">
             <field name="name">Autres droits et valeurs similaires</field>
             <field name="code">651800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_651000])]"/>
+            <field eval="[(6,0,[pcg_651000])]" name="parent_id"/>
         </record>
         <record id="pcg_653000" model="account.account">
             <field name="name">Jetons de présence</field>
             <field name="code">653000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_65])]"/>
+            <field eval="[(6,0,[pcg_Comptes_65])]" name="parent_id"/>
         </record>
         <record id="pcg_654000" model="account.account">
             <field name="name">Pertes sur créances irrécouvrables</field>
@@ -6833,63 +6833,63 @@
             <field name="type">expense</field>
             <field name="note">Faire et conserver les relances et mises en demeures</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_65])]"/>
+            <field eval="[(6,0,[pcg_Comptes_65])]" name="parent_id"/>
         </record>
         <record id="pcg_654100" model="account.account">
             <field name="name">Créances de l'exercice</field>
             <field name="code">654100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_654000])]"/>
+            <field eval="[(6,0,[pcg_654000])]" name="parent_id"/>
         </record>
         <record id="pcg_654400" model="account.account">
             <field name="name">Créances des exercices antérieurs</field>
             <field name="code">654400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_654000])]"/>
+            <field eval="[(6,0,[pcg_654000])]" name="parent_id"/>
         </record>
         <record id="pcg_655000" model="account.account">
             <field name="name">Quotes-parts de résultat sur opérations faites en commun</field>
             <field name="code">655000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_65])]"/>
+            <field eval="[(6,0,[pcg_Comptes_65])]" name="parent_id"/>
         </record>
         <record id="pcg_655100" model="account.account">
             <field name="name">Quote-part de bénéfice transférée (comptabilité du gérant)</field>
             <field name="code">655100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_655000])]"/>
+            <field eval="[(6,0,[pcg_655000])]" name="parent_id"/>
         </record>
         <record id="pcg_655500" model="account.account">
             <field name="name">Quote-part de perte supportée (comptabilité des associés non gérants)</field>
             <field name="code">655500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_655000])]"/>
+            <field eval="[(6,0,[pcg_655000])]" name="parent_id"/>
         </record>
         <record id="pcg_658000" model="account.account">
             <field name="name">Charges diverses de gestion courante</field>
             <field name="code">658000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_65])]"/>
+            <field eval="[(6,0,[pcg_Comptes_65])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_66" model="account.account">
             <field name="name">Charges financières</field>
@@ -6897,126 +6897,126 @@
             <field name="type">view</field>
             <field name="note">dont intérêts d'emprunt</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_661000" model="account.account">
             <field name="name">Charges d'intérêt</field>
             <field name="code">661000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_66])]"/>
+            <field eval="[(6,0,[pcg_Comptes_66])]" name="parent_id"/>
         </record>
         <record id="pcg_661100" model="account.account">
             <field name="name">Intérêts des emprunts et dettes</field>
             <field name="code">661100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661000])]"/>
+            <field eval="[(6,0,[pcg_661000])]" name="parent_id"/>
         </record>
         <record id="pcg_661160" model="account.account">
             <field name="name">Intérêts des emprunts et dettes assimilées</field>
             <field name="code">661160</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661100])]"/>
+            <field eval="[(6,0,[pcg_661100])]" name="parent_id"/>
         </record>
         <record id="pcg_661170" model="account.account">
             <field name="name">Intérêts des dettes rattachées à des participations</field>
             <field name="code">661170</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661100])]"/>
+            <field eval="[(6,0,[pcg_661100])]" name="parent_id"/>
         </record>
         <record id="pcg_661500" model="account.account">
             <field name="name">Intérêts des comptes courants et des dépôts créditeurs</field>
             <field name="code">661500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661000])]"/>
+            <field eval="[(6,0,[pcg_661000])]" name="parent_id"/>
         </record>
         <record id="pcg_661600" model="account.account">
             <field name="name">Intérêts bancaires et sur opérations de financement (escompte )</field>
             <field name="code">661600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661000])]"/>
+            <field eval="[(6,0,[pcg_661000])]" name="parent_id"/>
         </record>
         <record id="pcg_661700" model="account.account">
             <field name="name">Intérêts des obligations cautionnées</field>
             <field name="code">661700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661000])]"/>
+            <field eval="[(6,0,[pcg_661000])]" name="parent_id"/>
         </record>
         <record id="pcg_661800" model="account.account">
             <field name="name">Intérêts des autres dettes</field>
             <field name="code">661800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661000])]"/>
+            <field eval="[(6,0,[pcg_661000])]" name="parent_id"/>
         </record>
         <record id="pcg_661810" model="account.account">
             <field name="name">Intérêts des dettes commerciales</field>
             <field name="code">661810</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661800])]"/>
+            <field eval="[(6,0,[pcg_661800])]" name="parent_id"/>
         </record>
         <record id="pcg_661880" model="account.account">
             <field name="name">Intérêts des dettes diverses</field>
             <field name="code">661880</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_661800])]"/>
+            <field eval="[(6,0,[pcg_661800])]" name="parent_id"/>
         </record>
         <record id="pcg_664000" model="account.account">
             <field name="name">Pertes sur créances liées à des participations</field>
             <field name="code">664000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_66])]"/>
+            <field eval="[(6,0,[pcg_Comptes_66])]" name="parent_id"/>
         </record>
         <record id="pcg_665000" model="account.account">
             <field name="name">Escomptes accordés</field>
             <field name="code">665000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_66])]"/>
+            <field eval="[(6,0,[pcg_Comptes_66])]" name="parent_id"/>
         </record>
         <record id="pcg_666000" model="account.account">
             <field name="name">Pertes de change</field>
             <field name="code">666000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_66])]"/>
+            <field eval="[(6,0,[pcg_Comptes_66])]" name="parent_id"/>
         </record>
         <record id="pcg_667000" model="account.account">
             <field name="name">Charges nettes sur cessions de valeurs mobilières de placement</field>
@@ -7024,45 +7024,45 @@
             <field name="type">expense</field>
             <field name="note">en contrepartie 767</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_66])]"/>
+            <field eval="[(6,0,[pcg_Comptes_66])]" name="parent_id"/>
         </record>
         <record id="pcg_668000" model="account.account">
             <field name="name">Autres charges financières</field>
             <field name="code">668000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_66])]"/>
+            <field eval="[(6,0,[pcg_Comptes_66])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_67" model="account.account">
             <field name="name">Charges exceptionnelles</field>
             <field name="code">Comptes_67</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_671000" model="account.account">
             <field name="name">Charges exceptionnelles sur opérations de gestion</field>
             <field name="code">671000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_67])]"/>
+            <field eval="[(6,0,[pcg_Comptes_67])]" name="parent_id"/>
         </record>
         <record id="pcg_671100" model="account.account">
             <field name="name">Pénalités sur marchés (et dédits payés sur achats et ventes)</field>
             <field name="code">671100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_671000])]"/>
+            <field eval="[(6,0,[pcg_671000])]" name="parent_id"/>
         </record>
         <record id="pcg_671200" model="account.account">
             <field name="name">Pénalités amendes fiscales et pénales </field>
@@ -7070,63 +7070,63 @@
             <field name="type">expense</field>
             <field name="note">PV code de la route non déductibles</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_671000])]"/>
+            <field eval="[(6,0,[pcg_671000])]" name="parent_id"/>
         </record>
         <record id="pcg_671300" model="account.account">
             <field name="name">Dons libéralités</field>
             <field name="code">671300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_671000])]"/>
+            <field eval="[(6,0,[pcg_671000])]" name="parent_id"/>
         </record>
         <record id="pcg_671400" model="account.account">
             <field name="name">Créances devenues irrécouvrables dans l'exercice</field>
             <field name="code">671400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_671000])]"/>
+            <field eval="[(6,0,[pcg_671000])]" name="parent_id"/>
         </record>
         <record id="pcg_671500" model="account.account">
             <field name="name">Subventions accordées</field>
             <field name="code">671500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_671000])]"/>
+            <field eval="[(6,0,[pcg_671000])]" name="parent_id"/>
         </record>
         <record id="pcg_671700" model="account.account">
             <field name="name">Rappels d'impôts (autres qu'impôts sur les bénéfices)</field>
             <field name="code">671700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_671000])]"/>
+            <field eval="[(6,0,[pcg_671000])]" name="parent_id"/>
         </record>
         <record id="pcg_671800" model="account.account">
             <field name="name">Autres charges exceptionnelles sur opération de gestion</field>
             <field name="code">671800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_671000])]"/>
+            <field eval="[(6,0,[pcg_671000])]" name="parent_id"/>
         </record>
         <record id="pcg_672000" model="account.account">
             <field name="name">Charges sur exercices antérieurs</field>
             <field name="code">672000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_67])]"/>
+            <field eval="[(6,0,[pcg_Comptes_67])]" name="parent_id"/>
         </record>
         <record id="pcg_675000" model="account.account">
             <field name="name">Valeurs comptables des éléments d'actif cédés</field>
@@ -7134,603 +7134,603 @@
             <field name="type">expense</field>
             <field name="note">vente d'immo = VO - amortissements (contrepartie 775)</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_67])]"/>
+            <field eval="[(6,0,[pcg_Comptes_67])]" name="parent_id"/>
         </record>
         <record id="pcg_675100" model="account.account">
             <field name="name">Immobilisations incorporelles</field>
             <field name="code">675100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_675000])]"/>
+            <field eval="[(6,0,[pcg_675000])]" name="parent_id"/>
         </record>
         <record id="pcg_675200" model="account.account">
             <field name="name">Immobilisations corporelles</field>
             <field name="code">675200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_675000])]"/>
+            <field eval="[(6,0,[pcg_675000])]" name="parent_id"/>
         </record>
         <record id="pcg_675600" model="account.account">
             <field name="name">Immobilisations financières</field>
             <field name="code">675600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_675000])]"/>
+            <field eval="[(6,0,[pcg_675000])]" name="parent_id"/>
         </record>
         <record id="pcg_675800" model="account.account">
             <field name="name">Autres éléments d'actif</field>
             <field name="code">675800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_675000])]"/>
+            <field eval="[(6,0,[pcg_675000])]" name="parent_id"/>
         </record>
         <record id="pcg_678000" model="account.account">
             <field name="name">Autres charges exceptionnelles</field>
             <field name="code">678000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_67])]"/>
+            <field eval="[(6,0,[pcg_Comptes_67])]" name="parent_id"/>
         </record>
         <record id="pcg_678100" model="account.account">
             <field name="name">Malis provenant de clauses d'indexation </field>
             <field name="code">678100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_678000])]"/>
+            <field eval="[(6,0,[pcg_678000])]" name="parent_id"/>
         </record>
         <record id="pcg_678200" model="account.account">
             <field name="name">Lots</field>
             <field name="code">678200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_678000])]"/>
+            <field eval="[(6,0,[pcg_678000])]" name="parent_id"/>
         </record>
         <record id="pcg_678300" model="account.account">
             <field name="name">Malis provenant du rachat par l'entreprise d'actions et obligations émises par elle-même</field>
             <field name="code">678300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_678000])]"/>
+            <field eval="[(6,0,[pcg_678000])]" name="parent_id"/>
         </record>
         <record id="pcg_678800" model="account.account">
             <field name="name">Charges exceptionnelles diverses</field>
             <field name="code">678800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_678000])]"/>
+            <field eval="[(6,0,[pcg_678000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_68" model="account.account">
             <field name="name">Dotations aux amortissement et aux provisions</field>
             <field name="code">Comptes_68</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_681000" model="account.account">
             <field name="name">Dotations aux amortissements et aux provisions - Charges d'exploitation</field>
             <field name="code">681000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_68])]"/>
+            <field eval="[(6,0,[pcg_Comptes_68])]" name="parent_id"/>
         </record>
         <record id="pcg_681100" model="account.account">
             <field name="name">Dotations aux amortissements des immobilisations incorporelles et corporelles </field>
             <field name="code">681100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681000])]"/>
+            <field eval="[(6,0,[pcg_681000])]" name="parent_id"/>
         </record>
         <record id="pcg_681110" model="account.account">
             <field name="name">Immobilisations incorporelles</field>
             <field name="code">681110</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681100])]"/>
+            <field eval="[(6,0,[pcg_681100])]" name="parent_id"/>
         </record>
         <record id="pcg_681120" model="account.account">
             <field name="name">Immobilisations corporelles</field>
             <field name="code">681120</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681100])]"/>
+            <field eval="[(6,0,[pcg_681100])]" name="parent_id"/>
         </record>
         <record id="pcg_681200" model="account.account">
             <field name="name">Dotations aux amortissements des charges d'exploitation à répartir</field>
             <field name="code">681200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681000])]"/>
+            <field eval="[(6,0,[pcg_681000])]" name="parent_id"/>
         </record>
         <record id="pcg_681500" model="account.account">
             <field name="name">Dotations aux provisions pour risques et charges d'exploitation</field>
             <field name="code">681500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681000])]"/>
+            <field eval="[(6,0,[pcg_681000])]" name="parent_id"/>
         </record>
         <record id="pcg_681600" model="account.account">
             <field name="name">Dotations pour dépréciations des immobilisations incorporelles et corporelles</field>
             <field name="code">681600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681000])]"/>
+            <field eval="[(6,0,[pcg_681000])]" name="parent_id"/>
         </record>
         <record id="pcg_681610" model="account.account">
             <field name="name">Immobilisations incorporelles</field>
             <field name="code">681610</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681600])]"/>
+            <field eval="[(6,0,[pcg_681600])]" name="parent_id"/>
         </record>
         <record id="pcg_681620" model="account.account">
             <field name="name">Immobilisations corporelles</field>
             <field name="code">681620</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681600])]"/>
+            <field eval="[(6,0,[pcg_681600])]" name="parent_id"/>
         </record>
         <record id="pcg_681700" model="account.account">
             <field name="name">Dotations aux provisions pour dépréciation des actifs circulants</field>
             <field name="code">681700</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681000])]"/>
+            <field eval="[(6,0,[pcg_681000])]" name="parent_id"/>
         </record>
         <record id="pcg_681730" model="account.account">
             <field name="name">Stocks et en-cours</field>
             <field name="code">681730</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681700])]"/>
+            <field eval="[(6,0,[pcg_681700])]" name="parent_id"/>
         </record>
         <record id="pcg_681740" model="account.account">
             <field name="name">Créances</field>
             <field name="code">681740</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_681700])]"/>
+            <field eval="[(6,0,[pcg_681700])]" name="parent_id"/>
         </record>
         <record id="pcg_686000" model="account.account">
             <field name="name">Dotations aux amortissements et aux provisions - Charges financières</field>
             <field name="code">686000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_68])]"/>
+            <field eval="[(6,0,[pcg_Comptes_68])]" name="parent_id"/>
         </record>
         <record id="pcg_686100" model="account.account">
             <field name="name">Dotations aux amortissements des primes de remboursement des obligations</field>
             <field name="code">686100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_686000])]"/>
+            <field eval="[(6,0,[pcg_686000])]" name="parent_id"/>
         </record>
         <record id="pcg_686500" model="account.account">
             <field name="name">Dotations aux provisions pour risques et charges financiers</field>
             <field name="code">686500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_686000])]"/>
+            <field eval="[(6,0,[pcg_686000])]" name="parent_id"/>
         </record>
         <record id="pcg_686600" model="account.account">
             <field name="name">Dotations aux provisions pour dépréciation des éléments financiers</field>
             <field name="code">686600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_686000])]"/>
+            <field eval="[(6,0,[pcg_686000])]" name="parent_id"/>
         </record>
         <record id="pcg_686620" model="account.account">
             <field name="name">Immobilisations financières</field>
             <field name="code">686620</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_686600])]"/>
+            <field eval="[(6,0,[pcg_686600])]" name="parent_id"/>
         </record>
         <record id="pcg_686650" model="account.account">
             <field name="name">Valeurs mobilières de placement</field>
             <field name="code">686650</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_686600])]"/>
+            <field eval="[(6,0,[pcg_686600])]" name="parent_id"/>
         </record>
         <record id="pcg_686800" model="account.account">
             <field name="name">Autres dotations</field>
             <field name="code">686800</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_686000])]"/>
+            <field eval="[(6,0,[pcg_686000])]" name="parent_id"/>
         </record>
         <record id="pcg_687000" model="account.account">
             <field name="name">Dotations aux amortissements et aux provisions - Charges exceptionnelles</field>
             <field name="code">687000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_68])]"/>
+            <field eval="[(6,0,[pcg_Comptes_68])]" name="parent_id"/>
         </record>
         <record id="pcg_687100" model="account.account">
             <field name="name">Dotations aux amortissements exceptionnels des immobilisations</field>
             <field name="code">687100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_687000])]"/>
+            <field eval="[(6,0,[pcg_687000])]" name="parent_id"/>
         </record>
         <record id="pcg_687200" model="account.account">
             <field name="name">Dotations aux provisions réglementées (immobilisations)</field>
             <field name="code">687200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_687000])]"/>
+            <field eval="[(6,0,[pcg_687000])]" name="parent_id"/>
         </record>
         <record id="pcg_687250" model="account.account">
             <field name="name">Amortissements dérogatoires</field>
             <field name="code">687250</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_687200])]"/>
+            <field eval="[(6,0,[pcg_687200])]" name="parent_id"/>
         </record>
         <record id="pcg_687300" model="account.account">
             <field name="name">Dotations aux provisions réglementées (stocks)</field>
             <field name="code">687300</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_687000])]"/>
+            <field eval="[(6,0,[pcg_687000])]" name="parent_id"/>
         </record>
         <record id="pcg_687400" model="account.account">
             <field name="name">Dotations aux autres provisions réglementées</field>
             <field name="code">687400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_687000])]"/>
+            <field eval="[(6,0,[pcg_687000])]" name="parent_id"/>
         </record>
         <record id="pcg_687500" model="account.account">
             <field name="name">Dotations aux provisions pour risques et charges exceptionnels</field>
             <field name="code">687500</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_687000])]"/>
+            <field eval="[(6,0,[pcg_687000])]" name="parent_id"/>
         </record>
         <record id="pcg_687600" model="account.account">
             <field name="name">Dotations pour dépréciations exceptionnelles</field>
             <field name="code">687600</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_687000])]"/>
+            <field eval="[(6,0,[pcg_687000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_69" model="account.account">
             <field name="name">Participation des salariés - Impôts sur les bénéfices et assimilés</field>
             <field name="code">Comptes_69</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_6])]"/>
+            <field eval="[(6,0,[pcg_Classe_6])]" name="parent_id"/>
         </record>
         <record id="pcg_691000" model="account.account">
             <field name="name">Participation des salariés aux résultats</field>
             <field name="code">691000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_69])]"/>
+            <field eval="[(6,0,[pcg_Comptes_69])]" name="parent_id"/>
         </record>
         <record id="pcg_695000" model="account.account">
             <field name="name">Impôts sur les bénéfices</field>
             <field name="code">695000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_69])]"/>
+            <field eval="[(6,0,[pcg_Comptes_69])]" name="parent_id"/>
         </record>
         <record id="pcg_695100" model="account.account">
             <field name="name">Impôts dus en France</field>
             <field name="code">695100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_695000])]"/>
+            <field eval="[(6,0,[pcg_695000])]" name="parent_id"/>
         </record>
         <record id="pcg_695200" model="account.account">
             <field name="name">Contribution additionnelle à l'impôt sur les bénéfices</field>
             <field name="code">695200</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_695000])]"/>
+            <field eval="[(6,0,[pcg_695000])]" name="parent_id"/>
         </record>
         <record id="pcg_695400" model="account.account">
             <field name="name">Impôts dus à l'étranger</field>
             <field name="code">695400</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_695000])]"/>
+            <field eval="[(6,0,[pcg_695000])]" name="parent_id"/>
         </record>
         <record id="pcg_696000" model="account.account">
             <field name="name">Supplément d'impôt sur les sociétés lié aux distributions</field>
             <field name="code">696000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_69])]"/>
+            <field eval="[(6,0,[pcg_Comptes_69])]" name="parent_id"/>
         </record>
         <record id="pcg_697000" model="account.account">
             <field name="name">Imposition forfaitaire annuelle des sociétés</field>
             <field name="code">697000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_69])]"/>
+            <field eval="[(6,0,[pcg_Comptes_69])]" name="parent_id"/>
         </record>
         <record id="pcg_698000" model="account.account">
             <field name="name">Intégration fiscale</field>
             <field name="code">698000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_69])]"/>
+            <field eval="[(6,0,[pcg_Comptes_69])]" name="parent_id"/>
         </record>
         <record id="pcg_698100" model="account.account">
             <field name="name">Intégration fiscale - Charges</field>
             <field name="code">698100</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_698000])]"/>
+            <field eval="[(6,0,[pcg_698000])]" name="parent_id"/>
         </record>
         <record id="pcg_698900" model="account.account">
             <field name="name">Intégration fiscale - Produits</field>
             <field name="code">698900</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_698000])]"/>
+            <field eval="[(6,0,[pcg_698000])]" name="parent_id"/>
         </record>
         <record id="pcg_699000" model="account.account">
             <field name="name">Produits - Reports en arrière des déficits</field>
             <field name="code">699000</field>
             <field name="type">expense</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_69])]"/>
+            <field eval="[(6,0,[pcg_Comptes_69])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_7" model="account.account">
             <field name="name">Comptes de produits</field>
             <field name="code">Classe_7</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_6_et_7])]"/>
+            <field eval="[(6,0,[pcg_Classes_6_et_7])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_70" model="account.account">
             <field name="name">Ventes de produits fabriqués - Prestations de service - Marchandises</field>
             <field name="code">Comptes_70</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_701000" model="account.account">
             <field name="name">Ventes de produits finis</field>
             <field name="code">701000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_701100" model="account.account">
             <field name="name">Ventes de produits finis 5,5%</field>
             <field name="code">701100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_701000])]"/>
+            <field eval="[(6,0,[pcg_701000])]" name="parent_id"/>
         </record>
         <record id="pcg_701300" model="account.account">
             <field name="name">Ventes de produits finis CEE</field>
             <field name="code">701300</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_701000])]"/>
+            <field eval="[(6,0,[pcg_701000])]" name="parent_id"/>
         </record>
         <record id="pcg_701400" model="account.account">
             <field name="name">Ventes de produits finis hors CEE</field>
             <field name="code">701400</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_701000])]"/>
+            <field eval="[(6,0,[pcg_701000])]" name="parent_id"/>
         </record>
         <record id="pcg_702000" model="account.account">
             <field name="name">Ventes de produits intermédiaires</field>
             <field name="code">702000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_703000" model="account.account">
             <field name="name">Ventes de produits résiduels</field>
             <field name="code">703000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_704000" model="account.account">
             <field name="name">Travaux</field>
             <field name="code">704000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_704100" model="account.account">
             <field name="name">Travaux de catégorie (ou activité) A</field>
             <field name="code">704100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_704000])]"/>
+            <field eval="[(6,0,[pcg_704000])]" name="parent_id"/>
         </record>
         <record id="pcg_704200" model="account.account">
             <field name="name">Travaux de catégorie (ou activité) B</field>
             <field name="code">704200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_704000])]"/>
+            <field eval="[(6,0,[pcg_704000])]" name="parent_id"/>
         </record>
         <record id="pcg_705000" model="account.account">
             <field name="name">Études</field>
             <field name="code">705000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_706000" model="account.account">
             <field name="name">Prestations de services</field>
             <field name="code">706000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_706100" model="account.account">
             <field name="name">Prestations 5,5%</field>
             <field name="code">706100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_706000])]"/>
+            <field eval="[(6,0,[pcg_706000])]" name="parent_id"/>
         </record>
         <record id="pcg_706200" model="account.account">
             <field name="name">Prestations 19,6%</field>
             <field name="code">706200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_706000])]"/>
+            <field eval="[(6,0,[pcg_706000])]" name="parent_id"/>
         </record>
         <record id="pcg_706300" model="account.account">
             <field name="name">Prestations CEE</field>
             <field name="code">706300</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_706000])]"/>
+            <field eval="[(6,0,[pcg_706000])]" name="parent_id"/>
         </record>
         <record id="pcg_706400" model="account.account">
             <field name="name">Prestations hors CEE</field>
             <field name="code">706400</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_706000])]"/>
+            <field eval="[(6,0,[pcg_706000])]" name="parent_id"/>
         </record>
         <record id="pcg_707000" model="account.account">
             <field name="name">Ventes de marchandises</field>
@@ -7738,45 +7738,45 @@
             <field name="type">income</field>
             <field name="note">contrepartie 607 (diff = marge commerciale)</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_707100" model="account.account">
             <field name="name">Ventes de marchandises 5,5%</field>
             <field name="code">707100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_707000])]"/>
+            <field eval="[(6,0,[pcg_707000])]" name="parent_id"/>
         </record>
         <record id="pcg_707200" model="account.account">
             <field name="name">Ventes de marchandises 19,6%</field>
             <field name="code">707200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_707000])]"/>
+            <field eval="[(6,0,[pcg_707000])]" name="parent_id"/>
         </record>
         <record id="pcg_707300" model="account.account">
             <field name="name">Ventes de marchandises CEE</field>
             <field name="code">707300</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_707000])]"/>
+            <field eval="[(6,0,[pcg_707000])]" name="parent_id"/>
         </record>
         <record id="pcg_707400" model="account.account">
             <field name="name">Ventes de marchandises hors CEE</field>
             <field name="code">707400</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_707000])]"/>
+            <field eval="[(6,0,[pcg_707000])]" name="parent_id"/>
         </record>
         <record id="pcg_708000" model="account.account">
             <field name="name">Produits des activités annexes</field>
@@ -7784,405 +7784,405 @@
             <field name="type">income</field>
             <field name="note">activité accessoire ou occasionnelle</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_708100" model="account.account">
             <field name="name">Produits des services exploités dans l'intérêt du personnel</field>
             <field name="code">708100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_708000])]"/>
+            <field eval="[(6,0,[pcg_708000])]" name="parent_id"/>
         </record>
         <record id="pcg_708200" model="account.account">
             <field name="name">Commissions et courtages</field>
             <field name="code">708200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_708000])]"/>
+            <field eval="[(6,0,[pcg_708000])]" name="parent_id"/>
         </record>
         <record id="pcg_708300" model="account.account">
             <field name="name">Locations diverses</field>
             <field name="code">708300</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_708000])]"/>
+            <field eval="[(6,0,[pcg_708000])]" name="parent_id"/>
         </record>
         <record id="pcg_708400" model="account.account">
             <field name="name">Mise à disposition de personnel facturée </field>
             <field name="code">708400</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_708000])]"/>
+            <field eval="[(6,0,[pcg_708000])]" name="parent_id"/>
         </record>
         <record id="pcg_708500" model="account.account">
             <field name="name">Ports et frais accessoires facturés</field>
             <field name="code">708500</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_708000])]"/>
+            <field eval="[(6,0,[pcg_708000])]" name="parent_id"/>
         </record>
         <record id="pcg_708600" model="account.account">
             <field name="name">Bonis sur reprises d'emballages consignés</field>
             <field name="code">708600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_708000])]"/>
+            <field eval="[(6,0,[pcg_708000])]" name="parent_id"/>
         </record>
         <record id="pcg_708700" model="account.account">
             <field name="name">Bonifications obtenues des clients et primes sur ventes</field>
             <field name="code">708700</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_708000])]"/>
+            <field eval="[(6,0,[pcg_708000])]" name="parent_id"/>
         </record>
         <record id="pcg_708800" model="account.account">
             <field name="name">Autres produits d'activités annexes (cessions d'approvisionnements)</field>
             <field name="code">708800</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_708000])]"/>
+            <field eval="[(6,0,[pcg_708000])]" name="parent_id"/>
         </record>
         <record id="pcg_709000" model="account.account">
             <field name="name">Rabais remises et ristournes accordés par l'entreprise</field>
             <field name="code">709000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_70])]"/>
+            <field eval="[(6,0,[pcg_Comptes_70])]" name="parent_id"/>
         </record>
         <record id="pcg_709100" model="account.account">
             <field name="name">Remises sur ventes de produits finis</field>
             <field name="code">709100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_709000])]"/>
+            <field eval="[(6,0,[pcg_709000])]" name="parent_id"/>
         </record>
         <record id="pcg_709200" model="account.account">
             <field name="name">Remises sur ventes de produits intermédiaires </field>
             <field name="code">709200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_709000])]"/>
+            <field eval="[(6,0,[pcg_709000])]" name="parent_id"/>
         </record>
         <record id="pcg_709400" model="account.account">
             <field name="name">Remises sur travaux</field>
             <field name="code">709400</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_709000])]"/>
+            <field eval="[(6,0,[pcg_709000])]" name="parent_id"/>
         </record>
         <record id="pcg_709500" model="account.account">
             <field name="name">Remises sur études</field>
             <field name="code">709500</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_709000])]"/>
+            <field eval="[(6,0,[pcg_709000])]" name="parent_id"/>
         </record>
         <record id="pcg_709600" model="account.account">
             <field name="name">Remises sur prestations de services</field>
             <field name="code">709600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_709000])]"/>
+            <field eval="[(6,0,[pcg_709000])]" name="parent_id"/>
         </record>
         <record id="pcg_709700" model="account.account">
             <field name="name">Remises sur ventes de marchandises</field>
             <field name="code">709700</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_709000])]"/>
+            <field eval="[(6,0,[pcg_709000])]" name="parent_id"/>
         </record>
         <record id="pcg_709800" model="account.account">
             <field name="name">Remises sur produits des activités annexes</field>
             <field name="code">709800</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_709000])]"/>
+            <field eval="[(6,0,[pcg_709000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_71" model="account.account">
             <field name="name">Production stockée (ou déstockage)</field>
             <field name="code">Comptes_71</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_713000" model="account.account">
             <field name="name">Variation des stocks (en-cours de production produits)</field>
             <field name="code">713000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_71])]"/>
+            <field eval="[(6,0,[pcg_Comptes_71])]" name="parent_id"/>
         </record>
         <record id="pcg_713300" model="account.account">
             <field name="name">Variation des en-cours de production de biens</field>
             <field name="code">713300</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713000])]"/>
+            <field eval="[(6,0,[pcg_713000])]" name="parent_id"/>
         </record>
         <record id="pcg_713310" model="account.account">
             <field name="name">Produits en cours</field>
             <field name="code">713310</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713300])]"/>
+            <field eval="[(6,0,[pcg_713300])]" name="parent_id"/>
         </record>
         <record id="pcg_713350" model="account.account">
             <field name="name">Travaux en cours</field>
             <field name="code">713350</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713300])]"/>
+            <field eval="[(6,0,[pcg_713300])]" name="parent_id"/>
         </record>
         <record id="pcg_713400" model="account.account">
             <field name="name">Variation des en-cours de production de services</field>
             <field name="code">713400</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713000])]"/>
+            <field eval="[(6,0,[pcg_713000])]" name="parent_id"/>
         </record>
         <record id="pcg_713410" model="account.account">
             <field name="name">Études en cours</field>
             <field name="code">713410</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713400])]"/>
+            <field eval="[(6,0,[pcg_713400])]" name="parent_id"/>
         </record>
         <record id="pcg_713450" model="account.account">
             <field name="name">Prestations de services en cours</field>
             <field name="code">713450</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713400])]"/>
+            <field eval="[(6,0,[pcg_713400])]" name="parent_id"/>
         </record>
         <record id="pcg_713500" model="account.account">
             <field name="name">Variation des stocks de produits</field>
             <field name="code">713500</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713000])]"/>
+            <field eval="[(6,0,[pcg_713000])]" name="parent_id"/>
         </record>
         <record id="pcg_713510" model="account.account">
             <field name="name">Produits intermédiaires </field>
             <field name="code">713510</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713500])]"/>
+            <field eval="[(6,0,[pcg_713500])]" name="parent_id"/>
         </record>
         <record id="pcg_713550" model="account.account">
             <field name="name">Produits finis</field>
             <field name="code">713550</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713500])]"/>
+            <field eval="[(6,0,[pcg_713500])]" name="parent_id"/>
         </record>
         <record id="pcg_713580" model="account.account">
             <field name="name">Produits résiduels</field>
             <field name="code">713580</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_713500])]"/>
+            <field eval="[(6,0,[pcg_713500])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_72" model="account.account">
             <field name="name">Production immobilisée</field>
             <field name="code">Comptes_72</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_721000" model="account.account">
             <field name="name">Immobilisations incorporelles </field>
             <field name="code">721000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_72])]"/>
+            <field eval="[(6,0,[pcg_Comptes_72])]" name="parent_id"/>
         </record>
         <record id="pcg_722000" model="account.account">
             <field name="name">Immobilisations corporelles</field>
             <field name="code">722000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_72])]"/>
+            <field eval="[(6,0,[pcg_Comptes_72])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_74" model="account.account">
             <field name="name">Subventions d'exploitation</field>
             <field name="code">Comptes_74</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_75" model="account.account">
             <field name="name">Autres produits de gestion courante</field>
             <field name="code">Comptes_75</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_751000" model="account.account">
             <field name="name">Redevances pour concessions brevets licences marques procédés logiciels droits et valeurs similaires</field>
             <field name="code">751000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_75])]"/>
+            <field eval="[(6,0,[pcg_Comptes_75])]" name="parent_id"/>
         </record>
         <record id="pcg_751100" model="account.account">
             <field name="name">Redevances pour concessions brevets licences marques procédés logiciels </field>
             <field name="code">751100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_751000])]"/>
+            <field eval="[(6,0,[pcg_751000])]" name="parent_id"/>
         </record>
         <record id="pcg_751600" model="account.account">
             <field name="name">Droits d'auteur et de reproduction</field>
             <field name="code">751600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_751000])]"/>
+            <field eval="[(6,0,[pcg_751000])]" name="parent_id"/>
         </record>
         <record id="pcg_751800" model="account.account">
             <field name="name">Autres droits et valeurs similaires</field>
             <field name="code">751800</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_751000])]"/>
+            <field eval="[(6,0,[pcg_751000])]" name="parent_id"/>
         </record>
         <record id="pcg_752000" model="account.account">
             <field name="name">Revenus des immeubles non affectés aux activités professionnelles</field>
             <field name="code">752000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_75])]"/>
+            <field eval="[(6,0,[pcg_Comptes_75])]" name="parent_id"/>
         </record>
         <record id="pcg_753000" model="account.account">
             <field name="name">Jetons de présence et rémunérations d'administrateurs gérants</field>
             <field name="code">753000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_75])]"/>
+            <field eval="[(6,0,[pcg_Comptes_75])]" name="parent_id"/>
         </record>
         <record id="pcg_754000" model="account.account">
             <field name="name">Ristournes perçues des coopératives (provenant des excédents)</field>
             <field name="code">754000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_75])]"/>
+            <field eval="[(6,0,[pcg_Comptes_75])]" name="parent_id"/>
         </record>
         <record id="pcg_755000" model="account.account">
             <field name="name">Quotes-parts de résultat sur opérations faites en commun</field>
             <field name="code">755000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_75])]"/>
+            <field eval="[(6,0,[pcg_Comptes_75])]" name="parent_id"/>
         </record>
         <record id="pcg_755100" model="account.account">
             <field name="name">Quote-part de perte transférée (comptabilité du gérant)</field>
             <field name="code">755100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_755000])]"/>
+            <field eval="[(6,0,[pcg_755000])]" name="parent_id"/>
         </record>
         <record id="pcg_755500" model="account.account">
             <field name="name">Quote-part de bénéfice attribuée (comptabilité des associés non-gérants)</field>
             <field name="code">755500</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_755000])]"/>
+            <field eval="[(6,0,[pcg_755000])]" name="parent_id"/>
         </record>
         <record id="pcg_758000" model="account.account">
             <field name="name">Produits divers de gestion courante</field>
             <field name="code">758000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_75])]"/>
+            <field eval="[(6,0,[pcg_Comptes_75])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_76" model="account.account">
             <field name="name">Produits financiers</field>
@@ -8190,135 +8190,135 @@
             <field name="type">view</field>
             <field name="note">intérêts sur comptes rémunérés (SICAV....)</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_761000" model="account.account">
             <field name="name">Produits de participations</field>
             <field name="code">761000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_76])]"/>
+            <field eval="[(6,0,[pcg_Comptes_76])]" name="parent_id"/>
         </record>
         <record id="pcg_761100" model="account.account">
             <field name="name">Revenus des titres de participation</field>
             <field name="code">761100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_761000])]"/>
+            <field eval="[(6,0,[pcg_761000])]" name="parent_id"/>
         </record>
         <record id="pcg_761600" model="account.account">
             <field name="name">Revenus sur autres formes de participation </field>
             <field name="code">761600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_761000])]"/>
+            <field eval="[(6,0,[pcg_761000])]" name="parent_id"/>
         </record>
         <record id="pcg_761700" model="account.account">
             <field name="name">Revenus des créances rattachées à des participations</field>
             <field name="code">761700</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_761000])]"/>
+            <field eval="[(6,0,[pcg_761000])]" name="parent_id"/>
         </record>
         <record id="pcg_762000" model="account.account">
             <field name="name">Produits des autres immobilisations financières</field>
             <field name="code">762000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_76])]"/>
+            <field eval="[(6,0,[pcg_Comptes_76])]" name="parent_id"/>
         </record>
         <record id="pcg_762100" model="account.account">
             <field name="name">Revenus des titres immobilisés</field>
             <field name="code">762100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_762000])]"/>
+            <field eval="[(6,0,[pcg_762000])]" name="parent_id"/>
         </record>
         <record id="pcg_762600" model="account.account">
             <field name="name">Revenus des prêts</field>
             <field name="code">762600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_762000])]"/>
+            <field eval="[(6,0,[pcg_762000])]" name="parent_id"/>
         </record>
         <record id="pcg_762700" model="account.account">
             <field name="name">Revenus des créances immobilisées</field>
             <field name="code">762700</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_762000])]"/>
+            <field eval="[(6,0,[pcg_762000])]" name="parent_id"/>
         </record>
         <record id="pcg_763000" model="account.account">
             <field name="name">Revenus des autres créances</field>
             <field name="code">763000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_76])]"/>
+            <field eval="[(6,0,[pcg_Comptes_76])]" name="parent_id"/>
         </record>
         <record id="pcg_763100" model="account.account">
             <field name="name">Revenus des créances commerciales </field>
             <field name="code">763100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_763000])]"/>
+            <field eval="[(6,0,[pcg_763000])]" name="parent_id"/>
         </record>
         <record id="pcg_763800" model="account.account">
             <field name="name">Revenus des créances diverses</field>
             <field name="code">763800</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_763000])]"/>
+            <field eval="[(6,0,[pcg_763000])]" name="parent_id"/>
         </record>
         <record id="pcg_764000" model="account.account">
             <field name="name">Revenus des valeurs mobilières de placement</field>
             <field name="code">764000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_76])]"/>
+            <field eval="[(6,0,[pcg_Comptes_76])]" name="parent_id"/>
         </record>
         <record id="pcg_765000" model="account.account">
             <field name="name">Escomptes obtenus</field>
             <field name="code">765000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_76])]"/>
+            <field eval="[(6,0,[pcg_Comptes_76])]" name="parent_id"/>
         </record>
         <record id="pcg_766000" model="account.account">
             <field name="name">Gains de change</field>
             <field name="code">766000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_76])]"/>
+            <field eval="[(6,0,[pcg_Comptes_76])]" name="parent_id"/>
         </record>
         <record id="pcg_767000" model="account.account">
             <field name="name">Produits nets sur cessions de valeurs mobilières de placement</field>
@@ -8326,27 +8326,27 @@
             <field name="type">income</field>
             <field name="note">en contrepartie 667</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_76])]"/>
+            <field eval="[(6,0,[pcg_Comptes_76])]" name="parent_id"/>
         </record>
         <record id="pcg_768000" model="account.account">
             <field name="name">Autres produits financiers</field>
             <field name="code">768000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_76])]"/>
+            <field eval="[(6,0,[pcg_Comptes_76])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_77" model="account.account">
             <field name="name">Produits exceptionnels</field>
             <field name="code">Comptes_77</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_771000" model="account.account">
             <field name="name">Produits exceptionnels sur opérations de gestion</field>
@@ -8354,72 +8354,72 @@
             <field name="type">income</field>
             <field name="note">écarts d'arrondis</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_77])]"/>
+            <field eval="[(6,0,[pcg_Comptes_77])]" name="parent_id"/>
         </record>
         <record id="pcg_771100" model="account.account">
             <field name="name">Dédits et pénalités perçus sur achats et sur ventes</field>
             <field name="code">771100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_771000])]"/>
+            <field eval="[(6,0,[pcg_771000])]" name="parent_id"/>
         </record>
         <record id="pcg_771300" model="account.account">
             <field name="name">Libéralités reçues</field>
             <field name="code">771300</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_771000])]"/>
+            <field eval="[(6,0,[pcg_771000])]" name="parent_id"/>
         </record>
         <record id="pcg_771400" model="account.account">
             <field name="name">Rentrées sur créances amorties</field>
             <field name="code">771400</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_771000])]"/>
+            <field eval="[(6,0,[pcg_771000])]" name="parent_id"/>
         </record>
         <record id="pcg_771500" model="account.account">
             <field name="name">Subventions d'équilibre</field>
             <field name="code">771500</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_771000])]"/>
+            <field eval="[(6,0,[pcg_771000])]" name="parent_id"/>
         </record>
         <record id="pcg_771700" model="account.account">
             <field name="name">Dégrèvements d'impôts autres qu'impôts sur les bénéfices</field>
             <field name="code">771700</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_771000])]"/>
+            <field eval="[(6,0,[pcg_771000])]" name="parent_id"/>
         </record>
         <record id="pcg_771800" model="account.account">
             <field name="name">Autres produits exceptionnels sur opérations de gestion</field>
             <field name="code">771800</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_771000])]"/>
+            <field eval="[(6,0,[pcg_771000])]" name="parent_id"/>
         </record>
         <record id="pcg_772000" model="account.account">
             <field name="name">Produits sur exercices antérieurs</field>
             <field name="code">772000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_77])]"/>
+            <field eval="[(6,0,[pcg_Comptes_77])]" name="parent_id"/>
         </record>
         <record id="pcg_775000" model="account.account">
             <field name="name">Produits des cessions d'éléments d'actif</field>
@@ -8427,518 +8427,518 @@
             <field name="type">income</field>
             <field name="note">vente d'immo = prix de vente (contrepartie 675)</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_77])]"/>
+            <field eval="[(6,0,[pcg_Comptes_77])]" name="parent_id"/>
         </record>
         <record id="pcg_775100" model="account.account">
             <field name="name">Immobilisations incorporelles</field>
             <field name="code">775100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_775000])]"/>
+            <field eval="[(6,0,[pcg_775000])]" name="parent_id"/>
         </record>
         <record id="pcg_775200" model="account.account">
             <field name="name">Immobilisations corporelles</field>
             <field name="code">775200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_775000])]"/>
+            <field eval="[(6,0,[pcg_775000])]" name="parent_id"/>
         </record>
         <record id="pcg_775600" model="account.account">
             <field name="name">Immobilisations financières</field>
             <field name="code">775600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_775000])]"/>
+            <field eval="[(6,0,[pcg_775000])]" name="parent_id"/>
         </record>
         <record id="pcg_775800" model="account.account">
             <field name="name">Autres éléments d'actif</field>
             <field name="code">775800</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_775000])]"/>
+            <field eval="[(6,0,[pcg_775000])]" name="parent_id"/>
         </record>
         <record id="pcg_777000" model="account.account">
             <field name="name">Quote-part des subventions d'investissement virée au résultat de l'exercice</field>
             <field name="code">777000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_77])]"/>
+            <field eval="[(6,0,[pcg_Comptes_77])]" name="parent_id"/>
         </record>
         <record id="pcg_778000" model="account.account">
             <field name="name">Autres produits exceptionnels</field>
             <field name="code">778000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_77])]"/>
+            <field eval="[(6,0,[pcg_Comptes_77])]" name="parent_id"/>
         </record>
         <record id="pcg_778100" model="account.account">
             <field name="name">Bonis provenant de clauses d'indexation </field>
             <field name="code">778100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_778000])]"/>
+            <field eval="[(6,0,[pcg_778000])]" name="parent_id"/>
         </record>
         <record id="pcg_778200" model="account.account">
             <field name="name">Lots</field>
             <field name="code">778200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_778000])]"/>
+            <field eval="[(6,0,[pcg_778000])]" name="parent_id"/>
         </record>
         <record id="pcg_778300" model="account.account">
             <field name="name">Bonis provenant du rachat par l'entreprise d'actions et d'obligations émises par elle-même</field>
             <field name="code">778300</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_778000])]"/>
+            <field eval="[(6,0,[pcg_778000])]" name="parent_id"/>
         </record>
         <record id="pcg_778800" model="account.account">
             <field name="name">Produits exceptionnels divers</field>
             <field name="code">778800</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_778000])]"/>
+            <field eval="[(6,0,[pcg_778000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_78" model="account.account">
             <field name="name">reprises sur amortissements et provisions</field>
             <field name="code">Comptes_78</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_781000" model="account.account">
             <field name="name">Reprises sur amortissements et provisions (à inscrire dans les produits d'exploitation)</field>
             <field name="code">781000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_78])]"/>
+            <field eval="[(6,0,[pcg_Comptes_78])]" name="parent_id"/>
         </record>
         <record id="pcg_781100" model="account.account">
             <field name="name">Reprises sur amortissements des immobilisations incorporelles et corporelles </field>
             <field name="code">781100</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781000])]"/>
+            <field eval="[(6,0,[pcg_781000])]" name="parent_id"/>
         </record>
         <record id="pcg_781110" model="account.account">
             <field name="name">Immobilisations incorporelles</field>
             <field name="code">781110</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781100])]"/>
+            <field eval="[(6,0,[pcg_781100])]" name="parent_id"/>
         </record>
         <record id="pcg_781120" model="account.account">
             <field name="name">Immobilisations corporelles</field>
             <field name="code">781120</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781100])]"/>
+            <field eval="[(6,0,[pcg_781100])]" name="parent_id"/>
         </record>
         <record id="pcg_781500" model="account.account">
             <field name="name">Reprises sur provisions pour risques et charges d'exploitation</field>
             <field name="code">781500</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781000])]"/>
+            <field eval="[(6,0,[pcg_781000])]" name="parent_id"/>
         </record>
         <record id="pcg_781600" model="account.account">
             <field name="name">Reprises sur dépréciations des immobilisations incorporelles et corporelles</field>
             <field name="code">781600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781000])]"/>
+            <field eval="[(6,0,[pcg_781000])]" name="parent_id"/>
         </record>
         <record id="pcg_781610" model="account.account">
             <field name="name">Reprises sur dépréciations des immobilisations incorporelles</field>
             <field name="code">781610</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781600])]"/>
+            <field eval="[(6,0,[pcg_781600])]" name="parent_id"/>
         </record>
         <record id="pcg_781620" model="account.account">
             <field name="name">Reprises sur dépréciations des immobilisations corporelles</field>
             <field name="code">781620</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781600])]"/>
+            <field eval="[(6,0,[pcg_781600])]" name="parent_id"/>
         </record>
         <record id="pcg_781700" model="account.account">
             <field name="name">Reprises sur provisions pour dépréciation des actifs circulants</field>
             <field name="code">781700</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781000])]"/>
+            <field eval="[(6,0,[pcg_781000])]" name="parent_id"/>
         </record>
         <record id="pcg_781730" model="account.account">
             <field name="name">Reprises sur provisions pour dépréciation des actifs circulants- Stocks et en-cours</field>
             <field name="code">781730</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781700])]"/>
+            <field eval="[(6,0,[pcg_781700])]" name="parent_id"/>
         </record>
         <record id="pcg_781740" model="account.account">
             <field name="name">Reprises sur provisions pour dépréciation des actifs circulants- Créances</field>
             <field name="code">781740</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_781700])]"/>
+            <field eval="[(6,0,[pcg_781700])]" name="parent_id"/>
         </record>
         <record id="pcg_786000" model="account.account">
             <field name="name">Reprises sur provisions pour risques (à inscrire dans les produits financiers)</field>
             <field name="code">786000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_78])]"/>
+            <field eval="[(6,0,[pcg_Comptes_78])]" name="parent_id"/>
         </record>
         <record id="pcg_786500" model="account.account">
             <field name="name">Reprises sur provisions pour risques et charges financiers</field>
             <field name="code">786500</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_786000])]"/>
+            <field eval="[(6,0,[pcg_786000])]" name="parent_id"/>
         </record>
         <record id="pcg_786600" model="account.account">
             <field name="name">Reprises sur provisions pour dépréciation des éléments financiers</field>
             <field name="code">786600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_786000])]"/>
+            <field eval="[(6,0,[pcg_786000])]" name="parent_id"/>
         </record>
         <record id="pcg_786620" model="account.account">
             <field name="name">Immobilisations financières</field>
             <field name="code">786620</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_786600])]"/>
+            <field eval="[(6,0,[pcg_786600])]" name="parent_id"/>
         </record>
         <record id="pcg_786650" model="account.account">
             <field name="name">Valeurs mobilières de placement</field>
             <field name="code">786650</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_786600])]"/>
+            <field eval="[(6,0,[pcg_786600])]" name="parent_id"/>
         </record>
         <record id="pcg_787000" model="account.account">
             <field name="name">Reprises sur provisions (à inscrire dans les produits exceptionnels)</field>
             <field name="code">787000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_78])]"/>
+            <field eval="[(6,0,[pcg_Comptes_78])]" name="parent_id"/>
         </record>
         <record id="pcg_787200" model="account.account">
             <field name="name">Reprises sur provisions réglementées (immobilisations)</field>
             <field name="code">787200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_787000])]"/>
+            <field eval="[(6,0,[pcg_787000])]" name="parent_id"/>
         </record>
         <record id="pcg_787250" model="account.account">
             <field name="name">Reprises sur provisions des amortissements dérogatoires</field>
             <field name="code">787250</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_787200])]"/>
+            <field eval="[(6,0,[pcg_787200])]" name="parent_id"/>
         </record>
         <record id="pcg_787260" model="account.account">
             <field name="name">Reprises sur provision spéciale de réévaluation</field>
             <field name="code">787260</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_787200])]"/>
+            <field eval="[(6,0,[pcg_787200])]" name="parent_id"/>
         </record>
         <record id="pcg_787270" model="account.account">
             <field name="name">Reprises sur provisions des plus-values réinvesties</field>
             <field name="code">787270</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_787200])]"/>
+            <field eval="[(6,0,[pcg_787200])]" name="parent_id"/>
         </record>
         <record id="pcg_787300" model="account.account">
             <field name="name">Reprises sur provisions réglementées (stocks) </field>
             <field name="code">787300</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_787000])]"/>
+            <field eval="[(6,0,[pcg_787000])]" name="parent_id"/>
         </record>
         <record id="pcg_787400" model="account.account">
             <field name="name">Reprises sur autres provisions réglementées </field>
             <field name="code">787400</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_787000])]"/>
+            <field eval="[(6,0,[pcg_787000])]" name="parent_id"/>
         </record>
         <record id="pcg_787500" model="account.account">
             <field name="name">Reprises sur provisions pour risques et charges exceptionnels</field>
             <field name="code">787500</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_787000])]"/>
+            <field eval="[(6,0,[pcg_787000])]" name="parent_id"/>
         </record>
         <record id="pcg_787600" model="account.account">
             <field name="name">Reprises pour dépréciations exceptionnelles</field>
             <field name="code">787600</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_787000])]"/>
+            <field eval="[(6,0,[pcg_787000])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_79" model="account.account">
             <field name="name">Transferts de charges</field>
             <field name="code">Comptes_79</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_7])]"/>
+            <field eval="[(6,0,[pcg_Classe_7])]" name="parent_id"/>
         </record>
         <record id="pcg_791000" model="account.account">
             <field name="name">Transferts de charges d'exploitation</field>
             <field name="code">791000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_79])]"/>
+            <field eval="[(6,0,[pcg_Comptes_79])]" name="parent_id"/>
         </record>
         <record id="pcg_796000" model="account.account">
             <field name="name">Transferts de charges financières</field>
             <field name="code">796000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_79])]"/>
+            <field eval="[(6,0,[pcg_Comptes_79])]" name="parent_id"/>
         </record>
         <record id="pcg_797000" model="account.account">
             <field name="name">Transferts de charges exceptionnelles</field>
             <field name="code">797000</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_79])]"/>
+            <field eval="[(6,0,[pcg_Comptes_79])]" name="parent_id"/>
         </record>
         <record id="pcg_Classes_8_et_9" model="account.account">
             <field name="name">Comptes spéciaux</field>
             <field name="code">Classes_8_et_9</field>
             <field name="type">view</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_0])]"/>
+            <field eval="[(6,0,[pcg_0])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_8" model="account.account">
             <field name="name">Comptes spéciaux de gestion</field>
             <field name="code">Classe_8</field>
             <field name="type">view</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_8_et_9])]"/>
+            <field eval="[(6,0,[pcg_Classes_8_et_9])]" name="parent_id"/>
         </record>
         <record id="pcg_Classe_9" model="account.account">
             <field name="name">Comptes ouverture et clôture</field>
             <field name="code">Classe_9</field>
             <field name="type">view</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classes_8_et_9])]"/>
+            <field eval="[(6,0,[pcg_Classes_8_et_9])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_90" model="account.account">
             <field name="name">Résultat</field>
             <field name="code">Comptes_90</field>
             <field name="type">view</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_9])]"/>
+            <field eval="[(6,0,[pcg_Classe_9])]" name="parent_id"/>
         </record>
         <record id="pcg_900000" model="account.account">
             <field name="name">Compte de résultat</field>
             <field name="code">900000</field>
             <field name="type">cloture</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_90])]"/>
+            <field eval="[(6,0,[pcg_Comptes_90])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_91" model="account.account">
             <field name="name">Bilan</field>
             <field name="code">Comptes_91</field>
             <field name="type">view</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_9])]"/>
+            <field eval="[(6,0,[pcg_Classe_9])]" name="parent_id"/>
         </record>
         <record id="pcg_910000" model="account.account">
             <field name="name">Bilan d'ouverture</field>
             <field name="code">910000</field>
             <field name="type">cloture</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_91])]"/>
+            <field eval="[(6,0,[pcg_Comptes_91])]" name="parent_id"/>
         </record>
         <record id="pcg_911000" model="account.account">
             <field name="name">Bilan de clôture</field>
             <field name="code">911000</field>
             <field name="type">cloture</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_91])]"/>
+            <field eval="[(6,0,[pcg_Comptes_91])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_92" model="account.account">
             <field name="name">Affectation du bénéfice</field>
             <field name="code">Comptes_92</field>
             <field name="type">view</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_9])]"/>
+            <field eval="[(6,0,[pcg_Classe_9])]" name="parent_id"/>
         </record>
         <record id="pcg_920000" model="account.account">
             <field name="name">Participation au bénéfice de l'associé X</field>
             <field name="code">920000</field>
             <field name="type">cloture</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_92])]"/>
+            <field eval="[(6,0,[pcg_Comptes_92])]" name="parent_id"/>
         </record>
         <record id="pcg_921000" model="account.account">
             <field name="name">Participation au bénéfice de l'associé Y</field>
             <field name="code">921000</field>
             <field name="type">cloture</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_92])]"/>
+            <field eval="[(6,0,[pcg_Comptes_92])]" name="parent_id"/>
         </record>
         <record id="pcg_Comptes_99" model="account.account">
             <field name="name">Ecriture de regroupements et de corrections</field>
             <field name="code">Comptes_99</field>
             <field name="type">view</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Classe_9])]"/>
+            <field eval="[(6,0,[pcg_Classe_9])]" name="parent_id"/>
         </record>
         <record id="pcg_990000" model="account.account">
             <field name="name">Ecritures de regroupements des débiteurs</field>
             <field name="code">990000</field>
             <field name="type">cloture</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_99])]"/>
+            <field eval="[(6,0,[pcg_Comptes_99])]" name="parent_id"/>
         </record>
         <record id="pcg_991000" model="account.account">
             <field name="name">Ecritures de regroupements des créditeurs</field>
             <field name="code">991000</field>
             <field name="type">cloture</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_99])]"/>
+            <field eval="[(6,0,[pcg_Comptes_99])]" name="parent_id"/>
         </record>
         <record id="pcg_992000" model="account.account">
             <field name="name">Ecritures de corrections</field>
             <field name="code">992000</field>
             <field name="type">cloture</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_Comptes_99])]"/>
+            <field eval="[(6,0,[pcg_Comptes_99])]" name="parent_id"/>
         </record>
         <record id="a_pay" model="account.account">
             <field name="name">Fournisseurs - Achats de biens et prestations de services</field>
             <field name="code">401100</field>
             <field name="type">payable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_401000])]"/>
-            <field name="reconcile" eval="True"/>
+            <field eval="[(6,0,[pcg_401000])]" name="parent_id"/>
+            <field eval="True" name="reconcile"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_payable">
-            <field name="value" eval="'account.account,'+str(a_pay)"/>
+        <record id="account.property_account_payable" model="ir.property">
+            <field eval="'account.account,'+str(a_pay)" name="value"/>
         </record>
         
         <record id="a_recv" model="account.account">
@@ -8946,14 +8946,14 @@
             <field name="code">411100</field>
             <field name="type">receivable</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_411000])]"/>
-            <field name="reconcile" eval="True"/>
+            <field eval="[(6,0,[pcg_411000])]" name="parent_id"/>
+            <field eval="True" name="reconcile"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_receivable">
-            <field name="value" eval="'account.account,'+str(a_recv)"/>
+        <record id="account.property_account_receivable" model="ir.property">
+            <field eval="'account.account,'+str(a_recv)" name="value"/>
         </record>
         
         <record id="cash" model="account.account">
@@ -8961,9 +8961,9 @@
             <field name="code">512100</field>
             <field name="type">cash</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_512000])]"/>
+            <field eval="[(6,0,[pcg_512000])]" name="parent_id"/>
         </record>
         <record id="a_expense" model="account.account">
             <field name="name">matières France</field>
@@ -8971,13 +8971,13 @@
             <field name="type">expense</field>
             <field name="note">pour achats France</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_601000])]"/>
+            <field eval="[(6,0,[pcg_601000])]" name="parent_id"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_expense_categ">
-            <field name="value" eval="'account.account,'+str(a_expense)"/>
+        <record id="account.property_account_expense_categ" model="ir.property">
+            <field eval="'account.account,'+str(a_expense)" name="value"/>
         </record>
         
         <record id="a_sale" model="account.account">
@@ -8985,14 +8985,14 @@
             <field name="code">701200</field>
             <field name="type">income</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="1"/>
+            <field eval="1" name="sign"/>
             
-            <field name="parent_id" eval="[(6,0,[pcg_701000])]"/>
+            <field eval="[(6,0,[pcg_701000])]" name="parent_id"/>
         </record>
         
-        <record model="ir.property" id="account.property_account_income_categ">
-            <field name="value" eval="'account.account,'+str(a_sale)"/>
+        <record id="account.property_account_income_categ" model="ir.property">
+            <field eval="'account.account,'+str(a_sale)" name="value"/>
         </record>
         <!-- la taxe nulle n'est pas acceptee -->
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/l10n_fr/taxes.xml b/addons/l10n_fr/taxes.xml
index d28825c3672..ad307a21453 100644
--- a/addons/l10n_fr/taxes.xml
+++ b/addons/l10n_fr/taxes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="True">
         <!--
@@ -14,63 +14,63 @@
 		
 		-->
         
-        <record model="account.tax" id="tva_normale">
+        <record id="tva_normale" model="account.tax">
             <field name="name">19,6%</field>
-            <field name="amount" eval="0.196"/>
+            <field eval="0.196" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="pcg_445710"/>
             <field name="account_paid_id" ref="pcg_445510"/>
         </record>
         
-        <record model="account.tax" id="tva_specifique">
+        <record id="tva_specifique" model="account.tax">
             <field name="name">8,5%</field>
-            <field name="amount" eval="0.085"/>
+            <field eval="0.085" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="pcg_445710"/>
             <field name="account_paid_id" ref="pcg_445510"/>
         </record>
         
-        <record model="account.tax" id="tva_reduite">
+        <record id="tva_reduite" model="account.tax">
             <field name="name">5,5%</field>
-            <field name="amount" eval="0.055"/>
+            <field eval="0.055" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="pcg_445710"/>
             <field name="account_paid_id" ref="pcg_445510"/>
         </record>
         
-        <record model="account.tax" id="tva_super_reduite">
+        <record id="tva_super_reduite" model="account.tax">
             <field name="name">2,1%</field>
-            <field name="amount" eval="0.021"/>
+            <field eval="0.021" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="pcg_445710"/>
             <field name="account_paid_id" ref="pcg_445510"/>
         </record>
         
-        <record model="account.tax" id="tva_immo_normale">
+        <record id="tva_immo_normale" model="account.tax">
             <field name="name">Invest-19,6%</field>
-            <field name="amount" eval="0.196"/>
+            <field eval="0.196" name="amount"/>
             <field name="type">percent</field>
         </record>
         
-        <record model="account.tax" id="tva_immo_specifique">
+        <record id="tva_immo_specifique" model="account.tax">
             <field name="name">Invest-8,5%</field>
-            <field name="amount" eval="0.085"/>
+            <field eval="0.085" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="pcg_445710"/>
             <field name="account_paid_id" ref="pcg_445510"/>
         </record>
         
-        <record model="account.tax" id="tva_immo_reduite">
+        <record id="tva_immo_reduite" model="account.tax">
             <field name="name">Invest-5,5%</field>
-            <field name="amount" eval="0.055"/>
+            <field eval="0.055" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="pcg_445710"/>
             <field name="account_paid_id" ref="pcg_445510"/>
         </record>
         
-        <record model="account.tax" id="tva_immo_super_reduite">
+        <record id="tva_immo_super_reduite" model="account.tax">
             <field name="name">Invest-2,1%</field>
-            <field name="amount" eval="0.021"/>
+            <field eval="0.021" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="pcg_445710"/>
             <field name="account_paid_id" ref="pcg_445510"/>
@@ -85,491 +85,491 @@
 		-->
         
         <record id="l10n_fr.pcg_401000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_401700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_403000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_404000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_404100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_404700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_405000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_408000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_408100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_408400" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_408800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_409000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_409100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_409600" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_409700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_409710" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_409740" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_409800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_Comptes_41" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_410000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_411000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_411700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_413000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_416000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_418000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_418100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_418800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_419000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_419100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_419600" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_419700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_419800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_601700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602110" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602120" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602210" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602220" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602230" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602240" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602250" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602600" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602610" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602650" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_602670" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_603000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_603100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_603200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_603700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_604000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_605000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_606000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_606100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_606300" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_606400" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_606800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_607000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_607100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_607200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_607300" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_608000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_609000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_609100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_609200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_609400" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_609500" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_609600" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_609700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_609800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_Comptes_61" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_611000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_612000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_612200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_612500" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_613000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_613200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_613500" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_613600" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_614000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_615000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_615200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_615500" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_615600" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_622500" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_622600" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_622700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_622800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623300" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623400" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623500" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623600" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_623800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_624000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_624100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_624200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_624300" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_624400" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_624700" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_624800" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_701100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_reduite')])]"/>
+            <field eval="[(6,0,[ref('tva_reduite')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_702000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_703000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_704000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_704100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_704200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_705000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_706000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_706100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_reduite')])]"/>
+            <field eval="[(6,0,[ref('tva_reduite')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_706200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_707000" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_707100" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_reduite')])]"/>
+            <field eval="[(6,0,[ref('tva_reduite')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.pcg_707200" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.a_pay" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.a_recv" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.a_expense" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
         
         <record id="l10n_fr.a_sale" model="account.account">
-            <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
+            <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/l10n_fr/types.xml b/addons/l10n_fr/types.xml
index 1333e9c94bc..216cd40d81b 100644
--- a/addons/l10n_fr/types.xml
+++ b/addons/l10n_fr/types.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="True">
         <!--
@@ -13,22 +13,22 @@
         
         
         <!-- Nouveaux types de comptes -->
-        <record model="account.account.type" id="account_type_dettes">
+        <record id="account_type_dettes" model="account.account.type">
             <field name="name">dettes long terme</field>
             <field name="code">dettes</field>
         </record>
         
-        <record model="account.account.type" id="account_type_immobilisations">
+        <record id="account_type_immobilisations" model="account.account.type">
             <field name="name">immobilisations</field>
             <field name="code">immobilisations</field>
         </record>
         
-        <record model="account.account.type" id="account_type_stocks">
+        <record id="account_type_stocks" model="account.account.type">
             <field name="name">stocks</field>
             <field name="code">stocks</field>
         </record>
         
-        <record model="account.account.type" id="account_type_cloture">
+        <record id="account_type_cloture" model="account.account.type">
             <field name="name">Cloture</field>
             <field name="code">cloture</field>
         </record>
@@ -38,16 +38,16 @@
         
         
         <!-- Journaux de saisie -->
-        <record model="account.journal" id="operations_journal">
+        <record id="operations_journal" model="account.journal">
             <field name="name">Journal des opérations diverses</field>
             <field name="code">Op-Div</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="sequence_id" ref="account.sequence_journal"/>
-            <field name="default_debit_account_id" model="account.account" search="[('type','=','payable')]"/>
-            <field name="default_credit_account_id" model="account.account" search="[('type','=','receivable')]"/>
+            <field model="account.account" name="default_debit_account_id" search="[('type','=','payable')]"/>
+            <field model="account.account" name="default_credit_account_id" search="[('type','=','receivable')]"/>
         </record>
-        <record model="account.journal" id="bilan_journal">
+        <record id="bilan_journal" model="account.journal">
             <field name="name">Journal d'ouverture</field>
             <field name="code">Ouverture</field>
             <field name="type">situation</field>
@@ -57,4 +57,4 @@
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index 9b1e9c37769..c315f519a81 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="ir.sequence.type" id="sequence_mrp_prod_type">
+        <record id="sequence_mrp_prod_type" model="ir.sequence.type">
             <field name="name">Production order</field>
             <field name="code">mrp.production</field>
         </record>
         
-        <record model="ir.sequence" id="sequence_mrp_prod">
+        <record id="sequence_mrp_prod" model="ir.sequence">
             <field name="name">Production order</field>
             <field name="code">mrp.production</field>
             <field name="prefix">MO/</field>
@@ -17,12 +17,12 @@
         </record>
         
         
-        <record model="ir.sequence.type" id="sequence_mrp_op_type">
+        <record id="sequence_mrp_op_type" model="ir.sequence.type">
             <field name="name">Stock orderpoint</field>
             <field name="code">mrp.warehouse.orderpoint</field>
         </record>
         
-        <record model="ir.sequence" id="sequence_mrp_op">
+        <record id="sequence_mrp_op" model="ir.sequence">
             <field name="name">Stock orderpoint</field>
             <field name="code">mrp.warehouse.orderpoint</field>
             <field name="prefix">OP/</field>
@@ -31,18 +31,18 @@
             <field name="number_increment">1</field>
         </record>
         
-        <record model="ir.cron" id="ir_cron_scheduler_action" forcecreate="True">
+        <record forcecreate="True" id="ir_cron_scheduler_action" model="ir.cron">
             <field name="name">Run mrp scheduler</field>
-            <field name="active" eval="False"/>
+            <field eval="False" name="active"/>
             <field name="user_id" ref="base.user_admin"/>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-            <field name="model" eval="'mrp.procurement'"/>
-            <field name="function" eval="'run_scheduler'"/>
-            <field name="args" eval="'(uid,)'"/>
+            <field eval="False" name="doall"/>
+            <field eval="'mrp.procurement'" name="model"/>
+            <field eval="'run_scheduler'" name="function"/>
+            <field eval="'(uid,)'" name="args"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 15c62a84b0b..1a8e1f4b270 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -125,17 +125,17 @@
         <record id="mrp_routing_0" model="mrp.routing">
             <field name="workcenter_lines">[1]</field>
             <field name="name">Assembly of pre-defined PC</field>
-            <field name="location_id" model="stock.location" search="[('name','=','Stock')]"/>
+            <field model="stock.location" name="location_id" search="[('name','=','Stock')]"/>
         </record>
         <record id="mrp_routing_1" model="mrp.routing">
             <field name="workcenter_lines">[2]</field>
             <field name="name">Assembly of made to measure PC</field>
-            <field name="location_id" model="stock.location" search="[('name','=','Stock')]"/>
+            <field model="stock.location" name="location_id" search="[('name','=','Stock')]"/>
         </record>
         <record id="mrp_routing_2" model="mrp.routing">
             <field name="workcenter_lines">[3]</field>
             <field name="name">Assembly main board + processor</field>
-            <field name="location_id" model="stock.location" search="[('name','=','Stock')]"/>
+            <field model="stock.location" name="location_id" search="[('name','=','Stock')]"/>
         </record>
         
         <!--
@@ -169,7 +169,7 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">normal</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
         </record>
         
         <record id="mrp_bom_1" model="mrp.bom">
@@ -177,54 +177,54 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','PC2')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','PC2')]"/>
         </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="name">Assembly Medium PC</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','PC3')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','PC3')]"/>
         </record>
         <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">Assembly Customizable PC</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','PC4')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','PC4')]"/>
         </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">HDD on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">RAM on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
         </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">HDD on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
         </record>
         <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">HDD on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
         </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">HDD Seagate</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
         </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
@@ -232,27 +232,27 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
             <field name="type">normal</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
         </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">Complete PC with peripherals</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','PC0')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','PC0')]"/>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="name">RAM on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
         </record>
         
         <record id="mrp_bom_13" model="mrp.bom">
             <field name="name">High Speed Processor + main board on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
         </record>
         
         <record id="mrp_bom_kit" model="mrp.bom">
@@ -262,77 +262,77 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
         </record>
         <record id="mrp_bom_clavier" model="mrp.bom">
             <field name="name">Keyboard</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','KEYA')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
         </record>
         <record id="mrp_bom_mouse" model="mrp.bom">
             <field name="name">Mouse</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
         </record>
         <record id="mrp_bom_16" model="mrp.bom">
             <field name="name">Moon PC</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
         </record>
         <record id="mrp_bom_18" model="mrp.bom">
             <field name="name">Mainboard ASUStek A7N8X</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','MB2')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','MB2')]"/>
         </record>
         <record id="mrp_bom_19" model="mrp.bom">
             <field name="name">Processor AMD Athlon 2200+</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
         </record>
         <record id="mrp_bom_1900" model="mrp.bom">
             <field name="name">Regular Case Fan</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
         </record>
         <record id="mrp_bom_23" model="mrp.bom">
             <field name="name">DDR 256MB PC333</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_11"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','RAM')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','RAM')]"/>
         </record>
         <record id="mrp_bom_1901" model="mrp.bom">
             <field name="name">DDR 512MB PC400</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','RAM512')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','RAM512')]"/>
         </record>
         <record id="mrp_bom_22" model="mrp.bom">
             <field name="name">DDR 1024MB PC400</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_5"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','RAM512')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','RAM512')]"/>
         </record>
         <record id="mrp_bom_24" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_7"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD3')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD3')]"/>
         </record>
         <record id="mrp_bom_25" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -340,21 +340,21 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_4"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
         </record>
         <record id="mrp_bom_26" model="mrp.bom">
             <field name="name">RAM on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
         </record>
         <record id="mrp_bom_27" model="mrp.bom">
             <field name="name">HDD on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
         </record>
         <record id="mrp_bom_28" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
@@ -362,7 +362,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
         </record>
         <record id="mrp_bom_29" model="mrp.bom">
             <field name="name">Processor on demand</field>
@@ -370,7 +370,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
         </record>
         <record id="mrp_bom_30" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
@@ -378,7 +378,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
         </record>
         <record id="mrp_bom_31" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -386,7 +386,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
         </record>
         <record id="mrp_bom_32" model="mrp.bom">
             <field name="name">High speed processor config</field>
@@ -394,7 +394,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
         </record>
         <record id="mrp_bom_33" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -402,7 +402,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_6"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD2')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD2')]"/>
         </record>
         <record id="mrp_bom_34" model="mrp.bom">
             <field name="name">Regular processor config</field>
@@ -410,7 +410,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
         </record>
         <record id="mrp_bom_35" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
@@ -418,7 +418,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
         </record>
         <record id="mrp_bom_36" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -426,7 +426,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD2')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD2')]"/>
         </record>
         <record id="mrp_bom_processor" model="mrp.bom">
             <field name="name">processor</field>
@@ -434,7 +434,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU1')]"/>
         </record>
         <record id="mrp_bom_38" model="mrp.bom">
             <field name="name">mainboard</field>
@@ -442,7 +442,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','MB1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','MB1')]"/>
         </record>
         <record id="mrp_bom_fan" model="mrp.bom">
             <field name="name">fan</field>
@@ -450,7 +450,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
         </record>
         <record id="mrp_bom_ram" model="mrp.bom">
             <field name="name">RAM</field>
@@ -458,7 +458,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','RAM')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','RAM')]"/>
         </record>
         <record id="mrp_bom_41" model="mrp.bom">
             <field name="name">Regular processor config</field>
@@ -466,7 +466,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
         </record>
         <record id="mrp_bom_42" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -474,7 +474,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
         </record>
         <record id="mrp_bom_43" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
@@ -482,7 +482,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
         </record>
         
         <record id="mrp_bom_kit2" model="mrp.bom">
@@ -492,22 +492,22 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','KIT0')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','KIT0')]"/>
         </record>
         <record id="mrp_bom_mouse2" model="mrp.bom">
             <field name="name">Mouse</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
         </record>
         <record id="mrp_bom_clavier2" model="mrp.bom">
             <field name="name">Keyboard</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','KEYA')]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_order_point.xml b/addons/mrp/mrp_order_point.xml
index e8deaba269c..2569e3ce268 100644
--- a/addons/mrp/mrp_order_point.xml
+++ b/addons/mrp/mrp_order_point.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -7,44 +7,44 @@
         <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">20.0</field>
             <field name="product_min_qty">5.0</field>
-            <field name="product_uom" model="product.uom" search="[]"/>
-            <field name="warehouse_id" model="stock.warehouse" search="[]"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','MB1')]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','MB1')]"/>
         </record>
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field name="product_uom" model="product.uom" search="[]"/>
-            <field name="warehouse_id" model="stock.warehouse" search="[]"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','CPU1')]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','CPU1')]"/>
         </record>
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">20.0</field>
             <field name="product_min_qty">10.0</field>
-            <field name="product_uom" model="product.uom" search="[]"/>
-            <field name="warehouse_id" model="stock.warehouse" search="[]"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','HDD1')]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
         </record>
         <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field name="product_uom" model="product.uom" search="[]"/>
-            <field name="warehouse_id" model="stock.warehouse" search="[]"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','FAN')]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
         </record>
         <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">5.0</field>
             <field name="product_min_qty">3.0</field>
-            <field name="product_uom" model="product.uom" search="[]"/>
-            <field name="warehouse_id" model="stock.warehouse" search="[]"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','PC1')]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
         </record>
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field name="product_uom" model="product.uom" search="[]"/>
-            <field name="warehouse_id" model="stock.warehouse" search="[]"/>
-            <field name="product_id" model="product.product" search="[('default_code','=','TOW1')]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
+            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
+            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_report.xml b/addons/mrp/mrp_report.xml
index 115aa389958..3a6f5bec561 100644
--- a/addons/mrp/mrp_report.xml
+++ b/addons/mrp/mrp_report.xml
@@ -1,15 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <report
-			id="report_bom_structure"
-			string="BOM Structure"
-			model="mrp.bom"
-			name="bom.structure"
-			rml="mrp/report/bom_structure.rml"
-			auto="True"
-			header="False"/>
+        <report auto="True" header="False" id="report_bom_structure" model="mrp.bom" name="bom.structure" rml="mrp/report/bom_structure.rml" string="BOM Structure"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_security.xml b/addons/mrp/mrp_security.xml
index 69d946c90f3..02f2efb8d4e 100644
--- a/addons/mrp/mrp_security.xml
+++ b/addons/mrp/mrp_security.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="res.groups" id="group_production_manager">
+        <record id="group_production_manager" model="res.groups">
             <field name="name">Production Manager</field>
         </record>
         
-        <record model="res.groups" id="group_production_worker">
+        <record id="group_production_worker" model="res.groups">
             <field name="name">Workers</field>
         </record>
         
@@ -27,264 +27,264 @@
         </record>
         
         <!-- Workcenter security -->
-        <record model="ir.model.access" id="mrp_workcenter">
+        <record id="mrp_workcenter" model="ir.model.access">
             <field name="name">Workcenter</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.workcenter')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.workcenter')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_workcenter_manager">
+        <record id="mrp_workcenter_manager" model="ir.model.access">
             <field name="name">Workcenter</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.workcenter')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.workcenter')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Property security -->
-        <record model="ir.model.access" id="mrp_property">
+        <record id="mrp_property" model="ir.model.access">
             <field name="name">Property</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.property')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.property')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_property_manager">
+        <record id="mrp_property_manager" model="ir.model.access">
             <field name="name">Property</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.property')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.property')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Property Group security -->
-        <record model="ir.model.access" id="mrp_property_group">
+        <record id="mrp_property_group" model="ir.model.access">
             <field name="name">Property Group</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.property.group')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.property.group')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_property_group_manager">
+        <record id="mrp_property_group_manager" model="ir.model.access">
             <field name="name">Property Group</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.property.group')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.property.group')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Routing security -->
-        <record model="ir.model.access" id="mrp_routing">
+        <record id="mrp_routing" model="ir.model.access">
             <field name="name">Routing</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.routing')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.routing')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_routing_manager">
+        <record id="mrp_routing_manager" model="ir.model.access">
             <field name="name">Routing</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.routing')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.routing')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Workcenter Routing security -->
-        <record model="ir.model.access" id="mrp_routing_workcenter">
+        <record id="mrp_routing_workcenter" model="ir.model.access">
             <field name="name">Workcenter Routing</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.routing.workcenter')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.routing.workcenter')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_routing_workcenter_manager">
+        <record id="mrp_routing_workcenter_manager" model="ir.model.access">
             <field name="name">Workcenter Routing</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.routing.workcenter')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.routing.workcenter')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- BOM security -->
-        <record model="ir.model.access" id="mrp_bom">
+        <record id="mrp_bom" model="ir.model.access">
             <field name="name">Bill of Material</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.bom')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.bom')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_bom_manager">
+        <record id="mrp_bom_manager" model="ir.model.access">
             <field name="name">Bill of Material</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.bom')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.bom')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- BOM Revision security -->
-        <record model="ir.model.access" id="mrp_bom_revision">
+        <record id="mrp_bom_revision" model="ir.model.access">
             <field name="name">Bom Revision</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.bom.revision')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.bom.revision')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_bom_revision_manager">
+        <record id="mrp_bom_revision_manager" model="ir.model.access">
             <field name="name">Bom Revision</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.bom.revision')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.bom.revision')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Production security -->
-        <record model="ir.model.access" id="mrp_production">
+        <record id="mrp_production" model="ir.model.access">
             <field name="name">Production</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.production')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.production')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_production_worker">
+        <record id="mrp_production_worker" model="ir.model.access">
             <field name="name">Production</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.production')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.production')]"/>
             <field name="group_id" ref="group_production_worker"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Procurement security -->
-        <record model="ir.model.access" id="mrp_procurement">
+        <record id="mrp_procurement" model="ir.model.access">
             <field name="name">Procurement</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.procurement')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.procurement')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_procurement_worker">
+        <record id="mrp_procurement_worker" model="ir.model.access">
             <field name="name">Procurement</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.procurement')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.procurement')]"/>
             <field name="group_id" ref="group_production_worker"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="False"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
         <!-- Production Product Line security -->
-        <record model="ir.model.access" id="mrp_production_product_line">
+        <record id="mrp_production_product_line" model="ir.model.access">
             <field name="name">Production Product Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.production.product.line')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.production.product.line')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_production_product_line_worker">
+        <record id="mrp_production_product_line_worker" model="ir.model.access">
             <field name="name">Production Product Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.production.product.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.production.product.line')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Production Workcenter Line security -->
-        <record model="ir.model.access" id="mrp_production_workcenter_line">
+        <record id="mrp_production_workcenter_line" model="ir.model.access">
             <field name="name">Production Product Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.production.workcenter.line')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.production.workcenter.line')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_production_workcenter_line_worker">
+        <record id="mrp_production_workcenter_line_worker" model="ir.model.access">
             <field name="name">Production Product Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.production.workcenter.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.production.workcenter.line')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Stock Movement Security -->
-        <record model="ir.model.access" id="mrp_stock_move">
+        <record id="mrp_stock_move" model="ir.model.access">
             <field name="name">Stock Move</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'stock.move')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'stock.move')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_stock_move_worker">
+        <record id="mrp_stock_move_worker" model="ir.model.access">
             <field name="name">Stock Move</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'stock.move')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'stock.move')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         
         <!-- Order Point Security -->
-        <record model="ir.model.access" id="mrp_order_point">
+        <record id="mrp_order_point" model="ir.model.access">
             <field name="name">Stock Move</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'stock.warehouse.orderpoint')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'stock.warehouse.orderpoint')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="mrp_order_point_worker">
+        <record id="mrp_order_point_worker" model="ir.model.access">
             <field name="name">Stock Move</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'stock.warehouse.orderpoint')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'stock.warehouse.orderpoint')]"/>
             <field name="group_id" ref="group_production_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 69c4b0e3595..7a710a5f4ad 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1,367 +1,340 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <menuitem
-		name='Production Management' icon='terp-mrp' id='menu_mrp_root'/>
+        <menuitem icon="terp-mrp" id="menu_mrp_root" name="Production Management"/>
         
         <!--
 	Property / Property Group
 	-->
         
-        <record id='mrp_property_group_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.property.group.form</field>
-            <field name='model'>mrp.property.group</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Properties categories'>
-                    <separator string='General Information' colspan='4'/>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='description' colspan='4'/>
+        <record id="mrp_property_group_form_view" model="ir.ui.view">
+            <field name="name">mrp.property.group.form</field>
+            <field name="model">mrp.property.group</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties categories">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="description"/>
                 </form>
             </field>
         </record>
-        <record id='mrp_property_group_action' model='ir.actions.act_window'>
-            <field name='name'>Property Categories</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.property.group</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="mrp_property_group_action" model="ir.actions.act_window">
+            <field name="name">Property Categories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.property.group</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem 
-			name='Configuration'
-			groups='base.group_admin' 
-			id='menu_mrp_configuration'/>
-        <menuitem 
-			parent='menu_mrp_configuration'
-			name='Properties' 
-			id='menu_mrp_property_group_action_prop'/>
-        <menuitem 
-			parent='menu_mrp_property_group_action_prop' 
-			action='mrp_property_group_action' 
-			id='menu_mrp_property_group_action'/>
+        <menuitem groups="base.group_admin" id="menu_mrp_configuration" name="Configuration"/>
+        <menuitem id="menu_mrp_property_group_action_prop" name="Properties" parent="menu_mrp_configuration"/>
+        <menuitem action="mrp_property_group_action" id="menu_mrp_property_group_action" parent="menu_mrp_property_group_action_prop"/>
         
-        <record id='mrp_property_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.property.tree</field>
-            <field name='model'>mrp.property</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Properties'>
-                    <field name='name'/>
-                    <field name='composition'/>
-                    <field name='group_id'/>
+        <record id="mrp_property_tree_view" model="ir.ui.view">
+            <field name="name">mrp.property.tree</field>
+            <field name="model">mrp.property</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Properties">
+                    <field name="name"/>
+                    <field name="composition"/>
+                    <field name="group_id"/>
                 </tree>
             </field>
         </record>
-        <record id='mrp_property_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.property.form</field>
-            <field name='model'>mrp.property</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Properties'>
-                    <separator string='General Information' colspan='4'/>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='group_id' select='1'/>
-                    <field name='composition' select='1'/>
-                    <separator string='Description' colspan='4'/>
-                    <field name='description' colspan='4'/>
+        <record id="mrp_property_form_view" model="ir.ui.view">
+            <field name="name">mrp.property.form</field>
+            <field name="model">mrp.property</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Properties">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="group_id" select="1"/>
+                    <field name="composition" select="1"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="description"/>
                 </form>
             </field>
         </record>
-        <record id='mrp_property_action' model='ir.actions.act_window'>
-            <field name='name'>Properties</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.property</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="mrp_property_action" model="ir.actions.act_window">
+            <field name="name">Properties</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.property</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem 
-			parent='menu_mrp_property_group_action_prop' 
-			action='mrp_property_action' 
-			id='menu_mrp_property_action'/>
+        <menuitem action="mrp_property_action" id="menu_mrp_property_action" parent="menu_mrp_property_group_action_prop"/>
         
         <!--
 	Workcenters
 	-->
         
-        <record id='mrp_workcenter_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.workcenter.tree</field>
-            <field name='model'>mrp.workcenter</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Workcenter'>
-                    <field name='code'/>
-                    <field name='name'/>
+        <record id="mrp_workcenter_tree_view" model="ir.ui.view">
+            <field name="name">mrp.workcenter.tree</field>
+            <field name="model">mrp.workcenter</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Workcenter">
+                    <field name="code"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='mrp_workcenter_view' model='ir.ui.view'>
-            <field name='name'>mrp.workcenter.form</field>
-            <field name='model'>mrp.workcenter</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Workcenter'>
+        <record id="mrp_workcenter_view" model="ir.ui.view">
+            <field name="name">mrp.workcenter.form</field>
+            <field name="model">mrp.workcenter</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Workcenter">
                     <notebook>
-                        <page string='Workcenter'>
-                            <separator string='General Information' colspan='4'/>
-                            <field name='name' select='1'/>
-                            <field name='active' select='2'/>
-                            <field name='code' select='1'/>
+                        <page string="Workcenter">
+                            <separator colspan="4" string="General Information"/>
+                            <field name="name" select="1"/>
+                            <field name="active" select="2"/>
+                            <field name="code" select="1"/>
                             <newline/>
-                            <field name='type'/>
-                            <field name='timesheet_id'/>
-                            <separator string='Description' colspan='4'/>
-                            <field name='note' nolabel='1' colspan='4'/>
-                            <separator string='Capacity Information' colspan='4'/>
-                            <group col='4' colspan='4'>
-                                <field name='capacity_per_cycle'/>
+                            <field name="type"/>
+                            <field name="timesheet_id"/>
+                            <separator colspan="4" string="Description"/>
+                            <field colspan="4" name="note" nolabel="1"/>
+                            <separator colspan="4" string="Capacity Information"/>
+                            <group col="4" colspan="4">
+                                <field name="capacity_per_cycle"/>
                                 <newline/>
-                                <field name='time_cycle'/>
-                                <field name='time_efficiency'/>
-                                <field name='time_start'/>
-                                <field name='time_stop'/>
+                                <field name="time_cycle"/>
+                                <field name="time_efficiency"/>
+                                <field name="time_start"/>
+                                <field name="time_stop"/>
                             </group>
                         </page>
-                        <page string='Analytic Accounting'>
-                            <field name='costs_hour'/>
-                            <field name='costs_hour_account_id'/>
-                            <field name='costs_cycle'/>
-                            <field name='costs_cycle_account_id'/>
-                            <field name='costs_journal_id'/>
-                            <field name='costs_general_account_id'/>
+                        <page string="Analytic Accounting">
+                            <field name="costs_hour"/>
+                            <field name="costs_hour_account_id"/>
+                            <field name="costs_cycle"/>
+                            <field name="costs_cycle_account_id"/>
+                            <field name="costs_journal_id"/>
+                            <field name="costs_general_account_id"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='mrp_workcenter_action' model='ir.actions.act_window'>
-            <field name='name'>Workcenters</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.workcenter</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='mrp_workcenter_tree_view'/>
+        <record id="mrp_workcenter_action" model="ir.actions.act_window">
+            <field name="name">Workcenters</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.workcenter</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="mrp_workcenter_tree_view"/>
         </record>
-        <menuitem 
-			parent='menu_mrp_configuration' 
-			action='mrp_workcenter_action' 
-			id='menu_mrp_workcenter_action'/>
+        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration"/>
         
         <!--
 	Routings
 	-->
         
-        <record id='mrp_routing_workcenter_tree.view' model='ir.ui.view'>
-            <field name='name'>mrp.routing.workcenter.tree</field>
-            <field name='model'>mrp.routing.workcenter</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Routing Workcenters'>
-                    <field name='sequence'/>
-                    <field name='workcenter_id' select='1'/>
-                    <field name='cycle_nbr'/>
-                    <field name='hour_nbr'/>
+        <record id="mrp_routing_workcenter_tree.view" model="ir.ui.view">
+            <field name="name">mrp.routing.workcenter.tree</field>
+            <field name="model">mrp.routing.workcenter</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Routing Workcenters">
+                    <field name="sequence"/>
+                    <field name="workcenter_id" select="1"/>
+                    <field name="cycle_nbr"/>
+                    <field name="hour_nbr"/>
                 </tree>
             </field>
         </record>
         
-        <record id='mrp_routing_workcenter_form.view' model='ir.ui.view'>
-            <field name='name'>mrp.routing.workcenter.form</field>
-            <field name='model'>mrp.routing.workcenter</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Routing Workcenters'>
-                    <separator string='General Information' colspan='4'/>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='sequence' select='1'/>
-                    <field name='workcenter_id' select='1'/>
-                    <field name='cycle_nbr'/>
-                    <field name='hour_nbr'/>
-                    <field name='note' colspan='4'/>
+        <record id="mrp_routing_workcenter_form.view" model="ir.ui.view">
+            <field name="name">mrp.routing.workcenter.form</field>
+            <field name="model">mrp.routing.workcenter</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Routing Workcenters">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="sequence" select="1"/>
+                    <field name="workcenter_id" select="1"/>
+                    <field name="cycle_nbr"/>
+                    <field name="hour_nbr"/>
+                    <field colspan="4" name="note"/>
                 </form>
             </field>
         </record>
         
-        <record id='mrp_routing_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.routing.form</field>
-            <field name='model'>mrp.routing</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Routing'>
-                    <separator string='General Information' colspan='4'/>
-                    <field name='name' select='1'/>
-                    <field name='active' select='1'/>
-                    <field name='code' select='1'/>
-                    <field name='location_id'/>
-                    <separator string='Description' colspan='4'/>
-                    <field name='note' nolabel='1' colspan='4'/>
-                    <separator string='Workcenter Operations' colspan='4'/>
-                    <field name='workcenter_lines' widget='one2many_list' nolabel='1' colspan='4'/>
+        <record id="mrp_routing_form_view" model="ir.ui.view">
+            <field name="name">mrp.routing.form</field>
+            <field name="model">mrp.routing</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Routing">
+                    <separator colspan="4" string="General Information"/>
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="location_id"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="note" nolabel="1"/>
+                    <separator colspan="4" string="Workcenter Operations"/>
+                    <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
-        <record id='mrp_routing_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.routing.tree</field>
-            <field name='model'>mrp.routing</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Routing'>
-                    <field name='code'/>
-                    <field name='name'/>
-                    <field name='location_id'/>
+        <record id="mrp_routing_tree_view" model="ir.ui.view">
+            <field name="name">mrp.routing.tree</field>
+            <field name="model">mrp.routing</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Routing">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="location_id"/>
                 </tree>
             </field>
         </record>
-        <record id='mrp_routing_action' model='ir.actions.act_window'>
-            <field name='name'>Routings</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.routing</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='mrp_routing_tree_view'/>
+        <record id="mrp_routing_action" model="ir.actions.act_window">
+            <field name="name">Routings</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.routing</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="mrp_routing_tree_view"/>
         </record>
-        <menuitem 
-			parent='menu_mrp_configuration'
-			action='mrp_routing_action' 
-			id='menu_mrp_routing_action'/>
+        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration"/>
         
         <!--
 	Bill of Materials
 	-->
         
-        <record id='mrp_bom_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.bom.form</field>
-            <field name='model'>mrp.bom</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Bill of Material'>
+        <record id="mrp_bom_form_view" model="ir.ui.view">
+            <field name="name">mrp.bom.form</field>
+            <field name="model">mrp.bom</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bill of Material">
                     <notebook>
-                        <page string='General Information'>
-                            <field name='name' select='1'/>
-                            <field name='code' select='1'/>
-                            <field name='product_id' on_change='onchange_product_id(product_id, name)' select='1'/>
+                        <page string="General Information">
+                            <field name="name" select="1"/>
+                            <field name="code" select="1"/>
+                            <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
                             <newline/>
-                            <field name='product_uom'/>
-                            <field name='product_qty'/>
+                            <field name="product_uom"/>
+                            <field name="product_qty"/>
                             <newline/>
-                            <field name='product_uos'/>
-                            <field name='product_uos_qty'/>
-                            <field name='routing_id' select='2'/>
-                            <field name='type'/>
+                            <field name="product_uos"/>
+                            <field name="product_uos_qty"/>
+                            <field name="routing_id" select="2"/>
+                            <field name="type"/>
                             
-                            <field name='bom_lines' nolabel='1' widget='one2many_list' colspan='4'/>
+                            <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string='Revisions'>
-                            <field name='revision_ids' nolabel='1' widget='one2many_list' colspan='4'/>
+                        <page string="Revisions">
+                            <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string='Properties'>
-                            <field name='position' select='2'/>
-                            <field name='active' select='2'/>
-                            <field name='sequence'/>
-                            <field name='bom_id'/>
+                        <page string="Properties">
+                            <field name="position" select="2"/>
+                            <field name="active" select="2"/>
+                            <field name="sequence"/>
+                            <field name="bom_id"/>
                             
-                            <field name='date_start' select='2'/>
-                            <field name='date_stop' select='2'/>
-                            <field name='product_rounding'/>
-                            <field name='product_efficiency'/>
-                            <field name='property_ids' nolabel='2' colspan='4'/>
+                            <field name="date_start" select="2"/>
+                            <field name="date_stop" select="2"/>
+                            <field name="product_rounding"/>
+                            <field name="product_efficiency"/>
+                            <field colspan="4" name="property_ids" nolabel="2"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='mrp_bom_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.bom.tree</field>
-            <field name='model'>mrp.bom</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>bom_lines</field>
-            <field name='arch' type='xml'>
-                <tree string='BoM Structure'>
-                    <field name='name'/>
-                    <field name='code'/>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='product_uom'/>
-                    <field name='date_start'/>
-                    <field name='date_stop'/>
+        <record id="mrp_bom_tree_view" model="ir.ui.view">
+            <field name="name">mrp.bom.tree</field>
+            <field name="model">mrp.bom</field>
+            <field name="type">tree</field>
+            <field name="field_parent">bom_lines</field>
+            <field name="arch" type="xml">
+                <tree string="BoM Structure">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
                 </tree>
             </field>
         </record>
-        <record id='mrp_bom_form_action' model='ir.actions.act_window'>
-            <field name='name'>Bill of Materials</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.bom</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('bom_id','=',False)]</field>
-            <field name='view_id' ref='mrp_bom_tree_view'/>
+        <record id="mrp_bom_form_action" model="ir.actions.act_window">
+            <field name="name">Bill of Materials</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.bom</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('bom_id','=',False)]</field>
+            <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
-        <menuitem
-			parent='menu_mrp_configuration'
-			action='mrp_bom_form_action' id='menu_mrp_bom_form_action'/>
+        <menuitem action="mrp_bom_form_action" id="menu_mrp_bom_form_action" parent="menu_mrp_configuration"/>
         
-        <record id='mrp_bom_tree_action' model='ir.actions.act_window'>
-            <field name='name'>BoM Structure</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.bom</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('bom_id','=',False)]</field>
-            <field name='view_id' ref='mrp_bom_tree_view'/>
+        <record id="mrp_bom_tree_action" model="ir.actions.act_window">
+            <field name="name">BoM Structure</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.bom</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('bom_id','=',False)]</field>
+            <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
-        <menuitem
-			parent='menu_mrp_bom_form_action' 
-			action='mrp_bom_tree_action' 
-			id='menu_bom_tree'/>
+        <menuitem action="mrp_bom_tree_action" id="menu_bom_tree" parent="menu_mrp_bom_form_action"/>
 
-        <record id='mrp_bom_form_action2' model='ir.actions.act_window'>
-            <field name='name'>BoM Lines</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.bom</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='mrp_bom_tree_view'/>
+        <record id="mrp_bom_form_action2" model="ir.actions.act_window">
+            <field name="name">BoM Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.bom</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
-        <menuitem
-			parent='menu_mrp_bom_form_action' 
-			action='mrp_bom_form_action2' 
-			id='menu_mrp_bom_form_action2'/>
+        <menuitem action="mrp_bom_form_action2" id="menu_mrp_bom_form_action2" parent="menu_mrp_bom_form_action"/>
         
-        <record id='action2' model='ir.actions.act_window'>
-            <field name='name'>Bill of Materials Architecture</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.bom</field>
-            <field name='domain'>[('id','in',active_ids)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='mrp_bom_tree_view'/>
+        <record id="action2" model="ir.actions.act_window">
+            <field name="name">Bill of Materials Architecture</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.bom</field>
+            <field name="domain">[('id','in',active_ids)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
-        <record id='ir_bom_architecture_open' model='ir.values'>
-            <field name='key2' eval='&apos;client_action_multi&apos;'/>
-            <field name='model' eval='&apos;mrp.bom&apos;'/>
-            <field name='name'>Bill of Material Architecture</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(action2)'/>
-            <field name='object' eval='True'/>
+        <record id="ir_bom_architecture_open" model="ir.values">
+            <field eval="'client_action_multi'" name="key2"/>
+            <field eval="'mrp.bom'" name="model"/>
+            <field name="name">Bill of Material Architecture</field>
+            <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
-        <record id='mrp_bom_revision_tree' model='ir.ui.view'>
-            <field name='name'>mrp.bom.revision</field>
-            <field name='model'>mrp.bom.revision</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='BoM Revisions'>
-                    <field name='indice'/>
-                    <field name='author_id'/>
-                    <field name='date'/>
-                    <field name='name' colspan='4'/>
+        <record id="mrp_bom_revision_tree" model="ir.ui.view">
+            <field name="name">mrp.bom.revision</field>
+            <field name="model">mrp.bom.revision</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="BoM Revisions">
+                    <field name="indice"/>
+                    <field name="author_id"/>
+                    <field name="date"/>
+                    <field colspan="4" name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='mrp_bom_revision_form' model='ir.ui.view'>
-            <field name='name'>mrp.bom.revision</field>
-            <field name='model'>mrp.bom.revision</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='BoM Revisions'>
-                    <field name='name' colspan='4'/>
-                    <field name='indice' colspan='1'/>
-                    <field name='date' colspan='1'/>
-                    <field name='author_id' readonly='1'/>
-                    <field name='description' colspan='4'/>
+        <record id="mrp_bom_revision_form" model="ir.ui.view">
+            <field name="name">mrp.bom.revision</field>
+            <field name="model">mrp.bom.revision</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="BoM Revisions">
+                    <field colspan="4" name="name"/>
+                    <field colspan="1" name="indice"/>
+                    <field colspan="1" name="date"/>
+                    <field name="author_id" readonly="1"/>
+                    <field colspan="4" name="description"/>
                 </form>
             </field>
         </record>
@@ -370,227 +343,222 @@
 	Production Management
 	-->
         
-        <record id='mrp_production_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.production.tree</field>
-            <field name='model'>mrp.production</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree colors='red:date_planned&lt;current_date and state not in (&apos;done&apos;,&apos;cancel&apos;)' string='Production orders'>
-                    <field name='name'/>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='date_planned'/>
-                    <field name='date_finnished'/>
-                    <field name='origin'/>
-                    <field name='state'/>
+        <record id="mrp_production_tree_view" model="ir.ui.view">
+            <field name="name">mrp.production.tree</field>
+            <field name="model">mrp.production</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:date_planned&lt;current_date and state not in ('done','cancel')" string="Production orders">
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="date_planned"/>
+                    <field name="date_finnished"/>
+                    <field name="origin"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
         
-        <record id='view_production_calendar' model='ir.ui.view'>
-            <field name='name'>mrp.production.calendar</field>
-            <field name='model'>mrp.production</field>
-            <field name='type'>calendar</field>
-            <field name='priority' eval='2'/>
-            <field name='arch' type='xml'>
-                <calendar color='product_id' string='Production Orders' date_start='date_planned'>
-                    <field name='origin'/>
-                    <field name='name'/>
+        <record id="view_production_calendar" model="ir.ui.view">
+            <field name="name">mrp.production.calendar</field>
+            <field name="model">mrp.production</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="product_id" date_start="date_planned" string="Production Orders">
+                    <field name="origin"/>
+                    <field name="name"/>
                 </calendar>
             </field>
         </record>
         
         
-        <record id='mrp_production_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.production.form</field>
-            <field name='model'>mrp.production</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Production orders'>
+        <record id="mrp_production_form_view" model="ir.ui.view">
+            <field name="name">mrp.production.form</field>
+            <field name="model">mrp.production</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Production orders">
                     <notebook>
-                        <page string='General'>
-                            <field name='name' select='1' colspan='4'/>
-                            <field name='date_planned' select='1'/>
-                            <field name='priority'/>
+                        <page string="General">
+                            <field colspan="4" name="name" select="1"/>
+                            <field name="date_planned" select="1"/>
+                            <field name="priority"/>
                             
-                            <field name='product_id' on_change='product_id_change(product_id)' select='1'/>
-                            <field name='product_qty'/>
-                            <field name='product_uom'/>
+                            <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
+                            <field name="product_qty"/>
+                            <field name="product_uom"/>
                             <!--
 					<field name="product_uos_qty"/>
 					<field name="product_uos"/>
 					-->
-                            <field name='bom_id' select='2'/>
+                            <field name="bom_id" select="2"/>
                             
                             <newline/>
-                            <field name='location_src_id' select='2'/>
-                            <field name='location_dest_id'/>
+                            <field name="location_src_id" select="2"/>
+                            <field name="location_dest_id"/>
                             
-                            <field name='move_lines' nolabel='1' widget='one2many_list' colspan='4'/>
-                            <group col='9' colspan='4'>
-                                <field name='state' select='2'/>
-                                <button name='action_compute' type='object' states='draft' string='Compute Data'/>
-                                <button name='button_confirm' states='draft' string='Confirm Production'/>
-                                <button name='button_produce' states='ready' string='Start Production'/>
-                                <button name='button_produce_done' states='in_production' string='Production done'/>
-                                <button name='force_production' type='object' states='confirmed,picking_except' string='Force Reservation'/>
-                                <button name='button_cancel' states='draft,ready,confirmed,in_production,picking_except' string='Cancel'/>
-                                <button name='button_recreate' states='picking_except' string='Recreate Picking'/>
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list"/>
+                            <group col="9" colspan="4">
+                                <field name="state" select="2"/>
+                                <button name="action_compute" states="draft" string="Compute Data" type="object"/>
+                                <button name="button_confirm" states="draft" string="Confirm Production"/>
+                                <button name="button_produce" states="ready" string="Start Production"/>
+                                <button name="button_produce_done" states="in_production" string="Production done"/>
+                                <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object"/>
+                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel"/>
+                                <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
                             </group>
                         </page>
-                        <page string='Scheduled goods'>
-                            <field name='product_lines' nolabel='1' widget='one2many_list' colspan='4'/>
+                        <page string="Scheduled goods">
+                            <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string='Workcenters'>
-                            <field name='workcenter_lines' nolabel='1' widget='one2many_list' colspan='4'/>
+                        <page string="Workcenters">
+                            <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string='Other Info'>
-                            <field name='date_start' select='2'/>
-                            <field name='date_finnished'/>
-                            <field name='picking_id'/>
-                            <field name='origin' select="1"/>
-                            <field name='move_prod_id'/>
+                        <page string="Other Info">
+                            <field name="date_start" select="2"/>
+                            <field name="date_finnished"/>
+                            <field name="picking_id"/>
+                            <field name="origin" select="1"/>
+                            <field name="move_prod_id"/>
                             <newline/>
-                            <field name='move_created_ids' nolabel='1' colspan='4'/>
+                            <field colspan="4" name="move_created_ids" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='mrp_production_action' model='ir.actions.act_window'>
-            <field name='name'>Production Orders</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.production</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form,calendar</field>
-            <field name='view_id' ref='mrp_production_form_view'/>
+        <record id="mrp_production_action" model="ir.actions.act_window">
+            <field name="name">Production Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="view_id" ref="mrp_production_form_view"/>
         </record>
-        <menuitem 
-			   parent='menu_mrp_root'
-			action='mrp_production_action' id='menu_mrp_production_action'/>
+        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root"/>
 
-        <record id='mrp_production_action2' model='ir.actions.act_window'>
-            <field name='name'>Production Orders To Start</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.production</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','ready')]</field>
+        <record id="mrp_production_action2" model="ir.actions.act_window">
+            <field name="name">Production Orders To Start</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','ready')]</field>
         </record>
-        <menuitem
-			parent='menu_mrp_production_action'
-			action='mrp_production_action2' 
-			id='menu_production_orders_start'/>
-        <record id='mrp_production_action3' model='ir.actions.act_window'>
-            <field name='name'>Production orders in progress</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.production</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','in_production')]</field>
+        <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action"/>
+        <record id="mrp_production_action3" model="ir.actions.act_window">
+            <field name="name">Production orders in progress</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','in_production')]</field>
         </record>
-        <menuitem name='Production Management/Production Orders/Production Orders in Progress' action='mrp_production_action3' id='menu_mrp_production_action3'/>
-        <record id='mrp_production_action4' model='ir.actions.act_window'>
-            <field name='name'>Production orders waiting goods</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.production</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','confirmed')]</field>
+        <menuitem id="next_id_76" name="Production Orders" parent="mrp.menu_mrp_root"/><menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="next_id_76"/>
+        <record id="mrp_production_action4" model="ir.actions.act_window">
+            <field name="name">Production orders waiting goods</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','confirmed')]</field>
         </record>
-        <menuitem name='Production Management/Production Orders/Production Orders Waiting Goods' action='mrp_production_action4' id='menu_production_orders_waiting4'/>
+        <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.next_id_76"/>
         
-        <record id='mrp_production_workcenter_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.production.workcenter.line.form</field>
-            <field name='model'>mrp.production.workcenter.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Production Workcenters'>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='workcenter_id' select='1' colspan='4'/>
-                    <field name='sequence'/>
-                    <field name='cycle'/>
-                    <field name='hour'/>
+        <record id="mrp_production_workcenter_form_view" model="ir.ui.view">
+            <field name="name">mrp.production.workcenter.line.form</field>
+            <field name="model">mrp.production.workcenter.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Production Workcenters">
+                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="workcenter_id" select="1"/>
+                    <field name="sequence"/>
+                    <field name="cycle"/>
+                    <field name="hour"/>
                 </form>
             </field>
         </record>
-        <record id='mrp_production_workcenter_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.production.workcenter.line.tree</field>
-            <field name='model'>mrp.production.workcenter.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Production Workcenters'>
-                    <field name='sequence'/>
-                    <field name='name'/>
-                    <field name='workcenter_id'/>
-                    <field name='cycle'/>
-                    <field name='hour'/>
+        <record id="mrp_production_workcenter_tree_view" model="ir.ui.view">
+            <field name="name">mrp.production.workcenter.line.tree</field>
+            <field name="model">mrp.production.workcenter.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Production Workcenters">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="workcenter_id"/>
+                    <field name="cycle"/>
+                    <field name="hour"/>
                 </tree>
             </field>
         </record>
         
-        <record id='mrp_production_lot_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.production.lot.line.form</field>
-            <field name='model'>mrp.production.lot.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Production Products'>
-                    <field name='move_id' on_change='onchange_lot_line_id(lot_id)' colspan='4'/>
-                    <field name='name'/>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='product_uom'/>
-                    <field name='product_uos_qty'/>
-                    <field name='product_uos'/>
-                    <field name='tracking_id'/>
+        <record id="mrp_production_lot_form_view" model="ir.ui.view">
+            <field name="name">mrp.production.lot.line.form</field>
+            <field name="model">mrp.production.lot.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Production Products">
+                    <field colspan="4" name="move_id" on_change="onchange_lot_line_id(lot_id)"/>
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
+                    <field name="tracking_id"/>
                 </form>
             </field>
         </record>
-        <record id='mrp_production_lot_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.production.lot.line.tree</field>
-            <field name='model'>mrp.production.lot.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Production Products Consommation'>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='product_uom'/>
-                    <field name='product_uos_qty'/>
-                    <field name='product_uos'/>
-                    <field name='tracking_id'/>
+        <record id="mrp_production_lot_tree_view" model="ir.ui.view">
+            <field name="name">mrp.production.lot.line.tree</field>
+            <field name="model">mrp.production.lot.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Production Products Consommation">
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
+                    <field name="tracking_id"/>
                 </tree>
             </field>
         </record>
         
         
         
-        <record id='mrp_production_product_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.production.product.line.form</field>
-            <field name='model'>mrp.production.product.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Scheduled goods'>
-                    <field name='name'/>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='product_uom'/>
-                    <field name='product_uos_qty'/>
-                    <field name='product_uos'/>
+        <record id="mrp_production_product_form_view" model="ir.ui.view">
+            <field name="name">mrp.production.product.line.form</field>
+            <field name="model">mrp.production.product.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scheduled goods">
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
                 </form>
             </field>
         </record>
-        <record id='mrp_production_product_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.production.product.line.tree</field>
-            <field name='model'>mrp.production.product.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Scheduled goods'>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='product_uom'/>
-                    <field name='product_uos_qty'/>
-                    <field name='product_uos'/>
+        <record id="mrp_production_product_tree_view" model="ir.ui.view">
+            <field name="name">mrp.production.product.line.tree</field>
+            <field name="model">mrp.production.product.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Scheduled goods">
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
                 </tree>
             </field>
         </record>
@@ -599,174 +567,174 @@
 	Procurement
 	-->
         
-        <record id='mrp_procurement_tree_view' model='ir.ui.view'>
-            <field name='name'>mrp.procurement.tree</field>
-            <field name='model'>mrp.procurement</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Procurement Lines'>
-                    <field name='name'/>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='product_uom' string='UOM'/>
-                    <field name='date_planned'/>
-                    <field name='procure_method'/>
-                    <field name='origin'/>
-                    <field name='state'/>
-                    <field name='message'/>
+        <record id="mrp_procurement_tree_view" model="ir.ui.view">
+            <field name="name">mrp.procurement.tree</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Procurement Lines">
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom" string="UOM"/>
+                    <field name="date_planned"/>
+                    <field name="procure_method"/>
+                    <field name="origin"/>
+                    <field name="state"/>
+                    <field name="message"/>
                 </tree>
             </field>
         </record>
-        <record id='mrp_procurement_form_view' model='ir.ui.view'>
-            <field name='name'>mrp.procurement.form</field>
-            <field name='model'>mrp.procurement</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Procurement'>
-                    <separator string='General Information' colspan='4'/>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='priority'/>
-                    <field name='date_planned' select='1'/>
-                    <field name='procure_method' select='2'/>
-                    <field name='date_close' select='2'/>
+        <record id="mrp_procurement_form_view" model="ir.ui.view">
+            <field name="name">mrp.procurement.form</field>
+            <field name="model">mrp.procurement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Procurement">
+                    <separator colspan="4" string="General Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="priority"/>
+                    <field name="date_planned" select="1"/>
+                    <field name="procure_method" select="2"/>
+                    <field name="date_close" select="2"/>
                     <newline/>
-                    <field name='product_qty'/>
-                    <field name='product_uom'/>
-                    <field name='product_uos_qty'/>
-                    <field name='product_uos'/>
-                    <field name='product_id' select='1'/>
-                    <field name='location_id' select='2'/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
+                    <field name="product_id" select="1"/>
+                    <field name="location_id" select="2"/>
                     <newline/>
-                    <field name='origin' select='2'/>
-                    <field name='move_id'/>
+                    <field name="origin" select="2"/>
+                    <field name="move_id"/>
                     <newline/>
-                    <field name='message' colspan='4'/>
-                    <separator string='Properties' colspan='4'/>
-                    <field name='property_ids' nolabel='1' colspan='4'/>
-                    <group col='7' colspan='4'>
-                        <field name='state' readonly='1' select='2'/>
-                        <button name='button_confirm' states='draft' string='Confirm'/>
-                        <button name='button_restart' states='exception' string='Retry'/>
-                        <button name='button_cancel' states='exception,waiting' string='Cancel'/>
-                        <button name='button_check' states='confirmed' string='Run procurement'/>
-                        <button name='button_cancel' states='draft,running' string='Cancel'/>
+                    <field colspan="4" name="message"/>
+                    <separator colspan="4" string="Properties"/>
+                    <field colspan="4" name="property_ids" nolabel="1"/>
+                    <group col="7" colspan="4">
+                        <field name="state" readonly="1" select="2"/>
+                        <button name="button_confirm" states="draft" string="Confirm"/>
+                        <button name="button_restart" states="exception" string="Retry"/>
+                        <button name="button_cancel" states="exception,waiting" string="Cancel"/>
+                        <button name="button_check" states="confirmed" string="Run procurement"/>
+                        <button name="button_cancel" states="draft,running" string="Cancel"/>
                     </group>
                 </form>
             </field>
         </record>
-        <record id='mrp_procurement_action' model='ir.actions.act_window'>
-            <field name='name'>Procurement Orders</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.procurement</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='mrp_procurement_form_view'/>
+        <record id="mrp_procurement_action" model="ir.actions.act_window">
+            <field name="name">Procurement Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="mrp_procurement_form_view"/>
         </record>
-        <menuitem name='Production Management/Procurement Orders' action='mrp_procurement_action' id='menu_mrp_procurement_action'/>
+        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"/>
         
-        <record id='mrp_procurement_action2' model='ir.actions.act_window'>
-            <field name='name'>Draft procurements</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.procurement</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft')]</field>
+        <record id="mrp_procurement_action2" model="ir.actions.act_window">
+            <field name="name">Draft procurements</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
         </record>
-        <menuitem name='Production Management/Procurement Orders/Draft Procurements' action='mrp_procurement_action2' id='menu_mrp_procurement_action2'/>
-        <record id='mrp_procurement_action3' model='ir.actions.act_window'>
-            <field name='name'>Unscheduled procurements</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.procurement</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','confirmed')]</field>
+        <menuitem action="mrp_procurement_action2" id="menu_mrp_procurement_action2" parent="mrp.menu_mrp_procurement_action"/>
+        <record id="mrp_procurement_action3" model="ir.actions.act_window">
+            <field name="name">Unscheduled procurements</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','confirmed')]</field>
         </record>
-        <menuitem name='Production Management/Procurement Orders/Unscheduled Procurements' action='mrp_procurement_action3' id='menu_mrp_procurement_action3'/>
+        <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action"/>
         
-        <record id='mrp_procurement_action5' model='ir.actions.act_window'>
-            <field name='name'>Exceptions procurements</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.procurement</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','exception')]</field>
+        <record id="mrp_procurement_action5" model="ir.actions.act_window">
+            <field name="name">Exceptions procurements</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception')]</field>
         </record>
-        <menuitem name='Production Management/Procurement Orders/All Exceptions' action='mrp_procurement_action5' id='menu_mrp_procurement_action5'/>
+        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="mrp.menu_mrp_procurement_action"/>
         
-        <record id='mrp_procurement_action4' model='ir.actions.act_window'>
-            <field name='name'>Exceptions procurements to fix</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.procurement</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
+        <record id="mrp_procurement_action4" model="ir.actions.act_window">
+            <field name="name">Exceptions procurements to fix</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
         </record>
-        <menuitem name='Production Management/Procurement Orders/All Exceptions/Exceptions to Fix' action='mrp_procurement_action4' id='menu_mrp_procurement_action4'/>
+        <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5"/>
         
-        <record id='mrp_procurement_action11' model='ir.actions.act_window'>
-            <field name='name'>Temporary Procurement Exceptions</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>mrp.procurement</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','exception'), ('message', '=', '')]</field>
+        <record id="mrp_procurement_action11" model="ir.actions.act_window">
+            <field name="name">Temporary Procurement Exceptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
         </record>
-        <menuitem name='Production Management/Procurement Orders/All Exceptions/Temporary Procurement Exceptions' action='mrp_procurement_action11' id='menu_mrp_procurement_action11'/>
+        <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5"/>
         
         <!-- Order Point -->
-        <record id='view_warehouse_orderpoint_tree' model='ir.ui.view'>
-            <field name='name'>stock.warehouse.orderpoint.tree</field>
-            <field name='model'>stock.warehouse.orderpoint</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Minimum Stock Rules'>
-                    <field name='name'/>
-                    <field name='warehouse_id'/>
-                    <field name='product_id'/>
-                    <field name='product_uom'/>
-                    <field name='product_min_qty'/>
-                    <field name='product_max_qty'/>
+        <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
+            <field name="name">stock.warehouse.orderpoint.tree</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Minimum Stock Rules">
+                    <field name="name"/>
+                    <field name="warehouse_id"/>
+                    <field name="product_id"/>
+                    <field name="product_uom"/>
+                    <field name="product_min_qty"/>
+                    <field name="product_max_qty"/>
                     <!--
 				<field name="logic"/>
 -->
                 </tree>
             </field>
         </record>
-        <record id='view_warehouse_orderpoint_form' model='ir.ui.view'>
-            <field name='name'>stock.warehouse.orderpoint.form</field>
-            <field name='model'>stock.warehouse.orderpoint</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Minimum Stock Rules'>
-                    <field name='name' select='1'/>
-                    <field name='active' select='1'/>
-                    <field name='warehouse_id' select='1'/>
+        <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
+            <field name="name">stock.warehouse.orderpoint.form</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Minimum Stock Rules">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="warehouse_id" select="1"/>
                     <!--
 				<field name="logic"/>
 -->
-                    <field name='product_id' on_change='onchange_product_id(product_id)' select='1'/>
-                    <field name='product_uom'/>
-                    <field name='product_min_qty'/>
-                    <field name='product_max_qty'/>
-                    <field name='qty_multiple'/>
-                    <field name='procurement_id' readonly='1'/>
+                    <field name="product_id" on_change="onchange_product_id(product_id)" select="1"/>
+                    <field name="product_uom"/>
+                    <field name="product_min_qty"/>
+                    <field name="product_max_qty"/>
+                    <field name="qty_multiple"/>
+                    <field name="procurement_id" readonly="1"/>
                 </form>
             </field>
         </record>
-        <record id='action_orderpoint_form' model='ir.actions.act_window'>
-            <field name='name'>Minimum Stock Rules</field>
-            <field name='res_model'>stock.warehouse.orderpoint</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_warehouse_orderpoint_tree'/>
+        <record id="action_orderpoint_form" model="ir.actions.act_window">
+            <field name="name">Minimum Stock Rules</field>
+            <field name="res_model">stock.warehouse.orderpoint</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
         </record>
-        <menuitem name='Reordering Policy' sequence='4' id='menu_mrp_reordering' parent='stock.menu_stock_root'/>
-        <menuitem action='action_orderpoint_form' id='menu_action_orderpoint_form' parent='menu_mrp_reordering'/>
+        <menuitem id="menu_mrp_reordering" name="Reordering Policy" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem action="action_orderpoint_form" id="menu_action_orderpoint_form" parent="menu_mrp_reordering"/>
 
-        <act_window name='Minimum Stock Rules' domain='[(&apos;warehouse_id&apos;, &apos;=&apos;, active_id)]' id='act_stock_warehouse_2_stock_warehouse_orderpoint' src_model='stock.warehouse' res_model='stock.warehouse.orderpoint'/>
+        <act_window domain="[('warehouse_id', '=', active_id)]" id="act_stock_warehouse_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="stock.warehouse"/>
 
         <!-- add product_uom to context to be the default value when adding new orderpoints -->
-        <act_window name='Minimum Stock Rules' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id)]' id='act_product_product_2_stock_warehouse_orderpoint' src_model='product.product' context='{&apos;product_uom&apos;: locals().has_key(&apos;uom_id&apos;) and uom_id}' res_model='stock.warehouse.orderpoint'/>
+        <act_window context="{'product_uom': locals().has_key('uom_id') and uom_id}" domain="[('product_id', '=', active_id)]" id="act_product_product_2_stock_warehouse_orderpoint" name="Minimum Stock Rules" res_model="stock.warehouse.orderpoint" src_model="product.product"/>
 
-        <act_window name='Bill of Material' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id),(&apos;bom_id&apos;,&apos;=&apos;,False)]' id='act_product_product_2_mrp_bom' src_model='product.product' res_model='mrp.bom'/>
+        <act_window domain="[('product_id', '=', active_id),('bom_id','=',False)]" id="act_product_product_2_mrp_bom" name="Bill of Material" res_model="mrp.bom" src_model="product.product"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 9827f8a7e1d..14a162c9551 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -1,35 +1,34 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id='wiz_mrp_proc0' model='ir.actions.wizard'>
-            <field name='name'>Compute all schedulers</field>
-            <field name='wiz_name'>mrp.procurement.compute.all</field>
+        <record id="wiz_mrp_proc0" model="ir.actions.wizard">
+            <field name="name">Compute all schedulers</field>
+            <field name="wiz_name">mrp.procurement.compute.all</field>
         </record>
-        <menuitem name='Production Management/Start All Schedulers' action='wiz_mrp_proc0' type='wizard' id='mrp_Sched_all'/>
+        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard"/>
         
-        <record id='wiz_mrp_proc1' model='ir.actions.wizard'>
-            <field name='name'>Compute procurement</field>
-            <field name='wiz_name'>mrp.procurement.compute</field>
+        <record id="wiz_mrp_proc1" model="ir.actions.wizard">
+            <field name="name">Compute procurement</field>
+            <field name="wiz_name">mrp.procurement.compute</field>
         </record>
-        <menuitem name='Production Management/Start All Schedulers/Start Procurement Scheduling' action='wiz_mrp_proc1' type='wizard' id='menu_wiz_mrp_proc1'/>
+        <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
         
-        <record id='wiz_mrp_proc2' model='ir.actions.wizard'>
-            <field name='name'>Compute stock minimum rules</field>
-            <field name='wiz_name'>mrp.procurement.orderpoint.compute</field>
+        <record id="wiz_mrp_proc2" model="ir.actions.wizard">
+            <field name="name">Compute stock minimum rules</field>
+            <field name="wiz_name">mrp.procurement.orderpoint.compute</field>
         </record>
-        <menuitem name='Production Management/Start All Schedulers/Start Order Point Scheduling' action='wiz_mrp_proc2' type='wizard' id='menu_wiz_mrp_proc2'/>
+        <menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/>
         
-        <wizard name='mrp.workcenter.load' id='wizard_workcenter_load' model='mrp.workcenter' string='Workcenter load'/>
+        <wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Workcenter load"/>
         
-        <wizard name='product_price' id='wizard_price' model='product.product' menu='False' string='Product Cost Structure'/>
-        <record id='ir_project_cost_structure' model='ir.values'>
-            <field name='key2' eval='&apos;client_print_multi&apos;'/>
-            <field name='model' eval='&apos;product.product&apos;'/>
-            <field name='name'>Product Cost Structure</field>
-            <field name='value' eval='&apos;ir.actions.wizard,%d&apos;%wizard_price'/>
-            <field name='object' eval='True'/>
+        <wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>
+        <record id="ir_project_cost_structure" model="ir.values">
+            <field eval="'client_print_multi'" name="key2"/>
+            <field eval="'product.product'" name="model"/>
+            <field name="name">Product Cost Structure</field>
+            <field eval="'ir.actions.wizard,%d'%wizard_price" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 5b85e6e6480..1b675703a0c 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!-- Production -->
         
-        <record model="workflow" id="wkf_prod">
+        <record id="wkf_prod" model="workflow">
             <field name="name">mrp.production.basic</field>
             <field name="osv">mrp.production</field>
             <field name="on_create">True</field>
         </record>
         
-        <record model="workflow.activity" id="prod_act_draft">
+        <record id="prod_act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
-        <record model="workflow.activity" id="prod_act_picking">
+        <record id="prod_act_picking" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="name">picking</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','stock.picking')]"/>
             <field name="action">action_confirm()</field>
         </record>
-        <record model="workflow.activity" id="prod_act_ready">
+        <record id="prod_act_ready" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="name">ready</field>
             <field name="kind">function</field>
             <field name="action">action_ready()</field>
         </record>
-        <record model="workflow.activity" id="prod_act_picking_exception">
+        <record id="prod_act_picking_exception" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="name">picking_exception</field>
             <field name="kind">function</field>
             <field name="action">action_picking_except()</field>
         </record>
-        <record model="workflow.activity" id="prod_act_in_production">
+        <record id="prod_act_in_production" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="name">in_production</field>
             <field name="kind">function</field>
             <field name="action">action_in_production()</field>
         </record>
-        <record model="workflow.activity" id="prod_act_done">
+        <record id="prod_act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="flow_stop">True</field>
             <field name="kind">function</field>
             <field name="action">action_production_end()</field>
             <field name="name">done</field>
         </record>
-        <record model="workflow.activity" id="prod_act_cancel">
+        <record id="prod_act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="flow_stop">True</field>
             <field name="name">cancel</field>
@@ -54,59 +54,59 @@
             <field name="action">action_cancel()</field>
         </record>
         
-        <record model="workflow.transition" id="prod_trans_draft_ready">
+        <record id="prod_trans_draft_ready" model="workflow.transition">
             <field name="act_from" ref="prod_act_draft"/>
             <field name="act_to" ref="prod_act_ready"/>
             <field name="signal">button_confirm</field>
             <field name="condition">not test_if_product()</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_draft_picking">
+        <record id="prod_trans_draft_picking" model="workflow.transition">
             <field name="act_from" ref="prod_act_draft"/>
             <field name="act_to" ref="prod_act_picking"/>
             <field name="signal">button_confirm</field>
             <field name="condition">test_if_product()</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_picking_ready">
+        <record id="prod_trans_picking_ready" model="workflow.transition">
             <field name="act_from" ref="prod_act_picking"/>
             <field name="act_to" ref="prod_act_ready"/>
             <field name="signal">subflow.done</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_ready_in_production">
+        <record id="prod_trans_ready_in_production" model="workflow.transition">
             <field name="act_from" ref="prod_act_ready"/>
             <field name="act_to" ref="prod_act_in_production"/>
             <field name="signal">button_produce</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_in_production_done">
+        <record id="prod_trans_in_production_done" model="workflow.transition">
             <field name="act_from" ref="prod_act_in_production"/>
             <field name="act_to" ref="prod_act_done"/>
             <field name="signal">button_produce_done</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_picking_picking_exception">
+        <record id="prod_trans_picking_picking_exception" model="workflow.transition">
             <field name="act_from" ref="prod_act_picking"/>
             <field name="act_to" ref="prod_act_picking_exception"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_picking_exception_cancel">
+        <record id="prod_trans_picking_exception_cancel" model="workflow.transition">
             <field name="act_from" ref="prod_act_picking_exception"/>
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_picking_exception_picking">
+        <record id="prod_trans_picking_exception_picking" model="workflow.transition">
             <field name="act_from" ref="prod_act_picking_exception"/>
             <field name="act_to" ref="prod_act_picking"/>
             <field name="signal">button_recreate</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_ready_cancel">
+        <record id="prod_trans_ready_cancel" model="workflow.transition">
             <field name="act_from" ref="prod_act_ready"/>
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_in_production_cancel">
+        <record id="prod_trans_in_production_cancel" model="workflow.transition">
             <field name="act_from" ref="prod_act_in_production"/>
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="prod_trans_draft_cancel">
+        <record id="prod_trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="prod_act_draft"/>
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
@@ -114,86 +114,86 @@
         
         <!-- Procurement -->
         
-        <record model="workflow" id="wkf">
+        <record id="wkf" model="workflow">
             <field name="name">mrp.procurement.basic</field>
             <field name="osv">mrp.procurement</field>
             <field name="on_create">True</field>
         </record>
         
-        <record model="workflow.activity" id="act_draft">
+        <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
-        <record model="workflow.activity" id="act_cancel">
+        <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">cancel</field>
             <field name="kind">function</field>
             <field name="action">action_cancel()</field>
             <field name="flow_stop">True</field>
         </record>
-        <record model="workflow.activity" id="act_confirm">
+        <record id="act_confirm" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">confirm</field>
             <field name="kind">function</field>
             <field name="action">action_confirm()</field>
         </record>
-        <record model="workflow.activity" id="act_confirm_wait">
+        <record id="act_confirm_wait" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">confirm_wait</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'exception'})</field>
         </record>
-        <record model="workflow.activity" id="act_confirm_mts">
+        <record id="act_confirm_mts" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">confirm_mts</field>
         </record>
-        <record model="workflow.activity" id="act_confirm_mto">
+        <record id="act_confirm_mto" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">confirm_mto</field>
         </record>
-        <record model="workflow.activity" id="act_make_to_stock">
+        <record id="act_make_to_stock" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">make_to_stock</field>
             <field name="kind">function</field>
             <field name="action">action_move_assigned()</field>
         </record>
-        <record model="workflow.activity" id="act_produce">
+        <record id="act_produce" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">produce</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
             <field name="action">action_produce_assign_product()</field>
         </record>
-        <record model="workflow.activity" id="act_produce_check">
+        <record id="act_produce_check" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">produce_check</field>
         </record>
-        <record model="workflow.activity" id="act_produce_service">
+        <record id="act_produce_service" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">produce_service</field>
             <field name="kind">function</field>
             <field name="action">action_produce_assign_service()</field>
         </record>
-        <record model="workflow.activity" id="act_buy">
+        <record id="act_buy" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">buy</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','purchase.order')]"/>
             <field name="action">action_po_assign()</field>
         </record>
-        <record model="workflow.activity" id="act_make_done">
+        <record id="act_make_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">done</field>
         </record>
-        <record model="workflow.activity" id="act_wait_done">
+        <record id="act_wait_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">wait_done</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'waiting'})</field>
         </record>
 
-        <record model="workflow.activity" id="act_done">
+        <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="flow_stop">True</field>
             <field name="name">done</field>
@@ -201,18 +201,18 @@
             <field name="action">action_done()</field>
         </record>
         
-        <record model="workflow.transition" id="trans_draft_confirm">
+        <record id="trans_draft_confirm" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirm"/>
             <field name="signal">button_confirm</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_cancel2">
+        <record id="trans_confirm_cancel2" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_wait_done"/>
             <field name="signal">button_wait_done</field>
             <field name="condition">True</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_wait_done">
+        <record id="trans_confirm_wait_done" model="workflow.transition">
             <field name="act_from" ref="act_wait_done"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">check_move_done()</field>
@@ -220,135 +220,135 @@
             <field name="trigger_expr_id">[move_id.id]</field>
         </record>
 
-        <record model="workflow.transition" id="trans_confirm_cancel">
+        <record id="trans_confirm_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_check</field>
             <field name="condition">test_cancel()</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_confirm_wait">
+        <record id="trans_confirm_confirm_wait" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_confirm_wait"/>
             <field name="signal">button_check</field>
             <field name="condition">not test_cancel()</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_wait_confirm_mto">
+        <record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
             <field name="act_from" ref="act_confirm_wait"/>
             <field name="act_to" ref="act_confirm_mto"/>
             <field name="condition">procure_method=='make_to_order'</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_wait_confirm_mts">
+        <record id="trans_confirm_wait_confirm_mts" model="workflow.transition">
             <field name="act_from" ref="act_confirm_wait"/>
             <field name="act_to" ref="act_confirm_mts"/>
             <field name="condition">procure_method=='make_to_stock'</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_mts_cancel">
+        <record id="trans_confirm_mts_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mts"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_waiting_cancel">
+        <record id="trans_confirm_waiting_cancel" model="workflow.transition">
             <field name="act_from" ref="act_wait_done"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_mts_confirm">
+        <record id="trans_confirm_mts_confirm" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mts"/>
             <field name="act_to" ref="act_confirm"/>
             <field name="signal">button_restart</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_mto_cancel">
+        <record id="trans_confirm_mto_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mto"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_mto_confirm">
+        <record id="trans_confirm_mto_confirm" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mto"/>
             <field name="act_to" ref="act_confirm"/>
             <field name="signal">button_restart</field>
         </record>
-        <record model="workflow.transition" id="trans_draft_cancel">
+        <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_mts_make_to_stock">
+        <record id="trans_confirm_mts_make_to_stock" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mts"/>
             <field name="act_to" ref="act_make_to_stock"/>
             <field name="condition">check_make_to_stock()</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_mto_produce_check">
+        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mto"/>
             <field name="act_to" ref="act_produce_check"/>
             <field name="condition">check_produce()</field>
         </record>
-        <record model="workflow.transition" id="trans_product_check_produce">
+        <record id="trans_product_check_produce" model="workflow.transition">
             <field name="act_from" ref="act_produce_check"/>
             <field name="act_to" ref="act_produce"/>
             <field name="condition">check_product()</field>
         </record>
-        <record model="workflow.transition" id="trans_product_check_produce_service">
+        <record id="trans_product_check_produce_service" model="workflow.transition">
             <field name="act_from" ref="act_produce_check"/>
             <field name="act_to" ref="act_produce_service"/>
             <field name="condition">not check_product()</field>
         </record>
-        <record model="workflow.transition" id="trans_confirm_mto_buy">
+        <record id="trans_confirm_mto_buy" model="workflow.transition">
             <field name="act_from" ref="act_confirm_mto"/>
             <field name="act_to" ref="act_buy"/>
             <field name="condition">check_buy()</field>
         </record>
-        <record model="workflow.transition" id="trans_make_to_stock_make_done">
+        <record id="trans_make_to_stock_make_done" model="workflow.transition">
             <field name="act_from" ref="act_make_to_stock"/>
             <field name="act_to" ref="act_make_done"/>
             <field name="condition">check_move_done()</field>
             <field name="trigger_model">stock.move</field>
             <field name="trigger_expr_id">[move_id.id]</field>
         </record>
-        <record model="workflow.transition" id="trans_make_to_stock_cancel">
+        <record id="trans_make_to_stock_cancel" model="workflow.transition">
             <field name="act_from" ref="act_make_to_stock"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="condition">check_move_cancel()</field>
         </record>
-        <record model="workflow.transition" id="trans_produce_cancel">
+        <record id="trans_produce_cancel" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_produce_service_cancel">
+        <record id="trans_produce_service_cancel" model="workflow.transition">
             <field name="act_from" ref="act_produce_service"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_buy_cancel">
+        <record id="trans_buy_cancel" model="workflow.transition">
             <field name="act_from" ref="act_buy"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
         
-        <record model="workflow.transition" id="trans_produce_make_done">
+        <record id="trans_produce_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
             <field name="act_to" ref="act_make_done"/>
             <field name="signal">subflow.done</field>
         </record>
         
-        <record model="workflow.transition" id="trans_produce_service_make_done">
+        <record id="trans_produce_service_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce_service"/>
             <field name="act_to" ref="act_make_done"/>
         </record>
-        <record model="workflow.transition" id="trans_buy_make_done">
+        <record id="trans_buy_make_done" model="workflow.transition">
             <field name="act_from" ref="act_buy"/>
             <field name="act_to" ref="act_make_done"/>
             <field name="signal">subflow.delivery_done</field>
         </record>
-        <record model="workflow.transition" id="trans_make_done_done">
+        <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">action_check_finnished()</field>
         </record>
-        <record model="workflow.transition" id="trans_make_done_confirm">
+        <record id="trans_make_done_confirm" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_confirm"/>
             <field name="condition">not action_check_finnished()</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index cd4150ac468..f6d64d14f8a 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="res.partner" id="second_partner">
+        <record id="second_partner" model="res.partner">
             <field name="name">Tiny Editor</field>
         </record>
         
-        <record model="res.company" id="second_company">
+        <record id="second_company" model="res.company">
             <field name="name">Tiny Editor</field>
             <field name="partner_id" ref="base.main_partner"/>
             <field name="parent_id" ref="base.main_company"/>
@@ -15,11 +15,11 @@
             <field name="currency_id" ref="base.EUR"/>
         </record>
         
-        <record model="res.partner" id="ter_partner">
+        <record id="ter_partner" model="res.partner">
             <field name="name">Tiny Integrator</field>
         </record>
         
-        <record model="res.company" id="ter_company">
+        <record id="ter_company" model="res.company">
             <field name="name">Tiny Integrator</field>
             <field name="partner_id" ref="base.main_partner"/>
             <field name="parent_id" ref="base.main_company"/>
@@ -31,4 +31,4 @@
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/multi_company_account/multi_company_account_data.xml b/addons/multi_company_account/multi_company_account_data.xml
index f86d9dedf38..64b4ebe8f8e 100644
--- a/addons/multi_company_account/multi_company_account_data.xml
+++ b/addons/multi_company_account/multi_company_account_data.xml
@@ -1,137 +1,137 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="account.journal" id="account.sales_journal">
+        <record id="account.sales_journal" model="account.journal">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.journal" id="account.expenses_journal">
+        <record id="account.expenses_journal" model="account.journal">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.journal" id="account.bank_journal">
+        <record id="account.bank_journal" model="account.journal">
             <field name="company_id" ref="base.main_company"/>
         </record>
         
-        <record model="ir.rule.group" id="journal_comp_rule_group">
+        <record id="journal_comp_rule_group" model="ir.rule.group">
             <field name="name">Journal multi-company</field>
-            <field name="model_id" search="[('model','=','account.journal')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.journal')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="journal_comp_rule">
-            <field name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="journal_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="journal_comp_rule_group"/>
         </record>
         
-        <record model="ir.rule.group" id="analytic_journal_comp_rule_group">
+        <record id="analytic_journal_comp_rule_group" model="ir.rule.group">
             <field name="name">Analytic journal multi-company</field>
-            <field name="model_id" search="[('model','=','account.analytic.journal')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="analytic_journal_comp_rule">
-            <field name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="analytic_journal_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="analytic_journal_comp_rule_group"/>
         </record>
-        <record model="ir.rule" id="analytic_journal_comp_rule_false">
-            <field name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="analytic_journal_comp_rule_false" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
             <field name="operator">=</field>
             <field name="operand">False</field>
             <field name="rule_group" ref="analytic_journal_comp_rule_group"/>
         </record>
         
-        <record model="ir.rule.group" id="budget_post_comp_rule_group">
+        <record id="budget_post_comp_rule_group" model="ir.rule.group">
             <field name="name">Budget post multi-company</field>
-            <field name="model_id" search="[('model','=','account.budget.post')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.budget.post')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="budget_post_comp_rule">
-            <field name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="budget_post_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="budget_post_comp_rule_group"/>
         </record>
-        <record model="ir.rule" id="budget_post_comp_rule_false">
-            <field name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="budget_post_comp_rule_false" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
             <field name="operator">=</field>
             <field name="operand">False</field>
             <field name="rule_group" ref="budget_post_comp_rule_group"/>
         </record>
         
-        <record model="ir.rule.group" id="period_comp_rule_group">
+        <record id="period_comp_rule_group" model="ir.rule.group">
             <field name="name">Period multi-company</field>
-            <field name="model_id" search="[('model','=','account.period')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.period')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="period_comp_rule">
-            <field name="field_id" search="[('model','=','account.period'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="period_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.period'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="period_comp_rule_group"/>
         </record>
         
         
-        <record model="ir.rule.group" id="fiscal_year_comp_rule_group">
+        <record id="fiscal_year_comp_rule_group" model="ir.rule.group">
             <field name="name">Fiscal year multi-company</field>
-            <field name="model_id" search="[('model','=','account.fiscalyear')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.fiscalyear')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="fiscal_year_comp_rule">
-            <field name="field_id" search="[('model','=','account.fiscalyear'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="fiscal_year_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.fiscalyear'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="fiscal_year_comp_rule_group"/>
         </record>
         
-        <record model="ir.rule.group" id="account_comp_rule_group">
+        <record id="account_comp_rule_group" model="ir.rule.group">
             <field name="name">Account multi-company</field>
-            <field name="model_id" search="[('model','=','account.account')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.account')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="account_comp_rule">
-            <field name="field_id" search="[('model','=','account.account'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="account_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.account'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="account_comp_rule_group"/>
         </record>
         
-        <record model="ir.rule.group" id="tax_comp_rule_group">
+        <record id="tax_comp_rule_group" model="ir.rule.group">
             <field name="name">Tax multi-company</field>
-            <field name="model_id" search="[('model','=','account.tax')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.tax')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="tax_comp_rule">
-            <field name="field_id" search="[('model','=','account.tax'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="tax_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.tax'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="tax_comp_rule_group"/>
         </record>
         
-        <record model="ir.rule.group" id="tax_code_comp_rule_group">
+        <record id="tax_code_comp_rule_group" model="ir.rule.group">
             <field name="name">Tax code multi-company</field>
-            <field name="model_id" search="[('model','=','account.tax.code')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.tax.code')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="tax_code_comp_rule">
-            <field name="field_id" search="[('model','=','account.tax.code'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="tax_code_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.tax.code'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="tax_code_comp_rule_group"/>
         </record>
         
-        <record model="ir.rule.group" id="invoice_comp_rule_group">
+        <record id="invoice_comp_rule_group" model="ir.rule.group">
             <field name="name">Invoice multi-company</field>
-            <field name="model_id" search="[('model','=','account.invoice')]" model="ir.model"/>
-            <field name="global" eval="True"/>
+            <field model="ir.model" name="model_id" search="[('model','=','account.invoice')]"/>
+            <field eval="True" name="global"/>
         </record>
-        <record model="ir.rule" id="invoice_comp_rule">
-            <field name="field_id" search="[('model','=','account.invoice'),('name','=','company_id')]" model="ir.model.fields"/>
+        <record id="invoice_comp_rule" model="ir.rule">
+            <field model="ir.model.fields" name="field_id" search="[('model','=','account.invoice'),('name','=','company_id')]"/>
             <field name="operator">child_of</field>
             <field name="operand">user.company_id.id</field>
             <field name="rule_group" ref="invoice_comp_rule_group"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/multi_company_account/multi_company_account_demo.xml b/addons/multi_company_account/multi_company_account_demo.xml
index aa0cc854a6d..ffd302f42b3 100644
--- a/addons/multi_company_account/multi_company_account_demo.xml
+++ b/addons/multi_company_account/multi_company_account_demo.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="account.fiscalyear" id="account.data_fiscalyear">
+        <record id="account.data_fiscalyear" model="account.fiscalyear">
             <field name="company_id" ref="base.main_company"/>
         </record>
         
-        <record model="account.period" id="account.period_1">
+        <record id="account.period_1" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_2">
+        <record id="account.period_2" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_3">
+        <record id="account.period_3" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_4">
+        <record id="account.period_4" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_5">
+        <record id="account.period_5" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_6">
+        <record id="account.period_6" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_7">
+        <record id="account.period_7" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_8">
+        <record id="account.period_8" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_9">
+        <record id="account.period_9" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_10">
+        <record id="account.period_10" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_11">
+        <record id="account.period_11" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="account.period" id="account.period_12">
+        <record id="account.period_12" model="account.period">
             <field name="company_id" ref="base.main_company"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/multi_company_account/multi_company_account_view.xml b/addons/multi_company_account/multi_company_account_view.xml
index 471be85d3c8..6c974b7c8e9 100644
--- a/addons/multi_company_account/multi_company_account_view.xml
+++ b/addons/multi_company_account/multi_company_account_view.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="ir.ui.view" id="view_account_journal_form_multi_company">
+        <record id="view_account_journal_form_multi_company" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
             <field name="type">form</field>
@@ -13,7 +14,7 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="view_account_analytic_journal_form_multi_company">
+        <record id="view_account_analytic_journal_form_multi_company" model="ir.ui.view">
             <field name="name">account.analytic.journal.form</field>
             <field name="model">account.analytic.journal</field>
             <field name="type">form</field>
@@ -25,7 +26,7 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="view_budget_post_form_multi_company">
+        <record id="view_budget_post_form_multi_company" model="ir.ui.view">
             <field name="name">account.budget.post.form</field>
             <field name="model">account.budget.post</field>
             <field name="type">form</field>
@@ -37,7 +38,7 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="view_account_fiscalyear_form_multi_company">
+        <record id="view_account_fiscalyear_form_multi_company" model="ir.ui.view">
             <field name="name">account.fiscalyear.form</field>
             <field name="model">account.fiscalyear</field>
             <field name="type">form</field>
@@ -49,7 +50,7 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="view_account_period_form_multi_company">
+        <record id="view_account_period_form_multi_company" model="ir.ui.view">
             <field name="name">account.period.form</field>
             <field name="model">account.period</field>
             <field name="type">form</field>
@@ -62,4 +63,4 @@
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 3affe012c66..3000886397b 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -1,188 +1,188 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <menuitem name='Products/Pricelists' sequence='2' groups='base.group_extended' id='menu_product_pricelist_main'/>
+        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_main_product" sequence="2"/>
         
-        <record id='product_pricelist_version_form_view' model='ir.ui.view'>
-            <field name='name'>product.pricelist.version.form</field>
-            <field name='model'>product.pricelist.version</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Pricelist Version'>
-                    <field name='name' select='1'/>
-                    <field name='active' select='2'/>
-                    <field name='pricelist_id' colspan='4' select='1'/>
-                    <field name='date_start' select='1'/>
-                    <field name='date_end' select='1'/>
-                    <field name='items_id' nolabel='1' widget='one2many_list' colspan='4'/>
+        <record id="product_pricelist_version_form_view" model="ir.ui.view">
+            <field name="name">product.pricelist.version.form</field>
+            <field name="model">product.pricelist.version</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pricelist Version">
+                    <field name="name" select="1"/>
+                    <field name="active" select="2"/>
+                    <field colspan="4" name="pricelist_id" select="1"/>
+                    <field name="date_start" select="1"/>
+                    <field name="date_end" select="1"/>
+                    <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
-        <record id='product_pricelist_version_tree_view' model='ir.ui.view'>
-            <field name='name'>product.pricelist.version.tree</field>
-            <field name='model'>product.pricelist.version</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Pricelist Version'>
-                    <field name='name'/>
-                    <field name='pricelist_id'/>
-                    <field name='date_start'/>
-                    <field name='date_end'/>
+        <record id="product_pricelist_version_tree_view" model="ir.ui.view">
+            <field name="name">product.pricelist.version.tree</field>
+            <field name="model">product.pricelist.version</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Pricelist Version">
+                    <field name="name"/>
+                    <field name="pricelist_id"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
                 </tree>
             </field>
         </record>
         
-        <record id='product_pricelist_action' model='ir.actions.act_window'>
-            <field name='name'>Pricelist Versions</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.pricelist.version</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='product_pricelist_version_tree_view'/>
+        <record id="product_pricelist_action" model="ir.actions.act_window">
+            <field name="name">Pricelist Versions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.pricelist.version</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="product_pricelist_version_tree_view"/>
         </record>
-        <menuitem name='Products/Pricelists/Pricelist Versions' sequence='2' action='product_pricelist_action' id='menu_product_pricelist_action'/>
+        <menuitem action="product_pricelist_action" id="menu_product_pricelist_action" parent="product.menu_product_pricelist_main" sequence="2"/>
         
-        <record id='product_pricelist_item_tree_view' model='ir.ui.view'>
-            <field name='name'>product.pricelist.item.tree</field>
-            <field name='model'>product.pricelist.item</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Products Listprices Items'>
-                    <field name='sequence'/>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='product_tmpl_id' select='1'/>
-                    <field name='categ_id' select='1'/>
-                    <field name='min_quantity'/>
-                    <field name='base'/>
+        <record id="product_pricelist_item_tree_view" model="ir.ui.view">
+            <field name="name">product.pricelist.item.tree</field>
+            <field name="model">product.pricelist.item</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products Listprices Items">
+                    <field name="sequence"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="product_tmpl_id" select="1"/>
+                    <field name="categ_id" select="1"/>
+                    <field name="min_quantity"/>
+                    <field name="base"/>
                 </tree>
             </field>
         </record>
         
-        <record id='product_pricelist_item_form_view' model='ir.ui.view'>
-            <field name='name'>product.pricelist.item.form</field>
-            <field name='model'>product.pricelist.item</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Products Listprices Items'>
-                    <separator string='Rules Test Match' colspan='4'/>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='product_id' on_change='product_id_change(product_tmpl_id)' select='1'/>
-                    <field name='product_tmpl_id' select='1'/>
-                    <field name='categ_id' select='1'/>
+        <record id="product_pricelist_item_form_view" model="ir.ui.view">
+            <field name="name">product.pricelist.item.form</field>
+            <field name="model">product.pricelist.item</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Products Listprices Items">
+                    <separator colspan="4" string="Rules Test Match"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="product_id" on_change="product_id_change(product_tmpl_id)" select="1"/>
+                    <field name="product_tmpl_id" select="1"/>
+                    <field name="categ_id" select="1"/>
                     <newline/>
-                    <field name='min_quantity'/>
-                    <field name='sequence'/>
-                    <separator string='Price Computation' colspan='4'/>
+                    <field name="min_quantity"/>
+                    <field name="sequence"/>
+                    <separator colspan="4" string="Price Computation"/>
                     
-                    <field name='base'/>
-                    <field name='base_pricelist_id'/>
-                    <group col='6' colspan='5'>
-                        <label string='New Price ='/>
-                        <label string='Base Price'/>
-                        <label string='* ( 1 - '/>
-                        <field name='price_discount' nolabel='1'/>
-                        <label string=' ) + '/>
-                        <field name='price_surcharge' nolabel='1'/>
+                    <field name="base"/>
+                    <field name="base_pricelist_id"/>
+                    <group col="6" colspan="5">
+                        <label string="New Price ="/>
+                        <label string="Base Price"/>
+                        <label string="* ( 1 - "/>
+                        <field name="price_discount" nolabel="1"/>
+                        <label string=" ) + "/>
+                        <field name="price_surcharge" nolabel="1"/>
                         <newline/>
-                        <field name='price_round' string='Rounding Method'/>
-                        <field name='price_min_margin' string='Min. Margin'/>
-                        <field name='price_max_margin' string='Max. Margin'/>
+                        <field name="price_round" string="Rounding Method"/>
+                        <field name="price_min_margin" string="Min. Margin"/>
+                        <field name="price_max_margin" string="Max. Margin"/>
                     </group>
                     
                 </form>
             </field>
         </record>
         
-        <record id='product_pricelist_view_tree' model='ir.ui.view'>
-            <field name='name'>product.pricelist.tree</field>
-            <field name='model'>product.pricelist</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Products Price List'>
-                    <field name='name'/>
-                    <field name='type'/>
-                    <field name='currency_id'/>
+        <record id="product_pricelist_view_tree" model="ir.ui.view">
+            <field name="name">product.pricelist.tree</field>
+            <field name="model">product.pricelist</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products Price List">
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="currency_id"/>
                 </tree>
             </field>
         </record>
-        <record id='product_pricelist_view' model='ir.ui.view'>
-            <field name='name'>product.pricelist.form</field>
-            <field name='model'>product.pricelist</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Products Price List'>
-                    <field name='name' select='1'/>
-                    <field name='active' select='1'/>
-                    <field name='type' select='1'/>
-                    <field name='currency_id' select='1'/>
-                    <field name='version_id' nolabel='1' colspan='4'>
-                        <form string='Pricelist Version'>
-                            <field name='name' select='1'/>
-                            <field name='active' select='2'/>
-                            <field name='date_start' select='1'/>
-                            <field name='date_end' select='1'/>
-                            <field name='items_id' nolabel='1' widget='one2many_list' colspan='4'/>
+        <record id="product_pricelist_view" model="ir.ui.view">
+            <field name="name">product.pricelist.form</field>
+            <field name="model">product.pricelist</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Products Price List">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="type" select="1"/>
+                    <field name="currency_id" select="1"/>
+                    <field colspan="4" name="version_id" nolabel="1">
+                        <form string="Pricelist Version">
+                            <field name="name" select="1"/>
+                            <field name="active" select="2"/>
+                            <field name="date_start" select="1"/>
+                            <field name="date_end" select="1"/>
+                            <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
                         </form>
-                        <tree string='Pricelist Version'>
-                            <field name='name'/>
-                            <field name='active'/>
-                            <field name='date_start'/>
-                            <field name='date_end'/>
+                        <tree string="Pricelist Version">
+                            <field name="name"/>
+                            <field name="active"/>
+                            <field name="date_start"/>
+                            <field name="date_end"/>
                         </tree>
                     </field>
                 </form>
             </field>
         </record>
-        <record id='product_pricelist_action2' model='ir.actions.act_window'>
-            <field name='name'>Pricelists</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.pricelist</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="product_pricelist_action2" model="ir.actions.act_window">
+            <field name="name">Pricelists</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.pricelist</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Products/Pricelists/Pricelists' sequence='1' action='product_pricelist_action2' id='menu_product_pricelist_action2'/>
+        <menuitem action="product_pricelist_action2" id="menu_product_pricelist_action2" parent="product.menu_product_pricelist_main" sequence="1"/>
         
-        <record id='product_price_type_view' model='ir.ui.view'>
-            <field name='name'>product.price.type.form</field>
-            <field name='model'>product.price.type</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Products Price Type'>
-                    <field name='name' select='1'/>
-                    <field name='active' select='1'/>
-                    <field name='field'/>
-                    <field name='currency_id' select='1'/>
+        <record id="product_price_type_view" model="ir.ui.view">
+            <field name="name">product.price.type.form</field>
+            <field name="model">product.price.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Products Price Type">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="field"/>
+                    <field name="currency_id" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='product_price_type_action' model='ir.actions.act_window'>
-            <field name='name'>Prices Types</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.price.type</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="product_price_type_action" model="ir.actions.act_window">
+            <field name="name">Prices Types</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.price.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Products/Configuration/Prices Types' groups='base.group_extended' action='product_price_type_action' id='menu_product_price_type_action'/>
+        <menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="product.menu_config_product"/>
         
-        <record id='product_pricelist_type_view' model='ir.ui.view'>
-            <field name='name'>product.pricelist.type.form</field>
-            <field name='model'>product.pricelist.type</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Pricelist Type'>
-                    <field name='name' select='1'/>
-                    <field name='key'/>
+        <record id="product_pricelist_type_view" model="ir.ui.view">
+            <field name="name">product.pricelist.type.form</field>
+            <field name="model">product.pricelist.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pricelist Type">
+                    <field name="name" select="1"/>
+                    <field name="key"/>
                 </form>
             </field>
         </record>
-        <record id='product_pricelist_type_action' model='ir.actions.act_window'>
-            <field name='name'>Pricelists Types</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.pricelist.type</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="product_pricelist_type_action" model="ir.actions.act_window">
+            <field name="name">Pricelists Types</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.pricelist.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Products/Configuration/Pricelists Types' groups='base.group_extended' action='product_pricelist_type_action' id='menu_product_pricelist_type_action'/>
+        <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="product.menu_config_product"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 62d519b71bd..b5b8eadb6b1 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="res.groups" id="group_uos">
+        <record id="group_uos" model="res.groups">
             <field name="name">Product UOS View</field>
         </record>
         
@@ -37,7 +37,7 @@ parameter) will see those record just disappear.
         <!--
 	Request link
 	-->
-        <record model="res.request.link" id="req_link_product">
+        <record id="req_link_product" model="res.request.link">
             <field name="name">Product</field>
             <field name="object">product.product</field>
         </record>
@@ -45,11 +45,11 @@ parameter) will see those record just disappear.
         <!--
 	Resource: product.price.type
 	-->
-        <record model="product.price.type" id="list_price">
+        <record id="list_price" model="product.price.type">
             <field name="name">Public Price</field>
             <field name="field">list_price</field>
         </record>
-        <record model="product.price.type" id="standard_price">
+        <record id="standard_price" model="product.price.type">
             <field name="name">Cost Price</field>
             <field name="field">standard_price</field>
         </record>
@@ -61,7 +61,7 @@ parameter) will see those record just disappear.
         <!--
 	Price list type
 	-->
-        <record model="product.pricelist.type" id="pricelist_type_sale">
+        <record id="pricelist_type_sale" model="product.pricelist.type">
             <field name="name">Sale Pricelist</field>
             <field name="key">sale</field>
         </record>
@@ -69,29 +69,29 @@ parameter) will see those record just disappear.
         <!--
 	Price list
 	-->
-        <record model="product.pricelist" id="list0">
+        <record id="list0" model="product.pricelist">
             <field name="name">Public Pricelist</field>
             <field name="type">sale</field>
         </record>
-        <record model="product.pricelist.version" id="ver0">
+        <record id="ver0" model="product.pricelist.version">
             <field name="pricelist_id" ref="list0"/>
             <field name="name">Default Public Pricelist Version</field>
         </record>
-        <record model="product.pricelist.item" id="item0">
+        <record id="item0" model="product.pricelist.item">
             <field name="price_version_id" ref="ver0"/>
-            <field name="base" ref="list_price" />
+            <field name="base" ref="list_price"/>
             <field name="name">Default Public Pricelist Line</field>
         </record>
         
         <!--
 	Property
 	-->
-        <record model="ir.property" id="property_product_pricelist" forcecreate="True">
+        <record forcecreate="True" id="property_product_pricelist" model="ir.property">
             <field name="name">property_product_pricelist</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist')]"/>
-            <field name="value" eval="'product.pricelist,'+str(list0)"/>
+            <field eval="'product.pricelist,'+str(list0)" name="value"/>
         </record>
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 43103b48b95..6d43c3fe419 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!-- 
 	Resource: product.category 
 	-->
         
-        <record model="product.category" id="cat0">
+        <record id="cat0" model="product.category">
             <field name="parent_id" ref="null"/>
             <field name="name">All products</field>
         </record>
-        <record model="product.category" id="cat1">
+        <record id="cat1" model="product.category">
             <field name="parent_id" ref="cat0"/>
             <field name="name">Sellable</field>
         </record>
-        <record model="product.category" id="cat2">
+        <record id="cat2" model="product.category">
             <field name="parent_id" ref="cat0"/>
             <field name="name">Private</field>
         </record>
@@ -54,11 +54,11 @@
             <field name="name">IT components kits</field>
         </record>
         
-        <record id="product_ul_box" model="product.ul" >
+        <record id="product_ul_box" model="product.ul">
             <field name="name">Box 20x20x40</field>
             <field name="type">box</field>
         </record>
-        <record id="product_ul_big_box" model="product.ul" >
+        <record id="product_ul_big_box" model="product.ul">
             <field name="name">Box 30x40x60</field>
             <field name="type">box</field>
         </record>
@@ -287,7 +287,7 @@
             <field name="procure_method">make_to_order</field>
             <field name="sale_delay">1.0</field>
             <field name="name">HDD on demand</field>
-            <field name="sale_ok" eval="False"/>
+            <field eval="False" name="sale_ok"/>
             <field name="categ_id" ref="product_category_10"/>
         </record>
         <record id="product_product_21" model="product.product">
@@ -298,7 +298,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">RAM on demand</field>
-            <field name="sale_ok" eval="False"/>
+            <field eval="False" name="sale_ok"/>
             <field name="categ_id" ref="product_category_10"/>
         </record>
         <record id="product_product_22" model="product.product">
@@ -309,7 +309,7 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="name">Processor on demand</field>
-            <field name="sale_ok" eval="False"/>
+            <field eval="False" name="sale_ok"/>
             <field name="categ_id" ref="product_category_10"/>
         </record>
         <record id="product_product_23" model="product.product">
@@ -352,115 +352,115 @@
             <field name="categ_id" ref="product_category_11"/>
         </record>
         
-        <record model="product.supplierinfo" id="supplierinfo1">
+        <record id="supplierinfo1" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_asus"/>
             <field name="qty">10</field>
             <field name="product_id" ref="product_product_mb1"/>
             <field name="delay">5</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo2">
+        <record id="supplierinfo2" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_asus"/>
             <field name="qty">10</field>
             <field name="product_id" ref="product_product_mb2"/>
             <field name="delay">5</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo3">
+        <record id="supplierinfo3" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_mb1"/>
             <field name="delay">1</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo4">
+        <record id="supplierinfo4" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_mb2"/>
             <field name="delay">1</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo5">
+        <record id="supplierinfo5" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_pc1"/>
             <field name="delay">2</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo6">
+        <record id="supplierinfo6" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_pc2"/>
             <field name="delay">2</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo7">
+        <record id="supplierinfo7" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_pc3"/>
             <field name="delay">2</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo8">
+        <record id="supplierinfo8" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_pc4"/>
             <field name="delay">1</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo9">
+        <record id="supplierinfo9" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_cpu1"/>
             <field name="delay">1</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo10">
+        <record id="supplierinfo10" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_cpu3"/>
             <field name="delay">1</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo11">
+        <record id="supplierinfo11" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_hdd1"/>
             <field name="delay">1</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo12">
+        <record id="supplierinfo12" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_hdd2"/>
             <field name="delay">1</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo13">
+        <record id="supplierinfo13" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_hdd3"/>
             <field name="delay">1</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo14">
+        <record id="supplierinfo14" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_20"/>
             <field name="delay">10</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo15">
+        <record id="supplierinfo15" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_21"/>
             <field name="delay">10</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo16">
+        <record id="supplierinfo16" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="product_id" ref="product_product_22"/>
             <field name="delay">10</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo17">
+        <record id="supplierinfo17" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_seagate"/>
             <field name="qty">10</field>
             <field name="product_id" ref="product_product_hdd1"/>
             <field name="delay">10</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo18">
+        <record id="supplierinfo18" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_seagate"/>
             <field name="qty">10</field>
             <field name="product_id" ref="product_product_hdd2"/>
             <field name="delay">10</field>
         </record>
-        <record model="product.supplierinfo" id="supplierinfo19">
+        <record id="supplierinfo19" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">10</field>
             <field name="product_id" ref="product_product_hdd3"/>
@@ -468,4 +468,4 @@
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/product/product_report.xml b/addons/product/product_report.xml
index b9004bf8103..62b872f8166 100644
--- a/addons/product/product_report.xml
+++ b/addons/product/product_report.xml
@@ -1,12 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report
-			id="report_product_label"
-			string="Products Labels"
-			model="product.product"
-			name="product.product.label"
-			xml="product/report/product_label.xml"
-			xsl="product/report/product_label.xsl"/>
+        <report id="report_product_label" model="product.product" name="product.product.label" string="Products Labels" xml="product/report/product_label.xml" xsl="product/report/product_label.xsl"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/product/product_security.xml b/addons/product/product_security.xml
index c7ef2634230..9bc6724dd14 100644
--- a/addons/product/product_security.xml
+++ b/addons/product/product_security.xml
@@ -1,115 +1,114 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="res.groups" id="group_product_manager">
+        <record id="group_product_manager" model="res.groups">
             <field name="name">Product Manager</field>
         </record>
         
-        <record model="res.users" id="base.user_admin">
-            <field name="groups_id" eval="[ (4, ref('group_product_manager'))]"/>
+        <record id="base.user_admin" model="res.users">
+            <field eval="[ (4, ref('group_product_manager'))]" name="groups_id"/>
         </record>
         
         <!-- Product security -->
-        <record model="ir.model.access" id="access_product">
+        <record id="access_product" model="ir.model.access">
             <field name="name">Product</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.product')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.product')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_product_manager">
+        <record id="access_product_manager" model="ir.model.access">
             <field name="name">Product</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.product')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.product')]"/>
             <field name="group_id" ref="group_product_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Product Template security -->
-        <record model="ir.model.access" id="access_product_template">
+        <record id="access_product_template" model="ir.model.access">
             <field name="name">Product Template</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.template')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.template')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_product_template_manager">
+        <record id="access_product_template_manager" model="ir.model.access">
             <field name="name">Product Template</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.template')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.template')]"/>
             <field name="group_id" ref="group_product_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Pricelist security -->
-        <record model="ir.model.access" id="access_product_pricelist">
+        <record id="access_product_pricelist" model="ir.model.access">
             <field name="name">Product Pricelist</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.pricelist')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_product_pricelist_manager">
+        <record id="access_product_pricelist_manager" model="ir.model.access">
             <field name="name">Product Pricelist</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.pricelist')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist')]"/>
             <field name="group_id" ref="group_product_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Pricelist Version security -->
-        <record model="ir.model.access" id="access_product_pricelist_version">
+        <record id="access_product_pricelist_version" model="ir.model.access">
             <field name="name">Product Pricelist Version</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.pricelist.version')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist.version')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_product_pricelist_version_manager">
+        <record id="access_product_pricelist_version_manager" model="ir.model.access">
             <field name="name">Product Pricelist Version</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.pricelist.version')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist.version')]"/>
             <field name="group_id" ref="group_product_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Pricelist Item security -->
-        <record model="ir.model.access" id="access_product_pricelist_item_version">
+        <record id="access_product_pricelist_item_version" model="ir.model.access">
             <field name="name">Product Pricelist Item</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.pricelist.item')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist.item')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_product_pricelist_item_manager">
+        <record id="access_product_pricelist_item_manager" model="ir.model.access">
             <field name="name">Product Pricelist Item</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'product.pricelist.item')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist.item')]"/>
             <field name="group_id" ref="group_product_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 4ea27673c5e..e90e658f6e8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,446 +1,446 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <menuitem name='Products' icon='terp-product' id='menu_main_product'/>
-        <menuitem name='Products/Configuration' sequence='1' groups='base.group_admin' id='menu_config_product'/>
+        <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
+        <menuitem groups="base.group_admin" id="menu_config_product" name="Configuration" parent="product.menu_main_product" sequence="1"/>
         
-        <record id='product_product_tree_view' model='ir.ui.view'>
-            <field name='name'>product.product.tree</field>
-            <field name='model'>product.product</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='7'/>
-            <field name='arch' type='xml'>
-                <tree colors='red:virtual_available&lt;0;blue:state in [&apos;draft&apos;, &apos;end&apos;, &apos;obsolete&apos;]' string='Products'>
-                    <field name='default_code'/>
-                    <field name='name'/>
-                    <field name='variants'/>
-                    <field name='qty_available'/>
-                    <field name='virtual_available'/>
-                    <field name='price' invisible='&apos;partner_id&apos; not in context'/>
-                    <field name='lst_price'/>
-                    <field name='standard_price'/>
-                    <field name='state'/>
+        <record id="product_product_tree_view" model="ir.ui.view">
+            <field name="name">product.product.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field eval="7" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:virtual_available&lt;0;blue:state in ['draft', 'end', 'obsolete']" string="Products">
+                    <field name="default_code"/>
+                    <field name="name"/>
+                    <field name="variants"/>
+                    <field name="qty_available"/>
+                    <field name="virtual_available"/>
+                    <field invisible="'partner_id' not in context" name="price"/>
+                    <field name="lst_price"/>
+                    <field name="standard_price"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='product_normal_form_view' model='ir.ui.view'>
-            <field name='name'>product.normal.form</field>
-            <field name='model'>product.product</field>
-            <field name='type'>form</field>
-            <field name='priority' eval='7'/>
-            <field name='arch' type='xml'>
-                <form string='Product'>
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field eval="7" name="priority"/>
+            <field name="arch" type="xml">
+                <form string="Product">
                     <notebook>
-                        <page string='Information'>
-                            <field name='name' select='1'/>
-                            <field name='default_code' select='1'/>
-                            <field name='variants' groups='base.group_extended' select='2'/>
-                            <field name='ean13' groups='base.group_extended' select='2'/>
+                        <page string="Information">
+                            <field name="name" select="1"/>
+                            <field name="default_code" select="1"/>
+                            <field groups="base.group_extended" name="variants" select="2"/>
+                            <field groups="base.group_extended" name="ean13" select="2"/>
                             <newline/>
-                            <field name='categ_id' select='1'/>
-                            <field name='type' select='2'/>
-                            <field name='volume' groups='base.group_extended' digits='(14, 3)'/>
+                            <field name="categ_id" select="1"/>
+                            <field name="type" select="2"/>
+                            <field digits="(14, 3)" groups="base.group_extended" name="volume"/>
                             <newline/>
-                            <field name='weight' groups='base.group_extended' digits='(14, 3)'/>
-                            <field name='weight_net' groups='base.group_extended' digits='(14, 3)'/>
-                            <field name='procure_method'/>
-                            <field name='state' select='2'/>
-                            <field name='uom_id'/>
-                            <field name='uom_po_id'/>
-                            <field name='product_manager' groups='base.group_extended' select='2'/>
+                            <field digits="(14, 3)" groups="base.group_extended" name="weight"/>
+                            <field digits="(14, 3)" groups="base.group_extended" name="weight_net"/>
+                            <field name="procure_method"/>
+                            <field name="state" select="2"/>
+                            <field name="uom_id"/>
+                            <field name="uom_po_id"/>
+                            <field groups="base.group_extended" name="product_manager" select="2"/>
                         </page>
-                        <page string='Procurement'>
-                            <field name='supply_method'/>
-                            <field name='active' select='2'/>
+                        <page string="Procurement">
+                            <field name="supply_method"/>
+                            <field name="active" select="2"/>
                             <newline/>
-                            <field name='sale_delay'/>
-                            <field name='sale_ok' select='2'/>
-                            <field name='produce_delay'/>
-                            <field name='purchase_ok' select='2'/>
-                            <field name='warranty'/>
-                            <field name='rental' groups='base.group_extended' select='2'/>
+                            <field name="sale_delay"/>
+                            <field name="sale_ok" select="2"/>
+                            <field name="produce_delay"/>
+                            <field name="purchase_ok" select="2"/>
+                            <field name="warranty"/>
+                            <field groups="base.group_extended" name="rental" select="2"/>
                             <newline/>
-                            <field name='list_price'/>
-                            <field name='standard_price'/>
-                            <field name='cost_method' groups='base.group_extended'/>
+                            <field name="list_price"/>
+                            <field name="standard_price"/>
+                            <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
-                            <field name='uos_id' groups='base.group_uos'/>
-                            <field name='uos_coeff' groups='base.group_uos'/>
+                            <field groups="base.group_uos" name="uos_id"/>
+                            <field groups="base.group_uos" name="uos_coeff"/>
                             <newline/>
-                            <field name='seller_ids' nolabel='1' widget='one2many_list' colspan='4'/>
+                            <field colspan="4" name="seller_ids" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string='Descriptions'>
-                            <separator string='Description'/>
-                            <field name='description' nolabel='1' colspan='4'/>
-                            <separator string='Sale Description'/>
-                            <field name='description_sale' nolabel='1' colspan='4'/>
-                            <separator string='Purchase Description'/>
-                            <field name='description_purchase' nolabel='1' colspan='4'/>
+                        <page string="Descriptions">
+                            <separator string="Description"/>
+                            <field colspan="4" name="description" nolabel="1"/>
+                            <separator string="Sale Description"/>
+                            <field colspan="4" name="description_sale" nolabel="1"/>
+                            <separator string="Purchase Description"/>
+                            <field colspan="4" name="description_purchase" nolabel="1"/>
                         </page>
-                        <page groups='base.group_extended' string='Packaging'>
-                            <field name='mes_type'/>
-                            <field name='tracking'/>
-                            <field name='packaging' nolabel='1' colspan='4'>
-                                <form string='Packaging'>
-                                    <field name='ean' select='1'/>
+                        <page groups="base.group_extended" string="Packaging">
+                            <field name="mes_type"/>
+                            <field name="tracking"/>
+                            <field colspan="4" name="packaging" nolabel="1">
+                                <form string="Packaging">
+                                    <field name="ean" select="1"/>
                                     <newline/>
-                                    <field name='qty' select='1'/>
-                                    <field name='ul'/>
-                                    <field name='weight_ul'/>
-                                    <separator string='Paletization' colspan='4'/>
-                                    <field name='ul_qty'/>
-                                    <field name='rows'/>
-                                    <field name='weight'/>
-                                    <separator string='Palette Dimension' colspan='4'/>
-                                    <field name='height'/>
-                                    <field name='width'/>
-                                    <field name='length'/>
-                                    <separator string='Other Info' colspan='4'/>
-                                    <field name='name' select='1' colspan='4'/>
+                                    <field name="qty" select="1"/>
+                                    <field name="ul"/>
+                                    <field name="weight_ul"/>
+                                    <separator colspan="4" string="Paletization"/>
+                                    <field name="ul_qty"/>
+                                    <field name="rows"/>
+                                    <field name="weight"/>
+                                    <separator colspan="4" string="Palette Dimension"/>
+                                    <field name="height"/>
+                                    <field name="width"/>
+                                    <field name="length"/>
+                                    <separator colspan="4" string="Other Info"/>
+                                    <field colspan="4" name="name" select="1"/>
                                 </form>
                             </field>
                         </page>
-                        <page groups='base.group_extended' string='Properties'>
+                        <page groups="base.group_extended" string="Properties">
                             <properties/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='product_normal_action' model='ir.actions.act_window'>
-            <field name='name'>Products</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.product</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='product_product_tree_view'/>
+        <record id="product_normal_action" model="ir.actions.act_window">
+            <field name="name">Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="product_product_tree_view"/>
         </record>
         
-        <menuitem name='Products/Products' action='product_normal_action' id='menu_products'/>
+        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product"/>
         
-        <record id='product_category_form_view' model='ir.ui.view'>
-            <field name='name'>product.category.form</field>
-            <field name='model'>product.category</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Product Categories'>
-                    <field name='name' select='1'/>
-                    <field name='parent_id'/>
-                    <field name='sequence'/>
-                    <group groups='base.group_extended' colspan='4'>
+        <record id="product_category_form_view" model="ir.ui.view">
+            <field name="name">product.category.form</field>
+            <field name="model">product.category</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Product Categories">
+                    <field name="name" select="1"/>
+                    <field name="parent_id"/>
+                    <field name="sequence"/>
+                    <group colspan="4" groups="base.group_extended">
                         <properties/>
                     </group>
                 </form>
             </field>
         </record>
-        <record id='product_category_tree_view' model='ir.ui.view'>
-            <field name='name'>product.category.tree</field>
-            <field name='model'>product.category</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_id</field>
-            <field name='arch' type='xml'>
-                <tree string='Products Categories'>
-                    <field name='complete_name'/>
+        <record id="product_category_tree_view" model="ir.ui.view">
+            <field name="name">product.category.tree</field>
+            <field name="model">product.category</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree string="Products Categories">
+                    <field name="complete_name"/>
                 </tree>
             </field>
         </record>
-        <record id='product_category_action' model='ir.actions.act_window'>
-            <field name='name'>Products by Category</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.category</field>
-            <field name='domain'>[('parent_id','=',False)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='product_category_tree_view'/>
+        <record id="product_category_action" model="ir.actions.act_window">
+            <field name="name">Products by Category</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.category</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="product_category_tree_view"/>
         </record>
-        <menuitem name='Products/Products by Category' action='product_category_action' id='menu_product_category_action'/>
+        <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product"/>
         
-        <record id='product_category_action_form' model='ir.actions.act_window'>
-            <field name='name'>Products Categories</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.category</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='product_category_tree_view'/>
+        <record id="product_category_action_form" model="ir.actions.act_window">
+            <field name="name">Products Categories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.category</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="product_category_tree_view"/>
         </record>
-        <menuitem name='Products/Configuration/Products Categories' action='product_category_action_form' id='menu_product_category_action_form'/>
+        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product"/>
         
         
-        <record id='product_normal_action_tree' model='ir.actions.act_window'>
-            <field name='name'>product.normal.action.tree</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.product</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('categ_id','child_of',[active_id])]</field>
+        <record id="product_normal_action_tree" model="ir.actions.act_window">
+            <field name="name">product.normal.action.tree</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('categ_id','child_of',[active_id])]</field>
         </record>
-        <record id='ir_product_category_open' model='ir.values'>
-            <field name='key2' eval='&apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;product.category&apos;'/>
-            <field name='name'>Products by Categories</field>
-            <field name='value' eval='&apos;ir.actions.act_window,%d&apos;%product_normal_action_tree'/>
-            <field name='object' eval='True'/>
+        <record id="ir_product_category_open" model="ir.values">
+            <field eval="'tree_but_open'" name="key2"/>
+            <field eval="'product.category'" name="model"/>
+            <field name="name">Products by Categories</field>
+            <field eval="'ir.actions.act_window,%d'%product_normal_action_tree" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         
         <!-- Unit of Measure -->
         
-        <record id='product_uom_tree_view' model='ir.ui.view'>
-            <field name='name'>product.uom.tree</field>
-            <field name='model'>product.uom</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Unit of Measure'>
-                    <field name='name'/>
-                    <field name='category_id'/>
-                    <field name='factor_inv' on_change='onchange_factor_inv(factor_inv)'/>
-                    <field name='factor' on_change='onchange_factor(factor)'/>
-                    <field name='rounding'/>
+        <record id="product_uom_tree_view" model="ir.ui.view">
+            <field name="name">product.uom.tree</field>
+            <field name="model">product.uom</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Unit of Measure">
+                    <field name="name"/>
+                    <field name="category_id"/>
+                    <field name="factor_inv" on_change="onchange_factor_inv(factor_inv)"/>
+                    <field name="factor" on_change="onchange_factor(factor)"/>
+                    <field name="rounding"/>
                 </tree>
             </field>
         </record>
         
-        <record id='product_uom_form_view' model='ir.ui.view'>
-            <field name='name'>product.uom.form</field>
-            <field name='model'>product.uom</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Unit of Measure'>
-                    <field name='name' select='1'/>
-                    <field name='category_id' select='1'/>
-                    <field name='factor_inv' select='1'/>
-                    <field name='factor' select='1'/>
-                    <field name='rounding'/>
-                    <field name='active'/>
+        <record id="product_uom_form_view" model="ir.ui.view">
+            <field name="name">product.uom.form</field>
+            <field name="model">product.uom</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Unit of Measure">
+                    <field name="name" select="1"/>
+                    <field name="category_id" select="1"/>
+                    <field name="factor_inv" select="1"/>
+                    <field name="factor" select="1"/>
+                    <field name="rounding"/>
+                    <field name="active"/>
                 </form>
             </field>
         </record>
-        <record id='product_uom_form_action' model='ir.actions.act_window'>
-            <field name='name'>Unit of Measure</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.uom</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='product_uom_tree_view'/>
+        <record id="product_uom_form_action" model="ir.actions.act_window">
+            <field name="name">Unit of Measure</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.uom</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="product_uom_tree_view"/>
         </record>
-        <menuitem name='Products/Configuration/Unit of Measure/Unit of Measure' action='product_uom_form_action' id='menu_product_uom_form_action'/>
+        <menuitem id="next_id_16" name="Unit of Measure" parent="product.menu_config_product"/><menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
         
-        <record id='product_uom_categ_form_view' model='ir.ui.view'>
-            <field name='name'>product.uom.categ.form</field>
-            <field name='model'>product.uom.categ</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Unit of Measure categories'>
-                    <field name='name' colspan='4' select='1'/>
+        <record id="product_uom_categ_form_view" model="ir.ui.view">
+            <field name="name">product.uom.categ.form</field>
+            <field name="model">product.uom.categ</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Unit of Measure categories">
+                    <field colspan="4" name="name" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='product_uom_categ_form_action' model='ir.actions.act_window'>
-            <field name='name'>Unit of Measure Categories</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.uom.categ</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="product_uom_categ_form_action" model="ir.actions.act_window">
+            <field name="name">Unit of Measure Categories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.uom.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Products/Configuration/Unit of Measure/Unit of Measure Categories' action='product_uom_categ_form_action' id='menu_product_uom_categ_form_action'/>
+        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16"/>
         
-        <record id='product_ul_form_view' model='ir.ui.view'>
-            <field name='name'>product.ul.form.view</field>
-            <field name='model'>product.ul</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Logistical Unit'>
-                    <field name='name'/>
-                    <field name='type'/>
+        <record id="product_ul_form_view" model="ir.ui.view">
+            <field name="name">product.ul.form.view</field>
+            <field name="model">product.ul</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Logistical Unit">
+                    <field name="name"/>
+                    <field name="type"/>
                 </form>
             </field>
         </record>
-        <record id='product_ul_tree' model='ir.ui.view'>
-            <field name='name'>product.ul.tree</field>
-            <field name='model'>product.ul</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Logistical Unit'>
-                    <field name='name' select='1'/>
-                    <field name='type' select='1'/>
+        <record id="product_ul_tree" model="ir.ui.view">
+            <field name="name">product.ul.tree</field>
+            <field name="model">product.ul</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Logistical Unit">
+                    <field name="name" select="1"/>
+                    <field name="type" select="1"/>
                 </tree>
             </field>
         </record>
-        <record id='product_ul_form_action' model='ir.actions.act_window'>
-            <field name='name'>Logistical Unit</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>product.ul</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="product_ul_form_action" model="ir.actions.act_window">
+            <field name="name">Logistical Unit</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.ul</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Products/Configuration/Logistical Unit' groups='base.group_extended' action='product_ul_form_action' id='menu_product_ul_form_action'/>
+        <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product"/>
         
-        <record id='product_packaging_tree_view' model='ir.ui.view'>
-            <field name='name'>product.packaging.tree.view</field>
-            <field name='model'>product.packaging</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Packaging'>
-                    <field name='ean'/>
-                    <field name='qty'/>
-                    <field name='ul'/>
+        <record id="product_packaging_tree_view" model="ir.ui.view">
+            <field name="name">product.packaging.tree.view</field>
+            <field name="model">product.packaging</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Packaging">
+                    <field name="ean"/>
+                    <field name="qty"/>
+                    <field name="ul"/>
                 </tree>
             </field>
         </record>
         
-        <record id='product_packaging_form_view' model='ir.ui.view'>
-            <field name='name'>product.packaging.form.view</field>
-            <field name='model'>product.packaging</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Packaging'>
-                    <field name='product_id' select='1'/>
-                    <field name='ean' select='1'/>
+        <record id="product_packaging_form_view" model="ir.ui.view">
+            <field name="name">product.packaging.form.view</field>
+            <field name="model">product.packaging</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Packaging">
+                    <field name="product_id" select="1"/>
+                    <field name="ean" select="1"/>
                     <newline/>
-                    <field name='qty' select='1'/>
-                    <field name='ul'/>
-                    <field name='weight_ul'/>
-                    <separator string='Paletization' colspan='4'/>
-                    <field name='ul_qty'/>
-                    <field name='rows'/>
-                    <field name='weight'/>
-                    <separator string='Palette Dimension' colspan='4'/>
-                    <field name='height'/>
-                    <field name='width'/>
-                    <field name='length'/>
-                    <separator string='Other Info' colspan='4'/>
-                    <field name='name' select='1' colspan='4'/>
+                    <field name="qty" select="1"/>
+                    <field name="ul"/>
+                    <field name="weight_ul"/>
+                    <separator colspan="4" string="Paletization"/>
+                    <field name="ul_qty"/>
+                    <field name="rows"/>
+                    <field name="weight"/>
+                    <separator colspan="4" string="Palette Dimension"/>
+                    <field name="height"/>
+                    <field name="width"/>
+                    <field name="length"/>
+                    <separator colspan="4" string="Other Info"/>
+                    <field colspan="4" name="name" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='product_supplierinfo_form_view' model='ir.ui.view'>
-            <field name='name'>product.supplierinfo.form.view</field>
-            <field name='model'>product.supplierinfo</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Supplier Information'>
-                    <field name='name'/>
-                    <field name='sequence'/>
-                    <field name='product_name'/>
-                    <field name='product_code'/>
-                    <field name='delay'/>
-                    <field name='qty'/>
-                    <field name='pricelist_ids' groups='base.group_extended' widget='one2many_list' nolabel='1' colspan='4'>
-                        <tree editable='bottom' string='Pricelist'>
-                            <field name='min_quantity'/>
-                            <field name='price'/>
+        <record id="product_supplierinfo_form_view" model="ir.ui.view">
+            <field name="name">product.supplierinfo.form.view</field>
+            <field name="model">product.supplierinfo</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Supplier Information">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                    <field name="product_name"/>
+                    <field name="product_code"/>
+                    <field name="delay"/>
+                    <field name="qty"/>
+                    <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
+                        <tree editable="bottom" string="Pricelist">
+                            <field name="min_quantity"/>
+                            <field name="price"/>
                         </tree>
                         <form>
-                            <field name='min_quantity'/>
-                            <field name='price'/>
+                            <field name="min_quantity"/>
+                            <field name="price"/>
                         </form>
                     </field>
                 </form>
             </field>
         </record>
-        <record id='product_supplierinfo_tree_view' model='ir.ui.view'>
-            <field name='name'>product.supplierinfo.tree.view</field>
-            <field name='model'>product.supplierinfo</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Supplier Information'>
-                    <field name='sequence' string='Seq'/>
-                    <field name='name'/>
-                    <field name='delay'/>
-                    <field name='qty'/>
-                    <field name='product_code'/>
+        <record id="product_supplierinfo_tree_view" model="ir.ui.view">
+            <field name="name">product.supplierinfo.tree.view</field>
+            <field name="model">product.supplierinfo</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Supplier Information">
+                    <field name="sequence" string="Seq"/>
+                    <field name="name"/>
+                    <field name="delay"/>
+                    <field name="qty"/>
+                    <field name="product_code"/>
                 </tree>
             </field>
         </record>
         
-        <record id='product_variant_form_view' model='ir.ui.view'>
-            <field name='name'>product.variant.form</field>
-            <field name='model'>product.product</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Product Variant'>
-                    <separator string='Description' colspan='4'/>
-                    <field name='product_tmpl_id' select='1'/>
-                    <field name='active' select='1'/>
-                    <field name='variants' select='1'/>
-                    <field name='default_code' select='1'/>
-                    <field name='price_margin' select='1'/>
-                    <field name='price_extra' select='1'/>
+        <record id="product_variant_form_view" model="ir.ui.view">
+            <field name="name">product.variant.form</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Product Variant">
+                    <separator colspan="4" string="Description"/>
+                    <field name="product_tmpl_id" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="variants" select="1"/>
+                    <field name="default_code" select="1"/>
+                    <field name="price_margin" select="1"/>
+                    <field name="price_extra" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='product_variant_tree_view' model='ir.ui.view'>
-            <field name='name'>product.variant.tree</field>
-            <field name='model'>product.product</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Product Variant'>
-                    <field name='product_tmpl_id'/>
-                    <field name='active'/>
-                    <field name='variants'/>
-                    <field name='default_code'/>
-                    <field name='price_margin'/>
-                    <field name='price_extra'/>
+        <record id="product_variant_tree_view" model="ir.ui.view">
+            <field name="name">product.variant.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Product Variant">
+                    <field name="product_tmpl_id"/>
+                    <field name="active"/>
+                    <field name="variants"/>
+                    <field name="default_code"/>
+                    <field name="price_margin"/>
+                    <field name="price_extra"/>
                 </tree>
             </field>
         </record>
         
-        <record id='product_template_tree_view' model='ir.ui.view'>
-            <field name='name'>product.template.product.tree</field>
-            <field name='model'>product.template</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Product Template'>
-                    <field name='name'/>
-                    <field name='categ_id'/>
-                    <field name='type'/>
-                    <field name='state'/>
+        <record id="product_template_tree_view" model="ir.ui.view">
+            <field name="name">product.template.product.tree</field>
+            <field name="model">product.template</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Product Template">
+                    <field name="name"/>
+                    <field name="categ_id"/>
+                    <field name="type"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='product_template_form_view' model='ir.ui.view'>
-            <field name='name'>product.template.product.form</field>
-            <field name='model'>product.template</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Product Template'>
+        <record id="product_template_form_view" model="ir.ui.view">
+            <field name="name">product.template.product.form</field>
+            <field name="model">product.template</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Product Template">
                     <notebook>
-                        <page string='Information'>
-                            <field name='name' colspan='4' select='1'/>
-                            <field name='categ_id' select='1'/>
-                            <field name='type' select='1'/>
-                            <field name='volume' digits='(14, 3)'/>
+                        <page string="Information">
+                            <field colspan="4" name="name" select="1"/>
+                            <field name="categ_id" select="1"/>
+                            <field name="type" select="1"/>
+                            <field digits="(14, 3)" name="volume"/>
                             <newline/>
-                            <field name='weight' digits='(14, 3)'/>
-                            <field name='weight_net' digits='(14, 3)'/>
-                            <field name='procure_method'/>
-                            <field name='state'/>
-                            <field name='uom_id'/>
-                            <field name='uom_po_id'/>
-                            <field name='description' colspan='4'/>
+                            <field digits="(14, 3)" name="weight"/>
+                            <field digits="(14, 3)" name="weight_net"/>
+                            <field name="procure_method"/>
+                            <field name="state"/>
+                            <field name="uom_id"/>
+                            <field name="uom_po_id"/>
+                            <field colspan="4" name="description"/>
                             <newline/>
-                            <field name='list_price'/>
-                            <field name='standard_price'/>
-                            <field name='product_manager'/>
-                            <field name='cost_method'/>
+                            <field name="list_price"/>
+                            <field name="standard_price"/>
+                            <field name="product_manager"/>
+                            <field name="cost_method"/>
                         </page>
-                        <page string='Procurement'>
-                            <field name='supply_method' select='2'/>
-                            <field name='rental' select='2'/>
+                        <page string="Procurement">
+                            <field name="supply_method" select="2"/>
+                            <field name="rental" select="2"/>
                             <newline/>
-                            <field name='sale_delay' select='2'/>
-                            <field name='sale_ok' select='2'/>
-                            <field name='purchase_ok' select='2'/>
-                            <field name='produce_delay' select='2'/>
-                            <field name='warranty'/>
+                            <field name="sale_delay" select="2"/>
+                            <field name="sale_ok" select="2"/>
+                            <field name="purchase_ok" select="2"/>
+                            <field name="produce_delay" select="2"/>
+                            <field name="warranty"/>
                         </page>
-                        <page string='Descriptions'>
-                            <separator string='Sale Description'/>
-                            <field name='description_sale' nolabel='1' colspan='4'/>
-                            <separator string='Purchase Description'/>
-                            <field name='description_purchase' nolabel='1' colspan='4'/>
+                        <page string="Descriptions">
+                            <separator string="Sale Description"/>
+                            <field colspan="4" name="description_sale" nolabel="1"/>
+                            <separator string="Purchase Description"/>
+                            <field colspan="4" name="description_purchase" nolabel="1"/>
                         </page>
-                        <page string='Properties'>
+                        <page string="Properties">
                             <properties/>
                         </page>
                     </notebook>
@@ -450,4 +450,4 @@
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index d8156cbe358..eefac225e1f 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="ir.ui.view" id="view_confirm_install_module_form">
+        <record id="view_confirm_install_module_form" model="ir.ui.view">
             <field name="name">Install extra modules</field>
             <field name="model">config.install_extra_modules</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Install Extra Module">
-                    <separator string="Install Extra Module" colspan="4" col="4"/>
+                    <separator col="4" colspan="4" string="Install Extra Module"/>
                     <newline/>
                     <field name="timesheets_module"/>
                     <field name="holidays_module"/>
@@ -21,15 +21,15 @@
             	<field name="module_id"/>
             	</tree>
             </field>-->
-                    <group colspan="4" col="4">
-                        <button special="cancel" string="Cancel" />
-                        <button name="action_install" type='object' string="Install" />
+                    <group col="4" colspan="4">
+                        <button special="cancel" string="Cancel"/>
+                        <button name="action_install" string="Install" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
         
-        <record model="ir.actions.act_window" id="action_config_install_module">
+        <record id="action_config_install_module" model="ir.actions.act_window">
             <field name="name">Install extra modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">config.install_extra_modules</field>
@@ -47,4 +47,4 @@
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 3f4ff2bfa3d..1957b50572a 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,16 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!--
 		Requests Links
 		-->
-        <record model="res.request.link" id="req_link_project">
+        <record id="req_link_project" model="res.request.link">
             <field name="name">Project</field>
             <field name="object">project.project</field>
         </record>
-        <record model="res.request.link" id="req_link_task">
+        <record id="req_link_task" model="res.request.link">
             <field name="name">Project task</field>
             <field name="object">project.task</field>
         </record>
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 5f580d1d7af..118b43810b2 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -18,7 +18,7 @@
             <field name="priority">10</field>
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Study + Prototype</field>
-            <field name="category_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="manager" ref="base.user_admin"/>
         </record>
         <record id="project_project_22" model="project.project">
@@ -26,7 +26,7 @@
             <field name="priority">20</field>
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Specific Developements</field>
-            <field name="category_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="manager" ref="base.user_admin"/>
         </record>
         <record id="project_project_23" model="project.project">
@@ -34,32 +34,32 @@
             <field name="priority">30</field>
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Install, data import, configuration</field>
-            <field name="category_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
+            <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="manager" ref="base.user_admin"/>
         </record>
         
         <record id="project_task_116" model="project.task">
             <field name="planned_hours">38.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','admin')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="description">BoM, After sales returns, interventions. Tracability.</field>
             <field name="name">Specific adaptation to MRP</field>
         </record>
         <record id="project_task_130" model="project.task">
             <field name="planned_hours">16.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Data importation + Doc</field>
         </record>
         <record id="project_task_131" model="project.task">
             <field name="planned_hours">16.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Modifications asked by the customer.</field>
         </record>
         <record id="project_task_184" model="project.task">
             <field name="planned_hours">16.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Customer analysis + Architecture</field>
@@ -67,7 +67,7 @@
         <record id="project_task_186" model="project.task">
             <field name="sequence">15</field>
             <field name="planned_hours">8.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
             <field name="date_deadline">2007-06-06</field>
@@ -75,7 +75,7 @@
         <record id="project_task_188" model="project.task">
             <field name="sequence">17</field>
             <field name="planned_hours">16.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Analysis, Data Importation</field>
@@ -83,7 +83,7 @@
         <record id="project_task_189" model="project.task">
             <field name="sequence">20</field>
             <field name="planned_hours">16.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Parameters</field>
         </record>
@@ -91,7 +91,7 @@
             <field name="sequence">20</field>
             <field name="start_sequence">1</field>
             <field name="planned_hours">32.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Start of the doc redaction + MRP</field>
         </record>
@@ -99,30 +99,30 @@
             <field name="sequence">25</field>
             <field name="start_sequence">1</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">MRP Tests</field>
         </record>
         <record id="project_task_193" model="project.task">
             <field name="sequence">29</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','admin')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">MRP; functionnal layer</field>
             <field name="state">done</field>
-            <field name="date_close" eval="time.strftime('%Y-%m-%d 12:12')"/>
+            <field eval="time.strftime('%Y-%m-%d 12:12')" name="date_close"/>
         </record>
         <record id="project_task_194" model="project.task">
             <field name="sequence">30</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Products Adaptation</field>
         </record>
         <record id="project_task_195" model="project.task">
             <field name="sequence">30</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Install + Super User Training</field>
         </record>
@@ -130,42 +130,42 @@
             <field name="sequence">30</field>
             <field name="start_sequence">1</field>
             <field name="planned_hours">32.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Customer docs</field>
         </record>
         <record id="project_task_197" model="project.task">
             <field name="sequence">30</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Development of the presentation layer</field>
         </record>
         <record id="project_task_198" model="project.task">
             <field name="sequence">40</field>
             <field name="planned_hours">32.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Free Time</field>
         </record>
         <record id="project_task_199" model="project.task">
             <field name="sequence">40</field>
             <field name="planned_hours">50.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Specific tests</field>
         </record>
         <record id="project_task_200" model="project.task">
             <field name="sequence">40</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Sale module</field>
         </record>
         <record id="project_task_201" model="project.task">
             <field name="sequence">40</field>
             <field name="planned_hours">32.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','admin')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">In house trainings</field>
             <field name="date_deadline">2007-06-06</field>
@@ -174,37 +174,37 @@
             <field name="sequence">50</field>
             <field name="start_sequence">1</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','admin')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','admin')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Validation + latest modifications.</field>
         </record>
         <record id="project_task_203" model="project.task">
             <field name="sequence">50</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Adaptations buy module</field>
         </record>
         <record id="project_task_204" model="project.task">
             <field name="sequence">60</field>
             <field name="planned_hours">16.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Presentation of the software.</field>
         </record>
         <record id="project_task_205" model="project.task">
             <field name="sequence">60</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Adaptations Stock module</field>
         </record>
         <record id="project_task_206" model="project.task">
             <field name="sequence">70</field>
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Latest in house tests</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/project/project_report.xml b/addons/project/project_report.xml
index 45751d78886..e10be805a55 100644
--- a/addons/project/project_report.xml
+++ b/addons/project/project_report.xml
@@ -1,23 +1,9 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <report string="Gantt Representation"
-			model="project.task"
-			name="project.tasks.gantt"
-			auto="False"
-			id="report_project_task_gantt"/>
-        <report string="Gantt Representation"
-			model="project.project"
-			name="project.project.gantt"
-			auto="False"
-			id="report_project_project_gantt"/>
-        <report string="Project Description"
-			model="project.project"
-			name="project.report"
-			auto="True"
-			xml="project/report/project_report.xml"
-			xsl="project/report/project_report.xsl"
-			id="report_project_desc"/>
+        <report auto="False" id="report_project_task_gantt" model="project.task" name="project.tasks.gantt" string="Gantt Representation"/>
+        <report auto="False" id="report_project_project_gantt" model="project.project" name="project.project.gantt" string="Gantt Representation"/>
+        <report auto="True" id="report_project_desc" model="project.project" name="project.report" string="Project Description" xml="project/report/project_report.xml" xsl="project/report/project_report.xsl"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/project/project_security.xml b/addons/project/project_security.xml
index decd37a6800..a86527a8809 100644
--- a/addons/project/project_security.xml
+++ b/addons/project/project_security.xml
@@ -1,98 +1,98 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="res.groups" id="group_project_manager">
+        <record id="group_project_manager" model="res.groups">
             <field name="name">Project Manager</field>
         </record>
         
-        <record model="res.groups" id="group_project_member">
+        <record id="group_project_member" model="res.groups">
             <field name="name">Project Member</field>
         </record>
         
-        <record model="res.users" id="base.user_admin">
-            <field name="groups_id" eval="[(4, ref('group_project_manager')), (4, ref('group_project_member'))]"/>
+        <record id="base.user_admin" model="res.users">
+            <field eval="[(4, ref('group_project_manager')), (4, ref('group_project_member'))]" name="groups_id"/>
         </record>
         
         <!-- Project security -->
-        <record model="ir.model.access" id="access_project">
+        <record id="access_project" model="ir.model.access">
             <field name="name">Project</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'project.project')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'project.project')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_project_manager">
+        <record id="access_project_manager" model="ir.model.access">
             <field name="name">Project</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'project.project')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'project.project')]"/>
             <field name="group_id" ref="group_project_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
         <!-- Project Task security -->
-        <record model="ir.model.access" id="access_project_task">
+        <record id="access_project_task" model="ir.model.access">
             <field name="name">Project Task</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'project.task')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_project_task_manager">
+        <record id="access_project_task_manager" model="ir.model.access">
             <field name="name">Project Task</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'project.task')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task')]"/>
             <field name="group_id" ref="group_project_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_project_task_member">
+        <record id="access_project_task_member" model="ir.model.access">
             <field name="name">Project Task</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'project.task')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task')]"/>
             <field name="group_id" ref="group_project_member"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
         <!-- Project Work security -->
-        <record model="ir.model.access" id="access_project_task_work">
+        <record id="access_project_task_work" model="ir.model.access">
             <field name="name">Project Task Work</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'project.task.work')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task.work')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_project_task_work_manager">
+        <record id="access_project_task_work_manager" model="ir.model.access">
             <field name="name">Project Task Work</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'project.task.work')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task.work')]"/>
             <field name="group_id" ref="group_project_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_project_task_work_member">
+        <record id="access_project_task_work_member" model="ir.model.access">
             <field name="name">Project Task Work</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'project.task.work')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task.work')]"/>
             <field name="group_id" ref="group_project_member"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9dbbcb689e9..3f77f702818 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,516 +1,516 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem name='Project Management' icon='terp-project' id='menu_main'/>
-        <menuitem name='Project Management/Configuration' sequence='1' groups='base.group_admin' id='menu_definitions'/>
+        <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
+        <menuitem groups="base.group_admin" id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/>
         
         <!-- Project -->
-        <record id='edit_project' model='ir.ui.view'>
-            <field name='name'>project.project.form</field>
-            <field name='model'>project.project</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Project'>
+        <record id="edit_project" model="ir.ui.view">
+            <field name="name">project.project.form</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Project">
                     <notebook>
-                        <page string='Administration'>
-                            <field name='name' select='1'/>
-                            <group col='3' colspan='2'>
-                                <field name='active' select='2'/>
-                                <button name='toggleActive' type='object' string='Toggle activity'/>
+                        <page string="Administration">
+                            <field name="name" select="1"/>
+                            <group col="3" colspan="2">
+                                <field name="active" select="2"/>
+                                <button name="toggleActive" string="Toggle activity" type="object"/>
                             </group>
-                            <field name='manager' select='1'/>
-                            <field name='warn_manager'/>
+                            <field name="manager" select="1"/>
+                            <field name="warn_manager"/>
                             <newline/>
-                            <field name='priority'/>
-                            <field name='parent_id'/>
-                            <field name='date_start'/>
-                            <field name='date_end'/>
-                            <field name='planned_hours' widget='float_time'/>
-                            <field name='effective_hours' widget='float_time'/>
-                            <field name='timesheet_id'/>
-                            <field name='state'/>
-                            <separator string='Project&apos;s members' colspan='4'/>
-                            <field name='members' nolabel='1' colspan='4'/>
+                            <field name="priority"/>
+                            <field name="parent_id"/>
+                            <field name="date_start"/>
+                            <field name="date_end"/>
+                            <field name="planned_hours" widget="float_time"/>
+                            <field name="effective_hours" widget="float_time"/>
+                            <field name="timesheet_id"/>
+                            <field name="state"/>
+                            <separator colspan="4" string="Project's members"/>
+                            <field colspan="4" name="members" nolabel="1"/>
                         </page>
-                        <page groups='base.group_extended' string='Partner Info'>
-                            <field name='partner_id' on_change='onchange_partner_id(partner_id)' select='1' colspan='4'/>
-                            <field name='contact_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]' select='2'/>
-                            <field name='category_id' select='2'/>
-                            <field name='pricelist_id'/>
-                            <field name='warn_customer'/>
-                            <field name='mode'/>
-                            <field name='tariff'/>
-                            <separator string='Mail texts' colspan='4'/>
-                            <field name='warn_header'/>
-                            <field name='warn_footer'/>
-                            <group col='3' colspan='4'>
-                                <label string='Task: %%(name)s'/>
-                                <label string='User: %%(user_id)s'/>
-                                <label string='ID: %%(task_id)s'/>
-                                <label string='Status: %%(state)s'/>
-                                <label string='Date Start: %%(date_start)s'/>
-                                <label string='Date Stop: %%(date_stop)s'/>
+                        <page groups="base.group_extended" string="Partner Info">
+                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" select="2"/>
+                            <field name="category_id" select="2"/>
+                            <field name="pricelist_id"/>
+                            <field name="warn_customer"/>
+                            <field name="mode"/>
+                            <field name="tariff"/>
+                            <separator colspan="4" string="Mail texts"/>
+                            <field name="warn_header"/>
+                            <field name="warn_footer"/>
+                            <group col="3" colspan="4">
+                                <label string="Task: %%(name)s"/>
+                                <label string="User: %%(user_id)s"/>
+                                <label string="ID: %%(task_id)s"/>
+                                <label string="Status: %%(state)s"/>
+                                <label string="Date Start: %%(date_start)s"/>
+                                <label string="Date Stop: %%(date_stop)s"/>
                             </group>
-                            <separator string='Taxes' colspan='4'/>
-                            <field name='tax_ids' nolabel='1' colspan='4'/>
+                            <separator colspan="4" string="Taxes"/>
+                            <field colspan="4" name="tax_ids" nolabel="1"/>
                         </page>
-                        <page string='Tasks'>
-                            <field name='tasks' nolabel='1' widget='one2many_list' colspan='4'>
-                                <form string='Task edition'>
+                        <page string="Tasks">
+                            <field colspan="4" name="tasks" nolabel="1" widget="one2many_list">
+                                <form string="Task edition">
                                     <notebook>
-                                        <page string='Task definition'>
-                                            <separator string='Task Information' colspan='4'/>
-                                            <field name='name' select='1'/>
-                                            <field name='active' select='1'/>
-                                            <field name='sequence'/>
-                                            <field name='priority' select='1'/>
-                                            <field name='user_id' select='1'/>
-                                            <field name='date_deadline' select='1'/>
-                                            <field name='date_start' select='1'/>
-                                            <field name='date_close' select='1'/>
-                                            <field name='progress'/>
+                                        <page string="Task definition">
+                                            <separator colspan="4" string="Task Information"/>
+                                            <field name="name" select="1"/>
+                                            <field name="active" select="1"/>
+                                            <field name="sequence"/>
+                                            <field name="priority" select="1"/>
+                                            <field name="user_id" select="1"/>
+                                            <field name="date_deadline" select="1"/>
+                                            <field name="date_start" select="1"/>
+                                            <field name="date_close" select="1"/>
+                                            <field name="progress"/>
                                             <newline/>
-                                            <field name='planned_hours' widget='float_time'/>
-                                            <field name='effective_hours' widget='float_time'/>
-                                            <separator string='Description' colspan='4'/>
-                                            <field name='description' nolabel='1' colspan='4'/>
+                                            <field name="planned_hours" widget="float_time"/>
+                                            <field name="effective_hours" widget="float_time"/>
+                                            <separator colspan="4" string="Description"/>
+                                            <field colspan="4" name="description" nolabel="1"/>
                                             
-                                            <group col='11' colspan='4'>
-                                                <field name='state' select='1'/>
-                                                <button name='do_draft' type='object' states='open' string='Set Draft'/>
-                                                <button name='do_open' type='object' states='pending,draft' string='Open task'/>
-                                                <button name='do_reopen' type='object' states='done,cancelled' string='Re-open'/>
-                                                <button name='do_pending' type='object' states='open' string='Set pending'/>
-                                                <button name='%(wizard_close_task)d' type='action' states='pending,open' string='Done'/>
-                                                <button name='%(wizard_delegate_task)d' groups='base.group_extended' type='action' states='pending,open' string='Delegate'/>
-                                                <button name='do_cancel' type='object' states='draft,open,pending' string='Cancel'/>
+                                            <group col="11" colspan="4">
+                                                <field name="state" select="1"/>
+                                                <button name="do_draft" states="open" string="Set Draft" type="object"/>
+                                                <button name="do_open" states="pending,draft" string="Open task" type="object"/>
+                                                <button name="do_reopen" states="done,cancelled" string="Re-open" type="object"/>
+                                                <button name="do_pending" states="open" string="Set pending" type="object"/>
+                                                <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action"/>
+                                                <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action"/>
+                                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
                                             </group>
                                         </page>
-                                        <page string='Work done'>
-                                            <separator string='Work done' colspan='4'/>
-                                            <field name='work_ids' nolabel='1' colspan='4'/>
+                                        <page string="Work done">
+                                            <separator colspan="4" string="Work done"/>
+                                            <field colspan="4" name="work_ids" nolabel="1"/>
                                         </page>
-                                        <page string='Others'>
-                                            <separator string='Notes' colspan='4'/>
-                                            <field name='invoice_id' readonly='True' colspan='4'/>
-                                            <field name='notes' nolabel='1' colspan='4'/>
+                                        <page string="Others">
+                                            <separator colspan="4" string="Notes"/>
+                                            <field colspan="4" name="invoice_id" readonly="True"/>
+                                            <field colspan="4" name="notes" nolabel="1"/>
                                             <newline/>
-                                            <field name='type'/>
-                                            <field name='billable' select='1'/>
-                                            <field name='start_sequence'/>
-                                            <field name='child_ids' nolabel='1' colspan='4'>
-                                                <tree string='Delegated tasks'>
-                                                    <field name='name'/>
-                                                    <field name='user_id'/>
-                                                    <field name='date_deadline'/>
-                                                    <field name='planned_hours' widget='float_time'/>
-                                                    <field name='effective_hours' widget='float_time'/>
-                                                    <field name='state'/>
+                                            <field name="type"/>
+                                            <field name="billable" select="1"/>
+                                            <field name="start_sequence"/>
+                                            <field colspan="4" name="child_ids" nolabel="1">
+                                                <tree string="Delegated tasks">
+                                                    <field name="name"/>
+                                                    <field name="user_id"/>
+                                                    <field name="date_deadline"/>
+                                                    <field name="planned_hours" widget="float_time"/>
+                                                    <field name="effective_hours" widget="float_time"/>
+                                                    <field name="state"/>
                                                 </tree>
                                             </field>
-                                            <field name='parent_id' colspan='4'/>
+                                            <field colspan="4" name="parent_id"/>
                                         </page>
                                     </notebook>
                                 </form>
-                                <tree colors='red:date_deadline&lt;current_date and state==&apos;draft&apos;;blue:date_deadline==current_date and state==&apos;draft&apos;;grey:state==&apos;cancel&apos; or state==&apos;close&apos;' string='All tasks'>
-                                    <field name='sequence'/>
-                                    <field name='name'/>
-                                    <field name='user_id'/>
-                                    <field name='date_deadline'/>
-                                    <field name='planned_hours' widget='float_time'/>
-                                    <field name='effective_hours' widget='float_time'/>
-                                    <field name='state'/>
+                                <tree colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state=='cancel' or state=='close'" string="All tasks">
+                                    <field name="sequence"/>
+                                    <field name="name"/>
+                                    <field name="user_id"/>
+                                    <field name="date_deadline"/>
+                                    <field name="planned_hours" widget="float_time"/>
+                                    <field name="effective_hours" widget="float_time"/>
+                                    <field name="state"/>
                                 </tree>
                             </field>
                         </page>
-                        <page string='Notes'>
-                            <field name='notes' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
                     <newline/>
                 </form>
             </field>
         </record>
-        <record id='view_project' model='ir.ui.view'>
-            <field name='name'>project.project.tree</field>
-            <field name='model'>project.project</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_id</field>
-            <field name='arch' type='xml'>
-                <tree string='Projects'>
-                    <field name='name'/>
-                    <field name='manager'/>
-                    <field name='partner_id'/>
-                    <field name='planned_hours' widget='float_time'/>
-                    <field name='effective_hours' widget='float_time'/>
-                    <field name='state'/>
+        <record id="view_project" model="ir.ui.view">
+            <field name="name">project.project.tree</field>
+            <field name="model">project.project</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree string="Projects">
+                    <field name="name"/>
+                    <field name="manager"/>
+                    <field name="partner_id"/>
+                    <field name="planned_hours" widget="float_time"/>
+                    <field name="effective_hours" widget="float_time"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='open_view_all_project' model='ir.actions.act_window'>
-            <field name='name'>All Projects</field>
-            <field name='res_model'>project.project</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('parent_id','=',False)]</field>
-            <field name='view_id' ref='view_project'/>
+        <record id="open_view_all_project" model="ir.actions.act_window">
+            <field name="name">All Projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem name='Project Management/All Projects' action='open_view_all_project' id='menu_all_project'/>
+        <menuitem action="open_view_all_project" id="menu_all_project" parent="project.menu_main"/>
         
-        <record id='open_view_all_project_unclosed' model='ir.actions.act_window'>
-            <field name='name'>Unclosed projects</field>
-            <field name='res_model'>project.project</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('parent_id','=',False),('state','&lt;&gt;','cancelled'),('state','&lt;&gt;','done')]</field>
-            <field name='view_id' ref='view_project'/>
+        <record id="open_view_all_project_unclosed" model="ir.actions.act_window">
+            <field name="name">Unclosed projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('parent_id','=',False),('state','&lt;&gt;','cancelled'),('state','&lt;&gt;','done')]</field>
+            <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem name='Project Management/All Projects/Unclosed Projects' action='open_view_all_project_unclosed' id='menu_all_project_unclosed'/>
+        <menuitem action="open_view_all_project_unclosed" id="menu_all_project_unclosed" parent="project.menu_all_project"/>
         
         
-        <record id='open_view_all_project_unclosed_open' model='ir.actions.act_window'>
-            <field name='name'>Open projects</field>
-            <field name='res_model'>project.project</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('parent_id','=',False),('state','=','open')]</field>
-            <field name='view_id' ref='view_project'/>
+        <record id="open_view_all_project_unclosed_open" model="ir.actions.act_window">
+            <field name="name">Open projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('parent_id','=',False),('state','=','open')]</field>
+            <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem name='Project Management/All Projects/Unclosed Projects/Open Projects' action='open_view_all_project_unclosed_open' id='menu_all_project_unclosed_open'/>
+        <menuitem action="open_view_all_project_unclosed_open" id="menu_all_project_unclosed_open" parent="project.menu_all_project_unclosed"/>
         
         
-        <record id='open_view_project_open' model='ir.actions.act_window'>
-            <field name='name'>Open projects</field>
-            <field name='res_model'>project.project</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','open')]</field>
-            <field name='view_id' ref='view_project'/>
+        <record id="open_view_project_open" model="ir.actions.act_window">
+            <field name="name">Open projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','open')]</field>
+            <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem name='Project Management/Configuration/Projects/Open Projects' action='open_view_project_open' id='menu_open_view_project_open'/>
+        <menuitem id="next_id_54" name="Projects" parent="project.menu_definitions"/><menuitem action="open_view_project_open" id="menu_open_view_project_open" parent="next_id_54"/>
         
         
-        <record id='open_view_project' model='ir.actions.act_window'>
-            <field name='name'>Projects</field>
-            <field name='res_model'>project.project</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[]</field>
-            <field name='view_id' ref='view_project'/>
+        <record id="open_view_project" model="ir.actions.act_window">
+            <field name="name">Projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">form</field>
+            <field name="domain">[]</field>
+            <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem name='Project Management/Configuration/Projects' action='open_view_project' id='menu_open_view_project'/>
+        <menuitem action="open_view_project" id="menu_open_view_project" parent="project.menu_definitions"/>
         
-        <record id='view_task_work_form' model='ir.ui.view'>
-            <field name='name'>project.task.work.form</field>
-            <field name='model'>project.task.work</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Task Work'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='hours' widget='float_time' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='user_id' select='1'/>
+        <record id="view_task_work_form" model="ir.ui.view">
+            <field name="name">project.task.work.form</field>
+            <field name="model">project.task.work</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Task Work">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="hours" select="1" widget="float_time"/>
+                    <field name="date" select="1"/>
+                    <field name="user_id" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_task_work_tree' model='ir.ui.view'>
-            <field name='name'>project.task.work.tree</field>
-            <field name='model'>project.task.work</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree editable='top' string='Task Work'>
-                    <field name='date'/>
-                    <field name='name'/>
-                    <field name='hours' widget='float_time'/>
-                    <field name='user_id'/>
+        <record id="view_task_work_tree" model="ir.ui.view">
+            <field name="name">project.task.work.tree</field>
+            <field name="model">project.task.work</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="top" string="Task Work">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="hours" widget="float_time"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_my_project' model='ir.ui.view'>
-            <field name='name'>project.project.tree</field>
-            <field name='model'>project.project</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_id</field>
-            <field name='arch' type='xml'>
-                <tree string='My projects'>
-                    <field name='name'/>
-                    <field name='partner_id'/>
-                    <field name='planned_hours' widget='float_time'/>
-                    <field name='effective_hours' widget='float_time'/>
-                    <field name='state'/>
+        <record id="view_my_project" model="ir.ui.view">
+            <field name="name">project.project.tree</field>
+            <field name="model">project.project</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree string="My projects">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="planned_hours" widget="float_time"/>
+                    <field name="effective_hours" widget="float_time"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='open_view_my_project' model='ir.actions.act_window'>
-            <field name='name'>My projects</field>
-            <field name='res_model'>project.project</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('manager', '=', uid)]</field>
-            <field name='view_id' ref='view_my_project'/>
+        <record id="open_view_my_project" model="ir.actions.act_window">
+            <field name="name">My projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('manager', '=', uid)]</field>
+            <field name="view_id" ref="view_my_project"/>
         </record>
-        <menuitem name='Project Management/My Projects' action='open_view_my_project' id='menu_open_view_my_project'/>
+        <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="project.menu_main"/>
         
         
-        <record id='open_view_my_project_open_unclosed' model='ir.actions.act_window'>
-            <field name='name'>My unclosed projects</field>
-            <field name='res_model'>project.project</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('manager', '=', uid),('state','&lt;&gt;','cancelled'),('state','&lt;&gt;','done')]</field>
-            <field name='view_id' ref='view_my_project'/>
+        <record id="open_view_my_project_open_unclosed" model="ir.actions.act_window">
+            <field name="name">My unclosed projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('manager', '=', uid),('state','&lt;&gt;','cancelled'),('state','&lt;&gt;','done')]</field>
+            <field name="view_id" ref="view_my_project"/>
         </record>
-        <menuitem name='Project Management/My Projects/My Unclosed Projects' action='open_view_my_project_open_unclosed' id='menu_open_view_my_project_open_unclosed'/>
+        <menuitem action="open_view_my_project_open_unclosed" id="menu_open_view_my_project_open_unclosed" parent="project.menu_open_view_my_project"/>
         
         
-        <record id='open_view_my_project_open' model='ir.actions.act_window'>
-            <field name='name'>My open projects</field>
-            <field name='res_model'>project.project</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('manager', '=', uid),('state','=','open')]</field>
-            <field name='view_id' ref='view_my_project'/>
+        <record id="open_view_my_project_open" model="ir.actions.act_window">
+            <field name="name">My open projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('manager', '=', uid),('state','=','open')]</field>
+            <field name="view_id" ref="view_my_project"/>
         </record>
-        <menuitem name='Project Management/My Projects/My Unclosed Projects/My Open Projects' action='open_view_my_project_open' id='menu_open_view_my_project_open'/>
+        <menuitem action="open_view_my_project_open" id="menu_open_view_my_project_open" parent="project.menu_open_view_my_project_open_unclosed"/>
         
         <!-- Task -->
-        <record id='view_task_form2' model='ir.ui.view'>
-            <field name='name'>project.task.form</field>
-            <field name='model'>project.task</field>
-            <field name='type'>form</field>
-            <field name='priority' eval='2'/>
-            <field name='arch' type='xml'>
-                <form string='Task edition'>
+        <record id="view_task_form2" model="ir.ui.view">
+            <field name="name">project.task.form</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <form string="Task edition">
                     <notebook>
-                        <page string='Information'>
-                            <field name='name' select='1'/>
-                            <field name='project_id' required='1' select='1'/>
-                            <field name='user_id' select='1'/>
-                            <field name='priority'/>
-                            <field name='date_deadline' select='2'/>
-                            <field name='planned_hours' widget='float_time'/>
-                            <separator colspan='4' string='Description'/>
-                            <field name='description' nolabel='1' colspan='4' select='2'/>
-                            <field name='effective_hours' widget='float_time'/>
-                            <field name='progress'/>
-                            <field name='work_ids' nolabel='1' colspan='4'/>
+                        <page string="Information">
+                            <field name="name" select="1"/>
+                            <field name="project_id" required="1" select="1"/>
+                            <field name="user_id" select="1"/>
+                            <field name="priority"/>
+                            <field name="date_deadline" select="2"/>
+                            <field name="planned_hours" widget="float_time"/>
+                            <separator colspan="4" string="Description"/>
+                            <field colspan="4" name="description" nolabel="1" select="2"/>
+                            <field name="effective_hours" widget="float_time"/>
+                            <field name="progress"/>
+                            <field colspan="4" name="work_ids" nolabel="1"/>
                             <newline/>
-                            <group col='11' colspan='4'>
-                                <field name='state' select='1'/>
-                                <button name='do_draft' type='object' states='open' string='Set Draft'/>
-                                <button name='do_open' type='object' states='pending,draft' string='Open'/>
-                                <button name='do_reopen' type='object' states='done,cancelled' string='Re-open'/>
-                                <button name='do_pending' type='object' states='open' string='Set Pending'/>
-                                <button name='%(wizard_delegate_task)d' groups='base.group_extended' type='action' states='pending,open' string='Delegate'/>
-                                <button name='%(wizard_close_task)d' type='action' states='pending,open' string='Done'/>
-                                <button name='do_cancel' type='object' states='draft,open,pending' string='Cancel'/>
+                            <group col="11" colspan="4">
+                                <field name="state" select="1"/>
+                                <button name="do_draft" states="open" string="Set Draft" type="object"/>
+                                <button name="do_open" states="pending,draft" string="Open" type="object"/>
+                                <button name="do_reopen" states="done,cancelled" string="Re-open" type="object"/>
+                                <button name="do_pending" states="open" string="Set Pending" type="object"/>
+                                <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action"/>
+                                <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action"/>
+                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
                                 
                             </group>
                         </page>
-                        <page groups='base.group_extended' string='Delegations'>
-                            <field name='history' nolabel='1' colspan='4'/>
-                            <field name='child_ids' height='150' nolabel='1' colspan='4'>
-                                <tree string='Delegated tasks'>
-                                    <field name='name'/>
-                                    <field name='user_id'/>
-                                    <field name='date_deadline'/>
-                                    <field name='planned_hours' widget='float_time'/>
-                                    <field name='effective_hours' widget='float_time'/>
-                                    <field name='state'/>
+                        <page groups="base.group_extended" string="Delegations">
+                            <field colspan="4" name="history" nolabel="1"/>
+                            <field colspan="4" height="150" name="child_ids" nolabel="1">
+                                <tree string="Delegated tasks">
+                                    <field name="name"/>
+                                    <field name="user_id"/>
+                                    <field name="date_deadline"/>
+                                    <field name="planned_hours" widget="float_time"/>
+                                    <field name="effective_hours" widget="float_time"/>
+                                    <field name="state"/>
                                 </tree>
                             </field>
-                            <field name='parent_id' colspan='4'/>
+                            <field colspan="4" name="parent_id"/>
                         </page>
-                        <page groups='base.group_extended' string='Extra Info'>
-                            <field name='date_start' select='2'/>
-                            <field name='date_close' select='2'/>
-                            <field name='type'/>
-                            <field name='sequence'/>
-                            <field name='active' select='2'/>
-                            <field name='start_sequence'/>
-                            <field name='partner_id' select='2'/>
+                        <page groups="base.group_extended" string="Extra Info">
+                            <field name="date_start" select="2"/>
+                            <field name="date_close" select="2"/>
+                            <field name="type"/>
+                            <field name="sequence"/>
+                            <field name="active" select="2"/>
+                            <field name="start_sequence"/>
+                            <field name="partner_id" select="2"/>
                             <newline/>
-                            <field name='invoice_id'/>
-                            <field name='billable' select='2'/>
-                            <separator colspan='4' string='Notes'/>
-                            <field name='notes' nolabel='1' colspan='4'/>
+                            <field name="invoice_id"/>
+                            <field name="billable" select="2"/>
+                            <separator colspan="4" string="Notes"/>
+                            <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='view_task_tree2' model='ir.ui.view'>
-            <field name='name'>project.task.tree</field>
-            <field name='model'>project.task</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='2'/>
-            <field name='arch' type='xml'>
-                <tree colors='grey:state in (&apos;cancel&apos;,&apos;done&apos;);blue:state==&apos;pending&apos;' string='Tasks'>
-                    <field name='sequence'/>
-                    <field name='name'/>
-                    <field name='project_id'/>
-                    <field name='user_id'/>
-                    <field name='date_deadline'/>
-                    <field name='planned_hours' sum='Planned hours' widget='float_time'/>
-                    <field name='effective_hours' sum='Effective hours' widget='float_time'/>
-                    <field name='priority'/>
-                    <field name='state'/>
+        <record id="view_task_tree2" model="ir.ui.view">
+            <field name="name">project.task.tree</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="grey:state in ('cancel','done');blue:state=='pending'" string="Tasks">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="date_deadline"/>
+                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
+                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
+                    <field name="priority"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_task_calendar' model='ir.ui.view'>
-            <field name='name'>project.task.calendar</field>
-            <field name='model'>project.task</field>
-            <field name='type'>calendar</field>
-            <field name='priority' eval='2'/>
-            <field name='arch' type='xml'>
-                <calendar date_delay='planned_hours' color='user_id' string='Tasks' date_start='date_start'>
-                    <field name='name'/>
-                    <field name='project_id'/>
+        <record id="view_task_calendar" model="ir.ui.view">
+            <field name="name">project.task.calendar</field>
+            <field name="model">project.task</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_delay="planned_hours" date_start="date_start" string="Tasks">
+                    <field name="name"/>
+                    <field name="project_id"/>
                 </calendar>
             </field>
         </record>
         
-        <record id='action_view_task' model='ir.actions.act_window'>
-            <field name='name'>All Tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form,calendar</field>
-            <field name='view_id' eval='False'/>
+        <record id="action_view_task" model="ir.actions.act_window">
+            <field name="name">All Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field eval="False" name="view_id"/>
         </record>
-        <menuitem name='Project Management/All Tasks' action='action_view_task' id='menu_action_view_task'/>
+        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_main"/>
         
-        <record id='action_view_task2' model='ir.actions.act_window'>
-            <field name='name'>Unbilled closed tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','done'), ('billable','=',True), ('invoice_id','=',False)]</field>
+        <record id="action_view_task2" model="ir.actions.act_window">
+            <field name="name">Unbilled closed tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','done'), ('billable','=',True), ('invoice_id','=',False)]</field>
         </record>
-        <menuitem name='Project Management/All Tasks/Billable Tasks' groups='base.group_extended' id='menu_action_billable'/>
+        <menuitem groups="base.group_extended" id="menu_action_billable" name="Billable Tasks" parent="project.menu_action_view_task"/>
         
-        <menuitem name='Project Management/All Tasks/Billable Tasks/Unbilled Closed Tasks' action='action_view_task2' id='menu_action_view_task2'/>
+        <menuitem action="action_view_task2" id="menu_action_view_task2" parent="project.menu_action_billable"/>
         
-        <record id='action_view_task3' model='ir.actions.act_window'>
-            <field name='name'>Unbilled open tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','open'), ('billable','=',True), ('invoice_id','=',False)]</field>
+        <record id="action_view_task3" model="ir.actions.act_window">
+            <field name="name">Unbilled open tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','open'), ('billable','=',True), ('invoice_id','=',False)]</field>
         </record>
-        <menuitem name='Project Management/All Tasks/Billable Tasks/Unbilled Open Tasks' action='action_view_task3' id='menu_action_view_task3'/>
+        <menuitem action="action_view_task3" id="menu_action_view_task3" parent="project.menu_action_billable"/>
         
-        <record id='action_view_task4' model='ir.actions.act_window'>
-            <field name='name'>My Tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('user_id', '=', uid)]</field>
-            <field name='view_id' ref='view_task_form2'/>
+        <record id="action_view_task4" model="ir.actions.act_window">
+            <field name="name">My Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('user_id', '=', uid)]</field>
+            <field name="view_id" ref="view_task_form2"/>
         </record>
-        <menuitem name='Project Management/' action='action_view_task4' id='menu_action_view_task4'/>
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_main"/>
         
-        <record id='action_view_task5_pending' model='ir.actions.act_window'>
-            <field name='name'>My Pending Tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id', '=', uid),('state','=','pending')]</field>
+        <record id="action_view_task5_pending" model="ir.actions.act_window">
+            <field name="name">My Pending Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id', '=', uid),('state','=','pending')]</field>
         </record>
-        <menuitem name='Project Management/My Tasks/' action='action_view_task5_pending' id='menu_tasks_yours_pending'/>
+        <menuitem id="next_id_55" name="My Tasks" parent="project.menu_main"/><menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" parent="next_id_55"/>
         
-        <record id='action_view_task5' model='ir.actions.act_window'>
-            <field name='name'>My Open Tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id', '=', uid),('state','=','open')]</field>
+        <record id="action_view_task5" model="ir.actions.act_window">
+            <field name="name">My Open Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id', '=', uid),('state','=','open')]</field>
         </record>
-        <menuitem name='Project Management/My Tasks/' action='action_view_task5' id='menu_tasks_yours'/>
+        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="project.next_id_55"/>
         
-        <record id='action_view_task5_prog' model='ir.actions.act_window'>
-            <field name='name'>My Tasks in Progress</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id', '=', uid),('state','=','open')]</field>
+        <record id="action_view_task5_prog" model="ir.actions.act_window">
+            <field name="name">My Tasks in Progress</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id', '=', uid),('state','=','open')]</field>
         </record>
-        <menuitem name='Project Management/My Tasks/' action='action_view_task5_prog' id='menu_tasks_yours_prog'/>
+        <menuitem action="action_view_task5_prog" id="menu_tasks_yours_prog" parent="project.next_id_55"/>
         
-        <record id='action_view_task6' model='ir.actions.act_window'>
-            <field name='name'>Open Tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state', '=', 'open')]</field>
+        <record id="action_view_task6" model="ir.actions.act_window">
+            <field name="name">Open Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state', '=', 'open')]</field>
         </record>
-        <menuitem name='Project Management/All Tasks/' action='action_view_task6' id='menu_action_view_task6'/>
+        <menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task"/>
         
-        <record id='action_view_task6_prog' model='ir.actions.act_window'>
-            <field name='name'>Tasks in Progress</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state', '=', 'progress')]</field>
+        <record id="action_view_task6_prog" model="ir.actions.act_window">
+            <field name="name">Tasks in Progress</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state', '=', 'progress')]</field>
         </record>
-        <menuitem name='Project Management/All Tasks/' action='action_view_task6_prog' id='menu_action_view_task6_prog'/>
+        <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task"/>
         
-        <record id='action_view_task7' model='ir.actions.act_window'>
-            <field name='name'>Unassigned Tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id', '=', False)]</field>
+        <record id="action_view_task7" model="ir.actions.act_window">
+            <field name="name">Unassigned Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id', '=', False)]</field>
         </record>
-        <menuitem name='Project Management/All Tasks/' action='action_view_task7' id='menu_action_view_task7'/>
+        <menuitem action="action_view_task7" id="menu_action_view_task7" parent="project.menu_action_view_task"/>
         
         <!-- Opening task when double clicking on project -->
-        <record id='dblc_proj' model='ir.actions.act_window'>
-            <field name='res_model'>project.task</field>
-            <field name='name'>Project's tasks</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('project_id', 'child_of', [active_id])]</field>
+        <record id="dblc_proj" model="ir.actions.act_window">
+            <field name="res_model">project.task</field>
+            <field name="name">Project's tasks</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('project_id', 'child_of', [active_id])]</field>
         </record>
-        <record id='ir_project_task_open' model='ir.values'>
-            <field name='key2' eval=' &apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;project.project&apos;'/>
-            <field name='name'>View project's tasks</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(dblc_proj)'/>
-            <field name='object' eval='True'/>
+        <record id="ir_project_task_open" model="ir.values">
+            <field eval=" 'tree_but_open'" name="key2"/>
+            <field eval="'project.project'" name="model"/>
+            <field name="name">View project's tasks</field>
+            <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         <!-- Task types -->
-        <record id='task_type_edit' model='ir.ui.view'>
-            <field name='name'>project.task.type.form</field>
-            <field name='model'>project.task.type</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Task type'>
-                    <field name='name' colspan='4' select='1'/>
-                    <field name='description' colspan='4' select='1'/>
+        <record id="task_type_edit" model="ir.ui.view">
+            <field name="name">project.task.type.form</field>
+            <field name="model">project.task.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Task type">
+                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="description" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='task_type_tree' model='ir.ui.view'>
-            <field name='name'>project.task.type.tree</field>
-            <field name='model'>project.task.type</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Task type'>
-                    <field name='name'/>
+        <record id="task_type_tree" model="ir.ui.view">
+            <field name="name">project.task.type.tree</field>
+            <field name="model">project.task.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Task type">
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='open_task_type_form' model='ir.actions.act_window'>
-            <field name='name'>Task Types</field>
-            <field name='res_model'>project.task.type</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='task_type_tree'/>
+        <record id="open_task_type_form" model="ir.actions.act_window">
+            <field name="name">Task Types</field>
+            <field name="res_model">project.task.type</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="task_type_tree"/>
         </record>
-        <menuitem name='Project Management/Configuration/Task Types' action='open_task_type_form' id='menu_task_types'/>
+        <menuitem action="open_task_type_form" id="menu_task_types" parent="project.menu_definitions"/>
         
-        <act_window name='User&apos;s projects' view_type='form' domain='[(&apos;manager&apos;, &apos;=&apos;, active_id)]' id='act_res_users_2_project_project' src_model='res.users' view_mode='tree,form' res_model='project.project'/>
+        <act_window domain="[('manager', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
         
-        <act_window name='Opened tasks' view_type='form' domain='[(&apos;project_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;cancelled&apos;),(&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;done&apos;)]' id='act_project_project_2_project_task_opened' src_model='project.project' view_mode='tree,form' res_model='project.task'/>
+        <act_window domain="[('project_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_project_project_2_project_task_opened" name="Opened tasks" res_model="project.task" src_model="project.project" view_mode="tree,form" view_type="form"/>
         
-        <act_window name='Assigned tasks' view_type='form' domain='[(&apos;user_id&apos;, &apos;=&apos;, active_id),(&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;cancelled&apos;),(&apos;state&apos;, &apos;&lt;&gt;&apos;, &apos;done&apos;)]' id='act_res_users_2_project_task_opened' src_model='res.users' view_mode='tree,form' res_model='project.task'/>
+        <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form" view_type="form"/>
         
-        <act_window name='Month works' view_type='form' domain='[(&apos;user_id&apos;, &apos;=&apos;, active_id),(&apos;date&apos;, &apos;&gt;=&apos;, time.strftime(&apos;%Y-%m-01&apos;))]' id='act_res_users_2_project_task_work_month' src_model='res.users' view_mode='tree,form' res_model='project.task.work'/>
+        <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
index 4f656d46b4c..87a83df6bb6 100644
--- a/addons/project/project_wizard.xml
+++ b/addons/project/project_wizard.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard id="wizard_billing" string="Bill tasks" model="project.task" name="project.wiz_bill"/>
-        <wizard id="wizard_close_task" string="Close Task" model="project.task" name="project.task.close" menu="False"/>
-        <wizard id="wizard_delegate_task" string="Delegate Task" model="project.task" name="project.task.delegate" menu="False"/>
+        <wizard id="wizard_billing" model="project.task" name="project.wiz_bill" string="Bill tasks"/>
+        <wizard id="wizard_close_task" menu="False" model="project.task" name="project.task.close" string="Close Task"/>
+        <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index b8c080dedf7..c218394d75f 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -1,46 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="res.request.link" id="req_link_purchase_order">
+        <record id="req_link_purchase_order" model="res.request.link">
             <field name="name">Purchase Order</field>
             <field name="object">purchase.order</field>
         </record>
         
-        <record model="res.partner.event.type" id="event_type_purchase_open">
+        <record id="event_type_purchase_open" model="res.partner.event.type">
             <field name="name">Purchase: Purchase Confirmation</field>
             <field name="key">purchase_open</field>
         </record>
         
-        <record model="product.pricelist.type" id="pricelist_type_purchase">
+        <record id="pricelist_type_purchase" model="product.pricelist.type">
             <field name="name">Purchase Pricelist</field>
             <field name="key">purchase</field>
         </record>
         
-        <record model="product.pricelist" id="list0">
+        <record id="list0" model="product.pricelist">
             <field name="name">Default Purchase Pricelist</field>
             <field name="type">purchase</field>
         </record>
-        <record model="product.pricelist.version" id="ver0">
+        <record id="ver0" model="product.pricelist.version">
             <field name="pricelist_id" ref="list0"/>
             <field name="name">Default Purchase Pricelist Version</field>
         </record>
-        <record model="product.pricelist.item" id="item0">
+        <record id="item0" model="product.pricelist.item">
             <field name="price_version_id" ref="ver0"/>
             <field name="base" ref="product.standard_price"/>
             <field name="name">Default Purchase Pricelist Line</field>
         </record>
         
-        <record model="ir.property" id="property_product_pricelist_purchase" forcecreate="True">
+        <record forcecreate="True" id="property_product_pricelist_purchase" model="ir.property">
             <field name="name">property_product_pricelist_purchase</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist_purchase')]"/>
-            <field name="value" eval="'product.pricelist,'+str(list0)"/>
+            <field eval="'product.pricelist,'+str(list0)" name="value"/>
         </record>
         
-        <function 
-		model="ir.values" 
-		id="purchase_default_set"
-		name="set"
-		eval="('default',False,'warehouse_id', [('purchase.order', False)], ref('stock.warehouse0'), True, False, False, False, True)"/>
+        <function eval="('default',False,'warehouse_id', [('purchase.order', False)], ref('stock.warehouse0'), True, False, False, False, True)" id="purchase_default_set" model="ir.values" name="set"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 4851082a489..4ec63b343e9 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_report.xml b/addons/purchase/purchase_report.xml
index 6413d174b39..af9cdcaa871 100644
--- a/addons/purchase/purchase_report.xml
+++ b/addons/purchase/purchase_report.xml
@@ -1,17 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report id="report_purchase_quotation"
-			name="purchase.quotation"
-			string="Request for Quotation"
-			model="purchase.order"
-			rml="purchase/report/request_quotation.rml"
-			auto="False"/>
-        <report id="report_purchase_order"
-			name="purchase.order"
-			string="Print Order"
-			model="purchase.order"
-			rml="purchase/report/order.rml"
-			auto="False"/>
+        <report auto="False" id="report_purchase_quotation" model="purchase.order" name="purchase.quotation" rml="purchase/report/request_quotation.rml" string="Request for Quotation"/>
+        <report auto="False" id="report_purchase_order" model="purchase.order" name="purchase.order" rml="purchase/report/order.rml" string="Print Order"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_security.xml b/addons/purchase/purchase_security.xml
index 791c7ff3c9c..3dd713dd4f7 100644
--- a/addons/purchase/purchase_security.xml
+++ b/addons/purchase/purchase_security.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="res.groups" id="group_purchase_manager">
+        <record id="group_purchase_manager" model="res.groups">
             <field name="name">Purchase Manager</field>
         </record>
         
-        <record model="res.users" id="base.user_admin">
-            <field name="groups_id" eval="[(4 ,ref('group_purchase_manager'))]"/>
+        <record id="base.user_admin" model="res.users">
+            <field eval="[(4 ,ref('group_purchase_manager'))]" name="groups_id"/>
         </record>
         
         <record id="ir_model_access_stockmove0" model="ir.model.access">
@@ -51,43 +51,43 @@
         </record>
         
         <!-- Purchase order security -->
-        <record model="ir.model.access" id="access_purchase_order">
+        <record id="access_purchase_order" model="ir.model.access">
             <field name="name">Purchase Order</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'purchase.order')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'purchase.order')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_purchase_order_purchase_manager">
+        <record id="access_purchase_order_purchase_manager" model="ir.model.access">
             <field name="name">Purchase Order</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'purchase.order')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'purchase.order')]"/>
             <field name="group_id" ref="group_purchase_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Purchase order line security -->
-        <record model="ir.model.access" id="access_purchase_order_line">
+        <record id="access_purchase_order_line" model="ir.model.access">
             <field name="name">Purchase Order Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'purchase.order.line')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'purchase.order.line')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_purchase_order_line_purchase_manager">
+        <record id="access_purchase_order_line_purchase_manager" model="ir.model.access">
             <field name="name">Purchase Order Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'purchase.order.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'purchase.order.line')]"/>
             <field name="group_id" ref="group_purchase_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_sequence.xml b/addons/purchase/purchase_sequence.xml
index c904664351d..f3721d234b9 100644
--- a/addons/purchase/purchase_sequence.xml
+++ b/addons/purchase/purchase_sequence.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!-- Sequences for purchase.order --> 
-        <record model="ir.sequence.type" id="seq_type_purchase_order">
+        <record id="seq_type_purchase_order" model="ir.sequence.type">
             <field name="name">Purchase Order</field>
             <field name="code">purchase.order</field>
         </record>
-        <record model="ir.sequence" id="seq_purchase_order">
+        <record id="seq_purchase_order" model="ir.sequence">
             <field name="name">Purchase Order</field>
             <field name="code">purchase.order</field>
             <field name="prefix">PO</field>
             <field name="padding">3</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4a7c1d44f1c..6fed731affc 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,165 +1,165 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <menuitem name='Purchase Management' icon='terp-purchase' id='menu_purchase_root'/>
+        <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"/>
         
-        <record id='purchase_order_form' model='ir.ui.view'>
-            <field name='name'>purchase.order.form</field>
-            <field name='model'>purchase.order</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Purchase Order'>
+        <record id="purchase_order_form" model="ir.ui.view">
+            <field name="name">purchase.order.form</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Purchase Order">
                     <notebook>
-                        <page string='Purchase Order'>
-                            <field name='name' select='1'/>
-                            <group col='4' colspan='2'>
-                                <field name='shipped' select='2'/>
-                                <field name='invoiced' select='2'/>
+                        <page string="Purchase Order">
+                            <field name="name" select="1"/>
+                            <group col="4" colspan="2">
+                                <field name="shipped" select="2"/>
+                                <field name="invoiced" select="2"/>
                             </group>
                             <newline/>
-                            <field name='warehouse_id' on_change='onchange_warehouse_id(warehouse_id)'/>
-                            <field name='date_order' select='2'/>
-                            <field name='partner_id' on_change='onchange_partner_id(partner_id)' select='1'/>
-                            <field name='partner_address_id'/>
-                            <field name='pricelist_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;purchase&apos;)]'/>
-                            <field name='partner_ref' select='2'/>
+                            <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)"/>
+                            <field name="date_order" select="2"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <field name="partner_address_id"/>
+                            <field domain="[('type','=','purchase')]" name="pricelist_id"/>
+                            <field name="partner_ref" select="2"/>
                             <newline/>
-                            <field name='order_line' widget='one2many_list' nolabel='1' colspan='4'/>
-                            <separator string='Document State' colspan='4' select='2'/>
-                            <group col='7' colspan='4'>
-                                <field name='amount_untaxed' sum='Untaxed amount'/>
-                                <field name='amount_tax'/>
-                                <field name='amount_total' sum='Total amount'/>
-                                <button name='button_dummy' type='object' states='draft' string='Compute'/>
+                            <field colspan="4" name="order_line" nolabel="1" widget="one2many_list"/>
+                            <separator colspan="4" select="2" string="Document State"/>
+                            <group col="7" colspan="4">
+                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                                <field name="amount_tax"/>
+                                <field name="amount_total" sum="Total amount"/>
+                                <button name="button_dummy" states="draft" string="Compute" type="object"/>
                             </group>
-                            <group col='9' colspan='4'>
-                                <field name='state' readonly='1'/>
-                                <button name='purchase_confirm' states='draft' string='Confirm Purchase Order'/>
-                                <button name='purchase_appbuyer' states='wait_auth' string='Approve Purchase'/>
-                                <button name='purchase_approve' states='confirmed' string='Approved by Supplier'/>
-                                <button name='purchase_cancel' states='draft,confirmed,wait_auth' string='Cancel Purchase Order'/>
+                            <group col="9" colspan="4">
+                                <field name="state" readonly="1"/>
+                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order"/>
+                                <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
+                                <button name="purchase_approve" states="confirmed" string="Approved by Supplier"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order"/>
                                 
-                                <button name='purchase_cancel' states='approved' string='Cancel Purchase Order'/>
+                                <button name="purchase_cancel" states="approved" string="Cancel Purchase Order"/>
                                 
-                                <button name='shipping_ok' states='except_shipping' string='Shipping Done'/>
-                                <button name='invoice_ok' states='except_invoice' string='Invoice Done'/>
+                                <button name="shipping_ok" states="except_shipping" string="Shipping Done"/>
+                                <button name="invoice_ok" states="except_invoice" string="Invoice Done"/>
                             </group>
                         </page>
-                        <page string='Extra Infos'>
-                            <field name='dest_address_id' on_change='onchange_dest_address_id(dest_address_id)'/>
-                            <field name='location_id'/>
-                            <field name='invoice_method'/>
-                            <field name='origin' select='2'/>
+                        <page string="Extra Infos">
+                            <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
+                            <field name="location_id"/>
+                            <field name="invoice_method"/>
+                            <field name="origin" select="2"/>
                             <newline/>
-                            <field name='validator'/>
-                            <field name='date_approve'/>
+                            <field name="validator"/>
+                            <field name="date_approve"/>
                         </page>
-                        <page string='Notes'>
-                            <field name='notes' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
         
-        <record id='purchase_form_action' model='ir.actions.act_window'>
-            <field name='name'>Purchase Order</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>purchase.order</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="purchase_form_action" model="ir.actions.act_window">
+            <field name="name">Purchase Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_mode">form,tree</field>
         </record>
-        <menuitem name='Purchase Management/Purchase Order' action='purchase_form_action' id='menu_purchase_form_action'/>
-        <record id='purchase_form_action2' model='ir.actions.act_window'>
-            <field name='name'>Request for quotation</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>purchase.order</field>
-            <field name='domain'>[('state','=','draft')]</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
+        <record id="purchase_form_action2" model="ir.actions.act_window">
+            <field name="name">Request for quotation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="domain">[('state','=','draft')]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Purchase Management/Purchase Order/Requests For Quotation' action='purchase_form_action2' id='menu_purchase_order_draft'/>
-        <record id='purchase_form_action3' model='ir.actions.act_window'>
-            <field name='name'>Purchase order waiting Approval</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>purchase.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','confirmed')]</field>
+        <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action"/>
+        <record id="purchase_form_action3" model="ir.actions.act_window">
+            <field name="name">Purchase order waiting Approval</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','confirmed')]</field>
         </record>
-        <menuitem name='Purchase Management/Purchase Order/Purchase Orders Waiting Approval' action='purchase_form_action3' id='menu_purchase_form_action3'/>
-        <record id='purchase_form_action4' model='ir.actions.act_window'>
-            <field name='name'>Purchase Orders in Progress</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>purchase.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','approved')]</field>
+        <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action"/>
+        <record id="purchase_form_action4" model="ir.actions.act_window">
+            <field name="name">Purchase Orders in Progress</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','approved')]</field>
         </record>
-        <menuitem name='Purchase Management/Purchase Order/Purchase Orders in Progress' action='purchase_form_action4' id='menu_purchase_form_action4'/>
+        <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action"/>
         
-        <record id='purchase_order_tree' model='ir.ui.view'>
-            <field name='name'>purchase.order.tree</field>
-            <field name='model'>purchase.order</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Purchase Order'>
-                    <field name='name'/>
-                    <field name='date_order'/>
-                    <field name='partner_id'/>
-                    <field name='location_id'/>
-                    <field name='invoiced' string='Paid'/>
-                    <field name='shipped'/>
-                    <field name='amount_untaxed'/>
-                    <field name='origin'/>
-                    <field name='state'/>
+        <record id="purchase_order_tree" model="ir.ui.view">
+            <field name="name">purchase.order.tree</field>
+            <field name="model">purchase.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Purchase Order">
+                    <field name="name"/>
+                    <field name="date_order"/>
+                    <field name="partner_id"/>
+                    <field name="location_id"/>
+                    <field name="invoiced" string="Paid"/>
+                    <field name="shipped"/>
+                    <field name="amount_untaxed"/>
+                    <field name="origin"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='purchase_order_line_form' model='ir.ui.view'>
-            <field name='name'>purchase.order.line.form</field>
-            <field name='model'>purchase.order.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Purchase Order Line'>
+        <record id="purchase_order_line_form" model="ir.ui.view">
+            <field name="name">purchase.order.line.form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Purchase Order Line">
                     <notebook>
-                        <page string='Order Line'>
-                            <field name='product_qty'/>
-                            <field name='product_uom' on_change='product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)'/>
-                            <field name='product_id' on_change='product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id' colspan='4'/>
-                            <field name='name' colspan='4'/>
-                            <field name='date_planned'/>
-                            <field name='price_unit'/>
-                            <field name='account_analytic_id'/>
-                            <field name='price_subtotal' readonly='1'/>
-                            <field name='taxes_id' colspan='4'/>
+                        <page string="Order Line">
+                            <field name="product_qty"/>
+                            <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
+                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
+                            <field colspan="4" name="name"/>
+                            <field name="date_planned"/>
+                            <field name="price_unit"/>
+                            <field name="account_analytic_id"/>
+                            <field name="price_subtotal" readonly="1"/>
+                            <field colspan="4" name="taxes_id"/>
                         </page>
-                        <page string='Notes'>
-                            <field name='notes' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
         
-        <record id='purchase_order_line_tree' model='ir.ui.view'>
-            <field name='name'>purchase.order.line.tree</field>
-            <field name='model'>purchase.order.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree colors='red:date_planned&lt;=current_date' string='Purchase Order Line'>
-                    <field name='date_planned'/>
-                    <field name='name'/>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='product_uom'/>
-                    <field name='price_unit'/>
-                    <field name='price_subtotal'/>
+        <record id="purchase_order_line_tree" model="ir.ui.view">
+            <field name="name">purchase.order.line.tree</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Line">
+                    <field name="date_planned"/>
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
+                    <field name="price_unit"/>
+                    <field name="price_subtotal"/>
                 </tree>
             </field>
         </record>
         
-        <act_window name='Purchase orders' domain='[(&apos;partner_id&apos;, &apos;=&apos;, active_id)]' id='act_res_partner_2_purchase_order' src_model='res.partner' context='{&apos;partner_id&apos;: active_id}' res_model='purchase.order'/>
+        <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_purchase_order" name="Purchase orders" res_model="purchase.order" src_model="res.partner"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_wizard.xml b/addons/purchase/purchase_wizard.xml
index 67a1d4d0781..b86e74d0f3f 100644
--- a/addons/purchase/purchase_wizard.xml
+++ b/addons/purchase/purchase_wizard.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard string="Merge purchases" multi="True" model="purchase.order" name="purchase.order.merge" id="purchase_order_merge"/>
+        <wizard id="purchase_order_merge" model="purchase.order" multi="True" name="purchase.order.merge" string="Merge purchases"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 00f1093bb0a..68ad644168f 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="workflow" id="purchase_order">
+        <record id="purchase_order" model="workflow">
             <field name="name">Purchase Order Basic Workflow</field>
             <field name="osv">purchase.order</field>
             <field name="on_create">True</field>
         </record>
         
-        <record model="workflow.activity" id="act_draft">
+        <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
-        <record model="workflow.activity" id="act_confirmed">
+        <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">confirmed</field>
             <field name="kind">function</field>
             <field name="action">wkf_confirm_order()</field>
         </record>
-        <record model="workflow.activity" id="act_cancel">
+        <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">cancel</field>
             <field name="action">write({'state':'cancel'})</field>
             <field name="kind">stopall</field>
             <field name="flow_stop">True</field>
         </record>
-        <record model="workflow.activity" id="act_except_invoice">
+        <record id="act_except_invoice" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">except_invoice</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'except_invoice'})</field>
         </record>
-        <record model="workflow.activity" id="act_except_picking">
+        <record id="act_except_picking" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">except_picking</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'except_picking'})</field>
         </record>
-        <record model="workflow.activity" id="act_router">
+        <record id="act_router" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">router</field>
             <field name="split_mode">OR</field>
             <field name="kind">function</field>
             <field name="action">wkf_approve_order()</field>
         </record>
-        <record model="workflow.activity" id="act_invoice">
+        <record id="act_invoice" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">invoice</field>
             <field name="kind">subflow</field>
-            <field name="subflow_id" type="int" search="[('osv','=','account.invoice')]"/>
+            <field name="subflow_id" search="[('osv','=','account.invoice')]" type="int"/>
             <field name="action">action_invoice_create()</field>
         </record>
-        <record model="workflow.activity" id="act_invoice_done">
+        <record id="act_invoice_done" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">invoice_done</field>
             <field name="action">write({'invoiced':1})</field>
             <field name="kind">function</field>
         </record>
-        <record model="workflow.activity" id="act_invoice_end">
+        <record id="act_invoice_end" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">invoice_end</field>
         </record>
-        <record model="workflow.activity" id="act_picking">
+        <record id="act_picking" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">picking</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('osv','=','stock.picking')]"/>
             <field name="action">action_picking_create()</field>
         </record>
-        <record model="workflow.activity" id="act_picking_done">
+        <record id="act_picking_done" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">picking_done</field>
             <field name="action">write({'shipped':1})</field>
             <field name="kind">function</field>
             <field name="signal_send">subflow.delivery_done</field>
         </record>
-        <record model="workflow.activity" id="act_done">
+        <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">done</field>
             <field name="action">write({'state':'done'})</field>
@@ -85,98 +85,98 @@
             <field name="join_mode">AND</field>
         </record>
         
-        <record model="workflow.transition" id="trans_draft_confirmed">
+        <record id="trans_draft_confirmed" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirmed"/>
             <field name="signal">purchase_confirm</field>
         </record>
-        <record model="workflow.transition" id="trans_confirmed_cancel">
+        <record id="trans_confirmed_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">purchase_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_draft_cancel">
+        <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">purchase_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_confirmed_router">
+        <record id="trans_confirmed_router" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_router"/>
             <field name="signal">purchase_approve</field>
         </record>
-        <record model="workflow.transition" id="trans_router_picking">
+        <record id="trans_router_picking" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_picking"/>
             <field name="condition">has_stockable_product()</field>
         </record>
-        <record model="workflow.transition" id="trans_router_picking_done">
+        <record id="trans_router_picking_done" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_picking_done"/>
             <field name="condition">not has_stockable_product()</field>
         </record>
-        <record model="workflow.transition" id="trans_router_invoice">
+        <record id="trans_router_invoice" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="condition">invoice_method=='order'</field>
         </record>
-        <record model="workflow.transition" id="trans_router_invoice_no_order">
+        <record id="trans_router_invoice_no_order" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="condition">invoice_method&lt;&gt;'order'</field>
         </record>
-        <record model="workflow.transition" id="trans_except_picking_picking_done">
+        <record id="trans_except_picking_picking_done" model="workflow.transition">
             <field name="act_from" ref="act_except_picking"/>
             <field name="act_to" ref="act_picking_done"/>
             <field name="signal">picking_ok</field>
         </record>
-        <record model="workflow.transition" id="trans_except_invoice_invoice_done">
+        <record id="trans_except_invoice_invoice_done" model="workflow.transition">
             <field name="act_from" ref="act_except_invoice"/>
             <field name="act_to" ref="act_invoice_done"/>
             <field name="signal">invoice_ok</field>
         </record>
-        <record model="workflow.transition" id="trans_except_picking">
+        <record id="trans_except_picking" model="workflow.transition">
             <field name="act_from" ref="act_except_picking"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_except_invoice">
+        <record id="trans_except_invoice" model="workflow.transition">
             <field name="act_from" ref="act_except_invoice"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_picking_except_picking">
+        <record id="trans_picking_except_picking" model="workflow.transition">
             <field name="act_from" ref="act_picking"/>
             <field name="act_to" ref="act_except_picking"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_invoice_except_invoice">
+        <record id="trans_invoice_except_invoice" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_except_invoice"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_picking_picking_done">
+        <record id="trans_picking_picking_done" model="workflow.transition">
             <field name="act_from" ref="act_picking"/>
             <field name="act_to" ref="act_picking_done"/>
             <field name="signal">subflow.done</field>
         </record>
-        <record model="workflow.transition" id="trans_invoice_invoice_done">
+        <record id="trans_invoice_invoice_done" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_invoice_done"/>
             <field name="signal">subflow.paid</field>
         </record>
-        <record model="workflow.transition" id="trans_picking_done_done">
+        <record id="trans_picking_done_done" model="workflow.transition">
             <field name="act_from" ref="act_picking_done"/>
             <field name="act_to" ref="act_done"/>
         </record>
-        <record model="workflow.transition" id="trans_invoice_done_done">
+        <record id="trans_invoice_done_done" model="workflow.transition">
             <field name="act_from" ref="act_invoice_done"/>
             <field name="act_to" ref="act_invoice_end"/>
         </record>
-        <record model="workflow.transition" id="trans_invoice_end_done">
+        <record id="trans_invoice_end_done" model="workflow.transition">
             <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 7607dcc00ea..b05c2030363 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record model="ir.ui.view" id="stock_picking_inherit_purchase">
+        <record id="stock_picking_inherit_purchase" model="ir.ui.view">
             <field name="name">Packing list</field>
             <field name="model">stock.picking</field>
             <field name="type">form</field>
@@ -13,11 +14,7 @@
             </field>
         </record>
         
-        <act_window name="Packings"
-		domain="[('purchase_id', '=', active_id)]"
-		res_model="stock.picking"
-		src_model="purchase.order"
-		id="act_purchase_order_2_stock_picking"/>
+        <act_window domain="[('purchase_id', '=', active_id)]" id="act_purchase_order_2_stock_picking" name="Packings" res_model="stock.picking" src_model="purchase.order"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml
index 7fe1753f3ce..ab5aef643de 100644
--- a/addons/report_account/report_receivable_view.xml
+++ b/addons/report_account/report_receivable_view.xml
@@ -1,53 +1,53 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
         <!-- Balance by account type -->
         
-        <record id='view_crm_case_user_graph' model='ir.ui.view'>
-            <field name='name'>report.account.receivable.graph</field>
-            <field name='model'>report.account.receivable</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' string='Accounts by type'>
-                    <field name='name'/>
-                    <field name='balance' operator='+'/>
+        <record id="view_crm_case_user_graph" model="ir.ui.view">
+            <field name="name">report.account.receivable.graph</field>
+            <field name="model">report.account.receivable</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Accounts by type" type="bar">
+                    <field name="name"/>
+                    <field name="balance" operator="+"/>
                 </graph>
             </field>
         </record>
-        <record id='view_crm_case_user_tree' model='ir.ui.view'>
-            <field name='name'>report.account.receivable.tree</field>
-            <field name='model'>report.account.receivable</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Accounts by type'>
-                    <field name='name'/>
-                    <field name='type'/>
-                    <field name='balance'/>
-                    <field name='debit'/>
-                    <field name='credit'/>
+        <record id="view_crm_case_user_tree" model="ir.ui.view">
+            <field name="name">report.account.receivable.tree</field>
+            <field name="model">report.account.receivable</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Accounts by type">
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="balance"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
                 </tree>
             </field>
         </record>
-        <record id='view_crm_case_user_form' model='ir.ui.view'>
-            <field name='name'>report.account.receivable.form</field>
-            <field name='model'>report.account.receivable</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Accounts by type'>
-                    <field name='name' select='1'/>
-                    <field name='type' select='1'/>
+        <record id="view_crm_case_user_form" model="ir.ui.view">
+            <field name="name">report.account.receivable.form</field>
+            <field name="model">report.account.receivable</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Accounts by type">
+                    <field name="name" select="1"/>
+                    <field name="type" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='action_account_receivable_graph' model='ir.actions.act_window'>
-            <field name='name'>Balance by Type of Account</field>
-            <field name='res_model'>report.account.receivable</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,graph</field>
+        <record id="action_account_receivable_graph" model="ir.actions.act_window">
+            <field name="name">Balance by Type of Account</field>
+            <field name="res_model">report.account.receivable</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Balance by Type of Account' action='action_account_receivable_graph' id='menu_account_receivable_graph'/>
+        <menuitem action="action_account_receivable_graph" id="menu_account_receivable_graph" parent="account.menu_finance_reporting"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_analytic/report_analytic_view.xml b/addons/report_analytic/report_analytic_view.xml
index 13a8fea47ff..91f4576d402 100644
--- a/addons/report_analytic/report_analytic_view.xml
+++ b/addons/report_analytic/report_analytic_view.xml
@@ -1,63 +1,63 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!-- Analytic accounts to close -->
-        <record id='view_analytic_account_close_form' model='ir.ui.view'>
-            <field name='name'>report.analytic.account.close.form</field>
-            <field name='model'>report.analytic.account.close</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Expired analytic accounts'>
-                    <field name='name' select='1'/>
-                    <field name='partner_id' select='1'/>
-                    <field name='quantity' select='1'/>
-                    <field name='state' select='1'/>
-                    <field name='quantity_max'/>
-                    <field name='date_deadline' select='1'/>
-                    <field name='balance' select='1'/>
+        <record id="view_analytic_account_close_form" model="ir.ui.view">
+            <field name="name">report.analytic.account.close.form</field>
+            <field name="model">report.analytic.account.close</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Expired analytic accounts">
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="quantity" select="1"/>
+                    <field name="state" select="1"/>
+                    <field name="quantity_max"/>
+                    <field name="date_deadline" select="1"/>
+                    <field name="balance" select="1"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='view_analytic_account_close_tree' model='ir.ui.view'>
-            <field name='name'>report.analytic.account.close.tree</field>
-            <field name='model'>report.analytic.account.close</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Expired analytic accounts'>
-                    <field name='name'/>
-                    <field name='partner_id'/>
-                    <field name='state'/>
-                    <field name='quantity'/>
-                    <field name='quantity_max'/>
-                    <field name='date_deadline'/>
-                    <field name='balance'/>
+        <record id="view_analytic_account_close_tree" model="ir.ui.view">
+            <field name="name">report.analytic.account.close.tree</field>
+            <field name="model">report.analytic.account.close</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Expired analytic accounts">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="state"/>
+                    <field name="quantity"/>
+                    <field name="quantity_max"/>
+                    <field name="date_deadline"/>
+                    <field name="balance"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_analytic_account_graph' model='ir.ui.view'>
-            <field name='name'>report.analytic.account.close.graph</field>
-            <field name='model'>report.analytic.account.close</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph string='Expired analytic accounts'>
-                    <field name='partner_id' group='True'/>
-                    <field name='quantity' operator='+'/>
-                    <field name='quantity_max' operator='+'/>
+        <record id="view_analytic_account_graph" model="ir.ui.view">
+            <field name="name">report.analytic.account.close.graph</field>
+            <field name="model">report.analytic.account.close</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Expired analytic accounts">
+                    <field group="True" name="partner_id"/>
+                    <field name="quantity" operator="+"/>
+                    <field name="quantity_max" operator="+"/>
                 </graph>
             </field>
         </record>
         
-        <record id='action_analytic_account_tree' model='ir.actions.act_window'>
-            <field name='name'>Expired analytic accounts</field>
-            <field name='res_model'>report.analytic.account.close</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,graph</field>
-            <field name='domain'>[('state','=','open')]</field>
+        <record id="action_analytic_account_tree" model="ir.actions.act_window">
+            <field name="name">Expired analytic accounts</field>
+            <field name="res_model">report.analytic.account.close</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="domain">[('state','=','open')]</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Analytic/All Months/Expired Analytic Accounts' action='action_analytic_account_tree' id='menu_action_analytic_account_tree'/>
+        <menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_42"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml
index 28364b557d5..ea310c5147d 100644
--- a/addons/report_analytic_line/report_analytic_line_view.xml
+++ b/addons/report_analytic_line/report_analytic_line_view.xml
@@ -1,66 +1,66 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='account_analytic_line_to_invoice_view_form' model='ir.ui.view'>
-            <field name='name'>report.account.analytic.line.to.invoice</field>
-            <field name='model'>report.account.analytic.line.to.invoice</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <tree string='Analytic Lines to Invoice'>
-                    <field name='name' select='1'/>
-                    <field name='account_id' select='1'/>
+        <record id="account_analytic_line_to_invoice_view_form" model="ir.ui.view">
+            <field name="name">report.account.analytic.line.to.invoice</field>
+            <field name="model">report.account.analytic.line.to.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Lines to Invoice">
+                    <field name="name" select="1"/>
+                    <field name="account_id" select="1"/>
                     <newline/>
-                    <field name='product_id' select='1'/>
-                    <field name='product_uom_id'/>
+                    <field name="product_id" select="1"/>
+                    <field name="product_uom_id"/>
                     <newline/>
-                    <field name='amount' colspan='1'/>
-                    <field name='unit_amount' colspan='1'/>
+                    <field colspan="1" name="amount"/>
+                    <field colspan="1" name="unit_amount"/>
                 </tree>
             </field>
         </record>
         
-        <record id='account_analytic_line_to_invoice_view_tree' model='ir.ui.view'>
-            <field name='name'>report.account.analytic.line.to.invoice</field>
-            <field name='model'>report.account.analytic.line.to.invoice</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Analytic Lines to Invoice'>
-                    <field name='name'/>
-                    <field name='product_id'/>
-                    <field name='account_id'/>
-                    <field name='amount'/>
-                    <field name='sale_price'/>
-                    <field name='unit_amount'/>
-                    <field name='product_uom_id'/>
+        <record id="account_analytic_line_to_invoice_view_tree" model="ir.ui.view">
+            <field name="name">report.account.analytic.line.to.invoice</field>
+            <field name="model">report.account.analytic.line.to.invoice</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Lines to Invoice">
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="account_id"/>
+                    <field name="amount"/>
+                    <field name="sale_price"/>
+                    <field name="unit_amount"/>
+                    <field name="product_uom_id"/>
                 </tree>
             </field>
         </record>
         
-        <record id='account_analytic_line_to_invoice_view_graph' model='ir.ui.view'>
-            <field name='name'>report.account.analytic.line.to.invoice.graph</field>
-            <field name='model'>report.account.analytic.line.to.invoice</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' string='Analytic Lines to Invoice'>
-                    <field name='name'/>
-                    <field name='sale_price' operator='+'/>
+        <record id="account_analytic_line_to_invoice_view_graph" model="ir.ui.view">
+            <field name="name">report.account.analytic.line.to.invoice.graph</field>
+            <field name="model">report.account.analytic.line.to.invoice</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Analytic Lines to Invoice" type="bar">
+                    <field name="name"/>
+                    <field name="sale_price" operator="+"/>
                 </graph>
             </field>
         </record>
         
         
-        <record id='action_account_analytic_line_to_invoice' model='ir.actions.act_window'>
-            <field name='name'>Analytic Lines to Invoice</field>
-            <field name='res_model'>report.account.analytic.line.to.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,graph</field>
+        <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
+            <field name="name">Analytic Lines to Invoice</field>
+            <field name="res_model">report.account.analytic.line.to.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
         </record>
-        <menuitem name='Financial Management/Reporting/Analytic/All Months/Analytic Lines to Invoice' action='action_account_analytic_line_to_invoice' id='account_analytic_lines_to_invoice_report'/>
+        <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_42"/>
         
-        <act_window name='Analytic Lines to Invoice' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id)]' id='act_product_product_2_report_acc_analytic_line_to_invoice' src_model='product.product' res_model='report.account.analytic.line.to.invoice'/>
+        <act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_acc_analytic_line_to_invoice" name="Analytic Lines to Invoice" res_model="report.account.analytic.line.to.invoice" src_model="product.product"/>
         
-        <act_window name='Lines to Invoice' domain='[(&apos;account_id&apos;, &apos;=&apos;, active_id),(&apos;invoice_id&apos;,&apos;=&apos;,False),(&apos;to_invoice&apos;,&apos;&lt;&gt;&apos;,False)]' id='act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice' src_model='account.analytic.account' res_model='account.analytic.line'/>
+        <act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_analytic_planning/report_analytic_planning_report.xml b/addons/report_analytic_planning/report_analytic_planning_report.xml
index fdf46d56b4d..c2b9815874f 100644
--- a/addons/report_analytic_planning/report_analytic_planning_report.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_report.xml
@@ -1,11 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <report id="report_planning"
-			string="Planning"
-			model="report_account_analytic.planning"
-			name="report_account_analytic.planning.print"
-			rml="report_analytic_planning/report/report_planning.rml"
-			/>
+        <report id="report_planning" model="report_account_analytic.planning" name="report_account_analytic.planning.print" rml="report_analytic_planning/report/report_planning.rml" string="Planning"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 9954a7b2064..d7e8858bb13 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -1,69 +1,69 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id='account_analytic_planning_view_tree' model='ir.ui.view'>
-            <field name='name'>report.account.analytic.planning.tree</field>
-            <field name='model'>report_account_analytic.planning</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Planning by Account'>
-                    <field name='name'/>
-                    <field name='user_id'/>
-                    <field name='date_from'/>
-                    <field name='date_to'/>
-                    <field name='state'/>
+        <record id="account_analytic_planning_view_tree" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.tree</field>
+            <field name="model">report_account_analytic.planning</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Planning by Account">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='account_analytic_planning_view_form' model='ir.ui.view'>
-            <field name='name'>report.account.analytic.planning.form</field>
-            <field name='model'>report_account_analytic.planning</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Planning by Account'>
+        <record id="account_analytic_planning_view_form" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.form</field>
+            <field name="model">report_account_analytic.planning</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Planning by Account">
                     <notebook>
-                        <page string='Planning'>
-                            <field name='name' select='1'/>
-                            <field name='user_id' select='1'/>
-                            <field name='date_from'/>
-                            <field name='date_to'/>
-                            <field name='line_ids' nolabel='1' colspan='4'>
-                                <tree editable='bottom' string='Planning Line'>
-                                    <field name='user_id'/>
-                                    <field name='account_id'/>
-                                    <field name='amount'/>
-                                    <field name='amount_unit'/>
-                                    <field name='note'/>
+                        <page string="Planning">
+                            <field name="name" select="1"/>
+                            <field name="user_id" select="1"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Planning Line">
+                                    <field name="user_id"/>
+                                    <field name="account_id"/>
+                                    <field name="amount"/>
+                                    <field name="amount_unit"/>
+                                    <field name="note"/>
                                 </tree>
                             </field>
-                            <field name='state' select='1'/>
+                            <field name="state" select="1"/>
                         </page>
-                        <page string='Analysis'>
-                            <field name='stat_ids' readonly='1' nolabel='1' colspan='4'>
-                                <tree editable='bottom' string='Planning Line'>
-                                    <field name='user_id'/>
-                                    <field name='account_id'/>
-                                    <field name='sum_amount'/>
-                                    <field name='sum_amount_real'/>
+                        <page string="Analysis">
+                            <field colspan="4" name="stat_ids" nolabel="1" readonly="1">
+                                <tree editable="bottom" string="Planning Line">
+                                    <field name="user_id"/>
+                                    <field name="account_id"/>
+                                    <field name="sum_amount"/>
+                                    <field name="sum_amount_real"/>
                                 </tree>
                             </field>
                         </page>
-                        <page string='Time by User'>
-                            <field name='stat_user_ids' nolabel='1' colspan='4'>
-                                <tree string='Quantities by User'>
-                                    <field name='user_id'/>
-                                    <field name='quantity' sum='Total Planned'/>
-                                    <field name='sum_amount_real' sum='Total Timesheet'/>
+                        <page string="Time by User">
+                            <field colspan="4" name="stat_user_ids" nolabel="1">
+                                <tree string="Quantities by User">
+                                    <field name="user_id"/>
+                                    <field name="quantity" sum="Total Planned"/>
+                                    <field name="sum_amount_real" sum="Total Timesheet"/>
                                 </tree>
                             </field>
                         </page>
-                        <page string='Time by Account'>
-                            <field name='stat_account_ids' nolabel='1' colspan='4'>
-                                <tree string='Quantities by Account'>
-                                    <field name='account_id'/>
-                                    <field name='quantity' sum='Total Planned'/>
-                                    <field name='sum_amount_real' sum='Total Timesheet'/>
+                        <page string="Time by Account">
+                            <field colspan="4" name="stat_account_ids" nolabel="1">
+                                <tree string="Quantities by Account">
+                                    <field name="account_id"/>
+                                    <field name="quantity" sum="Total Planned"/>
+                                    <field name="sum_amount_real" sum="Total Timesheet"/>
                                 </tree>
                             </field>
                         </page>
@@ -72,122 +72,122 @@
             </field>
         </record>
         
-        <record id='action_account_analytic_planning_form' model='ir.actions.act_window'>
-            <field name='name'>Planning</field>
-            <field name='res_model'>report_account_analytic.planning</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="action_account_analytic_planning_form" model="ir.actions.act_window">
+            <field name="name">Planning</field>
+            <field name="res_model">report_account_analytic.planning</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
         </record>
-        <menuitem name='Human Resources/Planning/Planning' action='action_account_analytic_planning_form' id='menu_report_account_analytic_planning'/>
+        <menuitem id="next_id_84" name="Planning" parent="hr.menu_hr_root"/><menuitem action="action_account_analytic_planning_form" id="menu_report_account_analytic_planning" parent="next_id_84"/>
         
-        <record id='action_account_analytic_planning_form_my' model='ir.actions.act_window'>
-            <field name='name'>My Planning</field>
-            <field name='res_model'>report_account_analytic.planning</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="action_account_analytic_planning_form_my" model="ir.actions.act_window">
+            <field name="name">My Planning</field>
+            <field name="res_model">report_account_analytic.planning</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Human Resources/Planning/Planning/My Planning' action='action_account_analytic_planning_form_my' id='menu_report_account_analytic_planning_my2'/>
+        <menuitem action="action_account_analytic_planning_form_my" id="menu_report_account_analytic_planning_my2" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
         
-        <record id='action_account_analytic_planning_form_current_my' model='ir.actions.act_window'>
-            <field name='name'>My Current Planning</field>
-            <field name='res_model'>report_account_analytic.planning</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid),('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
+        <record id="action_account_analytic_planning_form_current_my" model="ir.actions.act_window">
+            <field name="name">My Current Planning</field>
+            <field name="res_model">report_account_analytic.planning</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
         </record>
-        <menuitem name='Human Resources/Planning/Planning/My Current Planning' action='action_account_analytic_planning_form_current_my' id='menu_report_account_analytic_planning_current_my'/>
+        <menuitem action="action_account_analytic_planning_form_current_my" id="menu_report_account_analytic_planning_current_my" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
         
         
-        <record id='action_account_analytic_planning_form_current' model='ir.actions.act_window'>
-            <field name='name'>Current Planning</field>
-            <field name='res_model'>report_account_analytic.planning</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
+        <record id="action_account_analytic_planning_form_current" model="ir.actions.act_window">
+            <field name="name">Current Planning</field>
+            <field name="res_model">report_account_analytic.planning</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
         </record>
-        <menuitem name='Human Resources/Planning/Planning/Current Planning' action='action_account_analytic_planning_form_current' id='menu_report_account_analytic_planning_current'/>
+        <menuitem action="action_account_analytic_planning_form_current" id="menu_report_account_analytic_planning_current" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
         
         
         
         <!--
 	Planning statistics
 -->
-        <record id='account_analytic_planning_stat_view_form' model='ir.ui.view'>
-            <field name='name'>report.account.analytic.planning.stat.form</field>
-            <field name='model'>report_account_analytic.planning.stat</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Planning statistics'>
-                    <field name='planning_id' select='1'/>
-                    <field name='user_id' select='1'/>
-                    <field name='account_id' select='1'/>
+        <record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.stat.form</field>
+            <field name="model">report_account_analytic.planning.stat</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Planning statistics">
+                    <field name="planning_id" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="account_id" select="1"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='account_analytic_planning_stat_view_tree' model='ir.ui.view'>
-            <field name='name'>report.account.analytic.planning.stat.tree</field>
-            <field name='model'>report_account_analytic.planning.stat</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Planning statistics'>
-                    <field name='planning_id'/>
-                    <field name='user_id'/>
-                    <field name='manager_id'/>
-                    <field name='account_id'/>
-                    <field name='sum_amount'/>
-                    <field name='sum_amount_real'/>
-                    <field name='sum_amount_tasks'/>
+        <record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.stat.tree</field>
+            <field name="model">report_account_analytic.planning.stat</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Planning statistics">
+                    <field name="planning_id"/>
+                    <field name="user_id"/>
+                    <field name="manager_id"/>
+                    <field name="account_id"/>
+                    <field name="sum_amount"/>
+                    <field name="sum_amount_real"/>
+                    <field name="sum_amount_tasks"/>
                 </tree>
             </field>
         </record>
         
-        <record id='account_analytic_planning_stat_view_graph' model='ir.ui.view'>
-            <field name='name'>report.account.analytic.planning.stat.graph</field>
-            <field name='model'>report_account_analytic.planning.stat</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' string='Planning statistics'>
-                    <field name='account_id'/>
-                    <field name='sum_amount' operator='+'/>
-                    <field name='sum_amount_real' operator='+'/>
-                    <field name='sum_amount_tasks' operator='+'/>
+        <record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.stat.graph</field>
+            <field name="model">report_account_analytic.planning.stat</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Planning statistics" type="bar">
+                    <field name="account_id"/>
+                    <field name="sum_amount" operator="+"/>
+                    <field name="sum_amount_real" operator="+"/>
+                    <field name="sum_amount_tasks" operator="+"/>
                 </graph>
             </field>
         </record>
         
         
         
-        <record id='action_account_analytic_planning_stat_form' model='ir.actions.act_window'>
-            <field name='name'>Planning Statistics</field>
-            <field name='res_model'>report_account_analytic.planning.stat</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
+            <field name="name">Planning Statistics</field>
+            <field name="res_model">report_account_analytic.planning.stat</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Human Resources/Reporting/Planning/Planning Statistics' action='action_account_analytic_planning_stat_form' id='menu_report_account_analytic_planning_stat'/>
+        <menuitem id="next_id_85" name="Planning" parent="hr.menu_hr_reporting"/><menuitem action="action_account_analytic_planning_stat_form" id="menu_report_account_analytic_planning_stat" parent="next_id_85"/>
         
-        <record id='action_account_analytic_planning_stat_my_form' model='ir.actions.act_window'>
-            <field name='name'>My Planning Statistics</field>
-            <field name='res_model'>report_account_analytic.planning.stat</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('user_id','=',uid),('planning_id.state','=','open')]</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_account_analytic_planning_stat_my_form" model="ir.actions.act_window">
+            <field name="name">My Planning Statistics</field>
+            <field name="res_model">report_account_analytic.planning.stat</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('user_id','=',uid),('planning_id.state','=','open')]</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Human Resources/Reporting/Planning/My Planning Statistics' action='action_account_analytic_planning_stat_my_form' id='menu_report_account_analytic_planning_stat_my'/>
+        <menuitem action="action_account_analytic_planning_stat_my_form" id="menu_report_account_analytic_planning_stat_my" parent="report_analytic_planning.next_id_85"/>
         
-        <record id='action_account_analytic_planning_stat_my_manager_form' model='ir.actions.act_window'>
-            <field name='name'>Planning Statistics of My Projects</field>
-            <field name='res_model'>report_account_analytic.planning.stat</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('manager_id','=',uid),('planning_id.state','=','open')]</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_account_analytic_planning_stat_my_manager_form" model="ir.actions.act_window">
+            <field name="name">Planning Statistics of My Projects</field>
+            <field name="res_model">report_account_analytic.planning.stat</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('manager_id','=',uid),('planning_id.state','=','open')]</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Human Resources/Reporting/Planning/Planning Statistics of My Projects' action='action_account_analytic_planning_stat_my_manager_form' id='menu_report_account_analytic_planning_stat_my_manager'/>
+        <menuitem action="action_account_analytic_planning_stat_my_manager_form" id="menu_report_account_analytic_planning_stat_my_manager" parent="report_analytic_planning.next_id_85"/>
         
         
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index f6fb594a4b1..1e3b5a15e90 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
@@ -6,150 +6,150 @@
 	Cases by user and section
 	-->
         
-        <record id='view_crm_case_user_tree' model='ir.ui.view'>
-            <field name='name'>report.crm.case.user.tree</field>
-            <field name='model'>report.crm.case.user</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Cases by User and Section'>
-                    <field name='name'/>
-                    <field name='user_id'/>
-                    <field name='section_id'/>
-                    <field name='nbr'/>
-                    <field name='delay_close'/>
-                    <field name='amount_revenue'/>
-                    <field name='amount_costs'/>
-                    <field name='amount_revenue_prob'/>
-                    <field name='probability'/>
-                    <field name='state'/>
+        <record id="view_crm_case_user_tree" model="ir.ui.view">
+            <field name="name">report.crm.case.user.tree</field>
+            <field name="model">report.crm.case.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Cases by User and Section">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="section_id"/>
+                    <field name="nbr"/>
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='view_crm_case_user_form' model='ir.ui.view'>
-            <field name='name'>report.crm.case.user.form</field>
-            <field name='model'>report.crm.case.user</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Cases by User and Section'>
-                    <field name='name' select='1'/>
-                    <field name='user_id' select='1'/>
-                    <field name='section_id' select='1'/>
-                    <field name='nbr' select='1'/>
-                    <field name='state' select='1'/>
+        <record id="view_crm_case_user_form" model="ir.ui.view">
+            <field name="name">report.crm.case.user.form</field>
+            <field name="model">report.crm.case.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cases by User and Section">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="section_id" select="1"/>
+                    <field name="nbr" select="1"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_crm_case_user_graph' model='ir.ui.view'>
-            <field name='name'>report.crm.case.user.graph</field>
-            <field name='model'>report.crm.case.user</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' orientation='horizontal' string='Cases by User and Section'>
-                    <field name='state'/>
-                    <field name='nbr' operator='+'/>
-                    <field name='user_id' group='True'/>
+        <record id="view_crm_case_user_graph" model="ir.ui.view">
+            <field name="name">report.crm.case.user.graph</field>
+            <field name="model">report.crm.case.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Cases by User and Section" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
                 </graph>
             </field>
         </record>
         
         
-        <record id='action_report_crm_case_user_tree_month' model='ir.actions.act_window'>
-            <field name='name'>Cases by user and section (this month)</field>
-            <field name='res_model'>report.crm.case.user</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,graph</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_report_crm_case_user_tree_month" model="ir.actions.act_window">
+            <field name="name">Cases by user and section (this month)</field>
+            <field name="res_model">report.crm.case.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
         
-        <menuitem name='CRM &amp; SRM/Reporting/This Month/Cases by User and Section' action='action_report_crm_case_user_tree_month' id='menu_crm_case_user_tree_month'/>
+        <menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm"/><menuitem id="next_id_65" name="This Month" parent="next_id_64"/><menuitem action="action_report_crm_case_user_tree_month" id="menu_crm_case_user_tree_month" parent="next_id_65"/>
         
-        <record id='action_report_crm_case_user_tree' model='ir.actions.act_window'>
-            <field name='name'>Cases by User and Section</field>
-            <field name='res_model'>report.crm.case.user</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
+        <record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
+            <field name="name">Cases by User and Section</field>
+            <field name="res_model">report.crm.case.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Reporting/All Months/Cases by User and Section' action='action_report_crm_case_user_tree' id='menu_crm_case_user_tree'/>
+        <menuitem id="next_id_66" name="All Months" parent="report_crm.next_id_64"/><menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="next_id_66"/>
         
-        <record id='action_report_crm_case_user_tree_month_my' model='ir.actions.act_window'>
-            <field name='name'>My cases by section (this month)</field>
-            <field name='res_model'>report.crm.case.user</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('user_id','=',uid),('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_report_crm_case_user_tree_month_my" model="ir.actions.act_window">
+            <field name="name">My cases by section (this month)</field>
+            <field name="res_model">report.crm.case.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('user_id','=',uid),('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Reporting/This Month/My Cases by Section' action='action_report_crm_case_user_tree_month_my' id='menu_crm_case_user_tree_month_my'/>
+        <menuitem action="action_report_crm_case_user_tree_month_my" id="menu_crm_case_user_tree_month_my" parent="report_crm.next_id_65"/>
         
-        <record id='action_report_crm_case_user_tree_my' model='ir.actions.act_window'>
-            <field name='name'>My cases by section</field>
-            <field name='res_model'>report.crm.case.user</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="action_report_crm_case_user_tree_my" model="ir.actions.act_window">
+            <field name="name">My cases by section</field>
+            <field name="res_model">report.crm.case.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Reporting/All Months/My Cases by Section' action='action_report_crm_case_user_tree_my' id='menu_crm_case_user_tree_my'/>
+        <menuitem action="action_report_crm_case_user_tree_my" id="menu_crm_case_user_tree_my" parent="report_crm.next_id_66"/>
         
         <!-- # Cases by section and categoryof case -->
         
-        <record id='view_crm_case_categ_tree' model='ir.ui.view'>
-            <field name='name'>report.crm.case.categ.tree</field>
-            <field name='model'>report.crm.case.categ</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Cases by User and Section'>
-                    <field name='name'/>
-                    <field name='categ_id'/>
-                    <field name='section_id'/>
-                    <field name='nbr'/>
-                    <field name='delay_close'/>
-                    <field name='amount_revenue'/>
-                    <field name='amount_costs'/>
-                    <field name='amount_revenue_prob'/>
-                    <field name='probability'/>
-                    <field name='state'/>
+        <record id="view_crm_case_categ_tree" model="ir.ui.view">
+            <field name="name">report.crm.case.categ.tree</field>
+            <field name="model">report.crm.case.categ</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Cases by User and Section">
+                    <field name="name"/>
+                    <field name="categ_id"/>
+                    <field name="section_id"/>
+                    <field name="nbr"/>
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='view_crm_case_categ_form' model='ir.ui.view'>
-            <field name='name'>report.crm.case.categ.form</field>
-            <field name='model'>report.crm.case.categ</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Cases by User and Section'>
-                    <field name='name' select='1'/>
-                    <field name='categ_id' select='1'/>
-                    <field name='section_id' select='1'/>
-                    <field name='nbr' select='1'/>
-                    <field name='state' select='1'/>
+        <record id="view_crm_case_categ_form" model="ir.ui.view">
+            <field name="name">report.crm.case.categ.form</field>
+            <field name="model">report.crm.case.categ</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cases by User and Section">
+                    <field name="name" select="1"/>
+                    <field name="categ_id" select="1"/>
+                    <field name="section_id" select="1"/>
+                    <field name="nbr" select="1"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='action_report_crm_case_categ_tree_month' model='ir.actions.act_window'>
-            <field name='name'>Cases by categories and section (this month)</field>
-            <field name='res_model'>report.crm.case.categ</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_report_crm_case_categ_tree_month" model="ir.actions.act_window">
+            <field name="name">Cases by categories and section (this month)</field>
+            <field name="res_model">report.crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Reporting/This Month/Cases by Categories and Section' action='action_report_crm_case_categ_tree_month' id='menu_crm_case_categ_tree_month'/>
-        <record id='action_report_crm_case_categ_tree' model='ir.actions.act_window'>
-            <field name='name'>Cases by Categories and Section</field>
-            <field name='res_model'>report.crm.case.categ</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
+        <menuitem action="action_report_crm_case_categ_tree_month" id="menu_crm_case_categ_tree_month" parent="report_crm.next_id_65"/>
+        <record id="action_report_crm_case_categ_tree" model="ir.actions.act_window">
+            <field name="name">Cases by Categories and Section</field>
+            <field name="res_model">report.crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
         </record>
-        <menuitem name='CRM &amp; SRM/Reporting/All Months/Cases by Categories and Section' action='action_report_crm_case_categ_tree' id='menu_crm_case_categ_tree'/>
+        <menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="report_crm.next_id_66"/>
         
-        <act_window name='Monthly cases' domain='[(&apos;user_id&apos;, &apos;=&apos;, active_id)]' id='act_res_users_2_report_crm_case_user' src_model='res.users' res_model='report.crm.case.user'/>
+        <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="report.crm.case.user" src_model="res.users"/>
         
-        <act_window name='Monthly cases by user' domain='[(&apos;section_id&apos;, &apos;=&apos;, active_id)]' id='act_crm_case_section_2_report_crm_case_user' src_model='crm.case.section' res_model='report.crm.case.user'/>
+        <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_user" name="Monthly cases by user" res_model="report.crm.case.user" src_model="crm.case.section"/>
         
-        <act_window name='Monthly cases' domain='[(&apos;crm.case.categ&apos;, &apos;=&apos;, active_id)]' id='act_crm_case_categ_2_report_crm_case_categ' src_model='crm.case.categ' res_model='report.crm.case.categ'/>
+        <act_window domain="[('crm.case.categ', '=', active_id)]" id="act_crm_case_categ_2_report_crm_case_categ" name="Monthly cases" res_model="report.crm.case.categ" src_model="crm.case.categ"/>
         
-        <act_window name='Monthly cases by section' domain='[(&apos;section_id&apos;, &apos;=&apos;, active_id)]' id='act_crm_case_section_2_report_crm_case_categ' src_model='crm.case.section' res_model='report.crm.case.categ'/>
+        <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_categ" name="Monthly cases by section" res_model="report.crm.case.categ" src_model="crm.case.section"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_intrastat/report_intrastat_data.xml b/addons/report_intrastat/report_intrastat_data.xml
index f1e609ad432..ea0f6b56526 100644
--- a/addons/report_intrastat/report_intrastat_data.xml
+++ b/addons/report_intrastat/report_intrastat_data.xml
@@ -1,77 +1,77 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
-        <record model="res.country" id="base.de">
-            <field name="intrastat" eval="True"/>
+        <record id="base.de" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.at">
-            <field name="intrastat" eval="True"/>
+        <record id="base.at" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.cy">
-            <field name="intrastat" eval="True"/>
+        <record id="base.cy" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.dk">
-            <field name="intrastat" eval="True"/>
+        <record id="base.dk" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.es">
-            <field name="intrastat" eval="True"/>
+        <record id="base.es" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.ee">
-            <field name="intrastat" eval="True"/>
+        <record id="base.ee" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.fi">
-            <field name="intrastat" eval="True"/>
+        <record id="base.fi" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.fr">
-            <field name="intrastat" eval="True"/>
+        <record id="base.fr" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.gr">
-            <field name="intrastat" eval="True"/>
+        <record id="base.gr" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.hu">
-            <field name="intrastat" eval="True"/>
+        <record id="base.hu" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.ie">
-            <field name="intrastat" eval="True"/>
+        <record id="base.ie" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.it">
-            <field name="intrastat" eval="True"/>
+        <record id="base.it" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.lv">
-            <field name="intrastat" eval="True"/>
+        <record id="base.lv" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.lt">
-            <field name="intrastat" eval="True"/>
+        <record id="base.lt" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.lu">
-            <field name="intrastat" eval="True"/>
+        <record id="base.lu" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.mt">
-            <field name="intrastat" eval="True"/>
+        <record id="base.mt" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.nl">
-            <field name="intrastat" eval="True"/>
+        <record id="base.nl" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.pl">
-            <field name="intrastat" eval="True"/>
+        <record id="base.pl" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.pt">
-            <field name="intrastat" eval="True"/>
+        <record id="base.pt" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.sk">
-            <field name="intrastat" eval="True"/>
+        <record id="base.sk" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.cz">
-            <field name="intrastat" eval="True"/>
+        <record id="base.cz" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.uk">
-            <field name="intrastat" eval="True"/>
+        <record id="base.uk" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.si">
-            <field name="intrastat" eval="True"/>
+        <record id="base.si" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
-        <record model="res.country" id="base.se">
-            <field name="intrastat" eval="True"/>
+        <record id="base.se" model="res.country">
+            <field eval="True" name="intrastat"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index cb88957b584..dee6972d1a8 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -1,111 +1,111 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!-- Country -->
-        <record id='view_country_tree' model='ir.ui.view'>
-            <field name='name'>res.country.tree</field>
-            <field name='model'>res.country</field>
-            <field name='inherit_id' ref='base.view_country_tree'/>
-            <field name='arch' type='xml'>
-                <field name='code' position='after'>
-                    <field name='intrastat'/>
+        <record id="view_country_tree" model="ir.ui.view">
+            <field name="name">res.country.tree</field>
+            <field name="model">res.country</field>
+            <field name="inherit_id" ref="base.view_country_tree"/>
+            <field name="arch" type="xml">
+                <field name="code" position="after">
+                    <field name="intrastat"/>
                 </field>
             </field>
         </record>
         
-        <record id='view_country_form' model='ir.ui.view'>
-            <field name='name'>res.country.form</field>
-            <field name='model'>res.country</field>
-            <field name='inherit_id' ref='base.view_country_form'/>
-            <field name='arch' type='xml'>
-                <field name='code' position='after'>
-                    <field name='intrastat' select='1'/>
+        <record id="view_country_form" model="ir.ui.view">
+            <field name="name">res.country.form</field>
+            <field name="model">res.country</field>
+            <field name="inherit_id" ref="base.view_country_form"/>
+            <field name="arch" type="xml">
+                <field name="code" position="after">
+                    <field name="intrastat" select="1"/>
                 </field>
             </field>
         </record>
         
         <!-- Product -->
-        <record id='product_normal_form_view' model='ir.ui.view'>
-            <field name='name'>product.normal.form</field>
-            <field name='model'>product.product</field>
-            <field name='inherit_id' ref='product.product_normal_form_view'/>
-            <field name='arch' type='xml'>
-                <field name='product_manager' position='after'>
-                    <field name='intrastat_id'/>
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <field name="product_manager" position="after">
+                    <field name="intrastat_id"/>
                 </field>
             </field>
         </record>
         
         <!-- Intrastat code -->
-        <record id='view_report_intrastat_code_tree' model='ir.ui.view'>
-            <field name='name'>report.intrastat.code.tree</field>
-            <field name='model'>report.intrastat.code</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Intrastat code'>
-                    <field name='name'/>
-                    <field name='description'/>
+        <record id="view_report_intrastat_code_tree" model="ir.ui.view">
+            <field name="name">report.intrastat.code.tree</field>
+            <field name="model">report.intrastat.code</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Intrastat code">
+                    <field name="name"/>
+                    <field name="description"/>
                 </tree>
             </field>
         </record>
-        <record id='view_report_intrastat_code_form' model='ir.ui.view'>
-            <field name='name'>report.intrastat.code.form</field>
-            <field name='model'>report.intrastat.code</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Intrastat code'>
-                    <field name='name' select='1'/>
-                    <field name='description' select='1'/>
+        <record id="view_report_intrastat_code_form" model="ir.ui.view">
+            <field name="name">report.intrastat.code.form</field>
+            <field name="model">report.intrastat.code</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Intrastat code">
+                    <field name="name" select="1"/>
+                    <field name="description" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='action_report_intrastat_code_tree' model='ir.actions.act_window'>
-            <field name='name'>Intrastat Code</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>report.intrastat.code</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_report_intrastat_code_tree" model="ir.actions.act_window">
+            <field name="name">Intrastat Code</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">report.intrastat.code</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
         
-        <menuitem name='Products/Configuration/Intrastat Code' action='action_report_intrastat_code_tree' id='menu_report_intrastat_code'/>
+        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.menu_config_product"/>
         
         
-        <record id='view_report_intrastat_tree' model='ir.ui.view'>
-            <field name='name'>report.intrastat.view</field>
-            <field name='model'>report.intrastat</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Intrastat Data'>
-                    <field name='name'/>
-                    <field name='code'/>
-                    <field name='intrastat_id'/>
-                    <field name='weight'/>
-                    <field name='value'/>
-                    <field name='currency_id'/>
-                    <field name='type'/>
+        <record id="view_report_intrastat_tree" model="ir.ui.view">
+            <field name="name">report.intrastat.view</field>
+            <field name="model">report.intrastat</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Intrastat Data">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="intrastat_id"/>
+                    <field name="weight"/>
+                    <field name="value"/>
+                    <field name="currency_id"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_report_intrastat_tree' model='ir.actions.act_window'>
-            <field name='name'>Intrastat (this month)</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>report.intrastat</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_report_intrastat_tree" model="ir.actions.act_window">
+            <field name="name">Intrastat (this month)</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">report.intrastat</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
         
-        <menuitem name='Stock Management/Reporting/This Month/Intrastat' action='action_report_intrastat_tree' id='menu_report_intrastat'/>
+        <menuitem id="next_id_89" name="This Month" parent="report_stock.next_id_61"/><menuitem action="action_report_intrastat_tree" id="menu_report_intrastat" parent="next_id_89"/>
         
-        <record id='action_report_intrastat_tree_all' model='ir.actions.act_window'>
-            <field name='name'>Intrastat</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>report.intrastat</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
+        <record id="action_report_intrastat_tree_all" model="ir.actions.act_window">
+            <field name="name">Intrastat</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">report.intrastat</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
         </record>
         
-        <menuitem name='Stock Management/Reporting/All Months/Intrastat' action='action_report_intrastat_tree_all' id='menu_report_intrastat_all'/>
+        <menuitem id="next_id_90" name="All Months" parent="report_stock.next_id_61"/><menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="next_id_90"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index 18450747d6e..acff24d5c2d 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -1,108 +1,105 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='view_workcenter_load_tree' model='ir.ui.view'>
-            <field name='name'>report.workcenter.load.tree</field>
-            <field name='model'>report.workcenter.load</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Workcenters load'>
-                    <field name='name' select='1'/>
-                    <field name='workcenter_id' select='1'/>
-                    <field name='cycle'/>
-                    <field name='hour'/>
+        <record id="view_workcenter_load_tree" model="ir.ui.view">
+            <field name="name">report.workcenter.load.tree</field>
+            <field name="model">report.workcenter.load</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Workcenters load">
+                    <field name="name" select="1"/>
+                    <field name="workcenter_id" select="1"/>
+                    <field name="cycle"/>
+                    <field name="hour"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_workcenter_load_graph' model='ir.ui.view'>
-            <field name='name'>report.workcenter.load.graph</field>
-            <field name='model'>report.workcenter.load</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' string='Workcenter load'>
-                    <field name='name'/>
-                    <field name='cycle' operator='+'/>
-                    <field name='hour' operator='+'/>
-                    <field name='workcenter_id' group='True'/>
+        <record id="view_workcenter_load_graph" model="ir.ui.view">
+            <field name="name">report.workcenter.load.graph</field>
+            <field name="model">report.workcenter.load</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Workcenter load" type="bar">
+                    <field name="name"/>
+                    <field name="cycle" operator="+"/>
+                    <field name="hour" operator="+"/>
+                    <field group="True" name="workcenter_id"/>
                 </graph>
             </field>
         </record>
         
         
-        <record id='view_workcenter_load_form' model='ir.ui.view'>
-            <field name='name'>report.workcenter.load.form</field>
-            <field name='model'>report.workcenter.load</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form type='bar' string='Workcenter load'>
-                    <field name='name' select='1'/>
-                    <field name='workcenter_id' select='1'/>
-                    <field name='cycle'/>
-                    <field name='hour'/>
+        <record id="view_workcenter_load_form" model="ir.ui.view">
+            <field name="name">report.workcenter.load.form</field>
+            <field name="model">report.workcenter.load</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Workcenter load" type="bar">
+                    <field name="name" select="1"/>
+                    <field name="workcenter_id" select="1"/>
+                    <field name="cycle"/>
+                    <field name="hour"/>
                 </form>
             </field>
         </record>
-        <record id='action_report_workcenter_load_tree' model='ir.actions.act_window'>
-            <field name='name'>Workcenter Loads</field>
-            <field name='res_model'>report.workcenter.load</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_report_workcenter_load_tree" model="ir.actions.act_window">
+            <field name="name">Workcenter Loads</field>
+            <field name="res_model">report.workcenter.load</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Production Management/Reporting/Workcenter Loads' action='action_report_workcenter_load_tree' id='menu_report_workcenter_load'/>
+        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root"/><menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
         
         <!-- stock.move compared to internal location src/dest -->
         
-        <record id='view_report_in_out_picking_tree' model='ir.ui.view'>
-            <field name='name'>report.mrp.inout.tree</field>
-            <field name='model'>report.mrp.inout</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Stock value variation'>
-                    <field name='date'/>
-                    <field name='value'/>
+        <record id="view_report_in_out_picking_tree" model="ir.ui.view">
+            <field name="name">report.mrp.inout.tree</field>
+            <field name="model">report.mrp.inout</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock value variation">
+                    <field name="date"/>
+                    <field name="value"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_report_in_out_picking_form' model='ir.ui.view'>
-            <field name='name'>report.mrp.inout.form</field>
-            <field name='model'>report.mrp.inout</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form type='bar' string='Stock value variation'>
-                    <field name='date' select='1'/>
-                    <field name='value' select='1'/>
+        <record id="view_report_in_out_picking_form" model="ir.ui.view">
+            <field name="name">report.mrp.inout.form</field>
+            <field name="model">report.mrp.inout</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock value variation" type="bar">
+                    <field name="date" select="1"/>
+                    <field name="value" select="1"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='view_report_in_out_picking_graph' model='ir.ui.view'>
-            <field name='name'>report.mrp.inout.graph</field>
-            <field name='model'>report.mrp.inout</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' string='Stock value variation'>
-                    <field name='date'/>
-                    <field name='value' operator='+'/>
+        <record id="view_report_in_out_picking_graph" model="ir.ui.view">
+            <field name="name">report.mrp.inout.graph</field>
+            <field name="model">report.mrp.inout</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Stock value variation" type="bar">
+                    <field name="date"/>
+                    <field name="value" operator="+"/>
                 </graph>
             </field>
         </record>
         
-        <record id='action_report_in_out_picking_tree' model='ir.actions.act_window'>
-            <field name='name'>Weekly Stock Value Variation</field>
-            <field name='res_model'>report.mrp.inout</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_report_in_out_picking_tree" model="ir.actions.act_window">
+            <field name="name">Weekly Stock Value Variation</field>
+            <field name="res_model">report.mrp.inout</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Production Management/Reporting/Weekly Stock Value Variation' action='action_report_in_out_picking_tree' id='menu_report_in_out_picking'/>
+        <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="report_mrp.next_id_77"/>
         
         
         
     </data>
-</terp>
-
-
-
+</terp>
\ No newline at end of file
diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml
index f7058c2cc12..6963ec75fe6 100644
--- a/addons/report_project/report_project_view.xml
+++ b/addons/report_project/report_project_view.xml
@@ -1,111 +1,111 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
         <!-- Tasks by projects and users -->
-        <record id='view_task_project_user_form' model='ir.ui.view'>
-            <field name='name'>report.project.task.user.form</field>
-            <field name='model'>report.project.task.user</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Tasks by Project and User'>
-                    <field name='name' select='1'/>
-                    <field name='user_id' select='1'/>
-                    <field name='project_id' select='1'/>
-                    <field name='task_closed' select='1'/>
-                    <field name='hours_planned' select='1'/>
-                    <field name='hours_effective' select='1'/>
-                    <field name='hours_delay' select='1'/>
-                    <field name='closing_days'/>
+        <record id="view_task_project_user_form" model="ir.ui.view">
+            <field name="name">report.project.task.user.form</field>
+            <field name="model">report.project.task.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Tasks by Project and User">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="project_id" select="1"/>
+                    <field name="task_closed" select="1"/>
+                    <field name="hours_planned" select="1"/>
+                    <field name="hours_effective" select="1"/>
+                    <field name="hours_delay" select="1"/>
+                    <field name="closing_days"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='view_task_project_user_tree' model='ir.ui.view'>
-            <field name='name'>report.project.task.user.tree</field>
-            <field name='model'>report.project.task.user</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Tasks by projects and users'>
-                    <field name='name' select='1'/>
-                    <field name='user_id' select='1'/>
-                    <field name='project_id' select='1'/>
-                    <field name='task_closed' select='1'/>
-                    <field name='hours_planned' select='1'/>
-                    <field name='hours_effective' select='1'/>
-                    <field name='hours_delay' select='1'/>
-                    <field name='closing_days'/>
+        <record id="view_task_project_user_tree" model="ir.ui.view">
+            <field name="name">report.project.task.user.tree</field>
+            <field name="model">report.project.task.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tasks by projects and users">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="project_id" select="1"/>
+                    <field name="task_closed" select="1"/>
+                    <field name="hours_planned" select="1"/>
+                    <field name="hours_effective" select="1"/>
+                    <field name="hours_delay" select="1"/>
+                    <field name="closing_days"/>
                 </tree>
             </field>
         </record>
-        <record id='action_project_task_user_tree_month' model='ir.actions.act_window'>
-            <field name='name'>Tasks finnished by project and user (this month)</field>
-            <field name='res_model'>report.project.task.user</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_project_task_user_tree_month" model="ir.actions.act_window">
+            <field name="name">Tasks finnished by project and user (this month)</field>
+            <field name="res_model">report.project.task.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='Project Management/Reporting/This Month/Tasks Finnished This Month by Project and User' action='action_project_task_user_tree_month' id='menu_project_task_user_tree_month'/>
+        <menuitem id="next_id_63" name="This Month" parent="report_task.next_id_57"/><menuitem action="action_project_task_user_tree_month" id="menu_project_task_user_tree_month" parent="next_id_63"/>
         
-        <record id='action_project_task_user_tree' model='ir.actions.act_window'>
-            <field name='name'>Tasks Closed by Project and User</field>
-            <field name='res_model'>report.project.task.user</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
+        <record id="action_project_task_user_tree" model="ir.actions.act_window">
+            <field name="name">Tasks Closed by Project and User</field>
+            <field name="res_model">report.project.task.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
         </record>
-        <menuitem name='Project Management/Reporting/All Months/Tasks Closed by Project and User' action='action_project_task_user_tree' id='menu_project_task_user_tree'/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="report_task.next_id_58"/>
         
         <!-- Tasks by projects -->
         
-        <record id='view_task_project_form' model='ir.ui.view'>
-            <field name='name'>report.project.task.form</field>
-            <field name='model'>report.project.task</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Tasks by Project'>
-                    <field name='name' select='1'/>
-                    <field name='project_id' select='1'/>
-                    <field name='task_closed' select='1'/>
-                    <field name='hours_planned' select='1'/>
-                    <field name='hours_effective' select='1'/>
-                    <field name='hours_delay' select='1'/>
-                    <field name='closing_days'/>
+        <record id="view_task_project_form" model="ir.ui.view">
+            <field name="name">report.project.task.form</field>
+            <field name="model">report.project.task</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Tasks by Project">
+                    <field name="name" select="1"/>
+                    <field name="project_id" select="1"/>
+                    <field name="task_closed" select="1"/>
+                    <field name="hours_planned" select="1"/>
+                    <field name="hours_effective" select="1"/>
+                    <field name="hours_delay" select="1"/>
+                    <field name="closing_days"/>
                 </form>
             </field>
         </record>
-        <record id='view_task_project_tree' model='ir.ui.view'>
-            <field name='name'>report.project.task.tree</field>
-            <field name='model'>report.project.task</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Tasks by project'>
-                    <field name='name' select='1'/>
-                    <field name='project_id' select='1'/>
-                    <field name='task_closed' select='1'/>
-                    <field name='hours_planned' select='1'/>
-                    <field name='hours_effective' select='1'/>
-                    <field name='hours_delay' select='1'/>
-                    <field name='closing_days'/>
+        <record id="view_task_project_tree" model="ir.ui.view">
+            <field name="name">report.project.task.tree</field>
+            <field name="model">report.project.task</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tasks by project">
+                    <field name="name" select="1"/>
+                    <field name="project_id" select="1"/>
+                    <field name="task_closed" select="1"/>
+                    <field name="hours_planned" select="1"/>
+                    <field name="hours_effective" select="1"/>
+                    <field name="hours_delay" select="1"/>
+                    <field name="closing_days"/>
                 </tree>
             </field>
         </record>
-        <record id='action_project_task_tree_month' model='ir.actions.act_window'>
-            <field name='name'>Tasks finnished by project (this month)</field>
-            <field name='res_model'>report.project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_project_task_tree_month" model="ir.actions.act_window">
+            <field name="name">Tasks finnished by project (this month)</field>
+            <field name="res_model">report.project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='Project Management/Reporting/This Month/Tasks Finnished This Month by Project' action='action_project_task_tree_month' id='menu_project_task_tree_month'/>
+        <menuitem action="action_project_task_tree_month" id="menu_project_task_tree_month" parent="report_project.next_id_63"/>
         
-        <record id='action_project_task_tree' model='ir.actions.act_window'>
-            <field name='name'>Tasks Closed by Project</field>
-            <field name='res_model'>report.project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
+        <record id="action_project_task_tree" model="ir.actions.act_window">
+            <field name="name">Tasks Closed by Project</field>
+            <field name="res_model">report.project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
         </record>
-        <menuitem name='Project Management/Reporting/All Months/Tasks Closed by Project' action='action_project_task_tree' id='menu_project_task_tree'/>
+        <menuitem action="action_project_task_tree" id="menu_project_task_tree" parent="report_task.next_id_58"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
index 40629b11617..0744f4705b0 100644
--- a/addons/report_purchase/report_purchase_view.xml
+++ b/addons/report_purchase/report_purchase_view.xml
@@ -1,113 +1,113 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
         <!-- Purchases by products by month -->       
-        <record id='view_order_product_form' model='ir.ui.view'>
-            <field name='name'>report.purchase.order.product.form</field>
-            <field name='model'>report.purchase.order.product</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Purchases by products'>
-                    <field name='name' select='1'/>
-                    <field name='product_id' select='1'/>
-                    <field name='count'/>
-                    <field name='quantity' select='1'/>
-                    <field name='price_total' select='1'/>
-                    <field name='price_average' select='1'/>
-                    <field name='state' select='1'/>
+        <record id="view_order_product_form" model="ir.ui.view">
+            <field name="name">report.purchase.order.product.form</field>
+            <field name="model">report.purchase.order.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Purchases by products">
+                    <field name="name" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="count"/>
+                    <field name="quantity" select="1"/>
+                    <field name="price_total" select="1"/>
+                    <field name="price_average" select="1"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_order_product_tree' model='ir.ui.view'>
-            <field name='name'>report.purchase.order.product.tree</field>
-            <field name='model'>report.purchase.order.product</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Purchases by products'>
-                    <field name='name'/>
-                    <field name='product_id'/>
-                    <field name='count'/>
-                    <field name='quantity'/>
-                    <field name='price_total'/>
-                    <field name='price_average'/>
-                    <field name='state'/>
+        <record id="view_order_product_tree" model="ir.ui.view">
+            <field name="name">report.purchase.order.product.tree</field>
+            <field name="model">report.purchase.order.product</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Purchases by products">
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="count"/>
+                    <field name="quantity"/>
+                    <field name="price_total"/>
+                    <field name="price_average"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_order_product_tree' model='ir.actions.act_window'>
-            <field name='name'>Purchases by Products (this month)</field>
-            <field name='res_model'>report.purchase.order.product</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_order_product_tree" model="ir.actions.act_window">
+            <field name="name">Purchases by Products (this month)</field>
+            <field name="res_model">report.purchase.order.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='Purchase Management/Reporting/This Month/Purchases by Products' action='action_order_product_tree' id='menu_report_order_product'/>
-        <record id='action_order_product_tree_all' model='ir.actions.act_window'>
-            <field name='name'>Purchases by Products</field>
-            <field name='res_model'>report.purchase.order.product</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
+        <menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/><menuitem id="next_id_74" name="This Month" parent="next_id_73"/><menuitem action="action_order_product_tree" id="menu_report_order_product" parent="next_id_74"/>
+        <record id="action_order_product_tree_all" model="ir.actions.act_window">
+            <field name="name">Purchases by Products</field>
+            <field name="res_model">report.purchase.order.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
         </record>
-        <menuitem name='Purchase Management/Reporting/All Months/Purchases by Products' action='action_order_product_tree_all' id='menu_report_order_product_all'/>
+        <menuitem id="next_id_75" name="All Months" parent="report_purchase.next_id_73"/><menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_75"/>
         
         <!-- Purchases by category by month -->
         
-        <record id='view_order_category_form' model='ir.ui.view'>
-            <field name='name'>report.purchase.order.category.form</field>
-            <field name='model'>report.purchase.order.category</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Purchases by Category of Products'>
-                    <field name='name' select='1'/>
-                    <field name='category_id' select='1'/>
-                    <field name='count'/>
-                    <field name='quantity' select='1'/>
-                    <field name='price_total' select='1'/>
-                    <field name='price_average' select='1'/>
-                    <field name='state' select='1'/>
+        <record id="view_order_category_form" model="ir.ui.view">
+            <field name="name">report.purchase.order.category.form</field>
+            <field name="model">report.purchase.order.category</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Purchases by Category of Products">
+                    <field name="name" select="1"/>
+                    <field name="category_id" select="1"/>
+                    <field name="count"/>
+                    <field name="quantity" select="1"/>
+                    <field name="price_total" select="1"/>
+                    <field name="price_average" select="1"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_order_category_tree' model='ir.ui.view'>
-            <field name='name'>report.purchase.order.category.tree</field>
-            <field name='model'>report.purchase.order.category</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Purchases by Category of Products'>
-                    <field name='name'/>
-                    <field name='category_id'/>
-                    <field name='count'/>
-                    <field name='quantity'/>
-                    <field name='price_total'/>
-                    <field name='price_average'/>
-                    <field name='state'/>
+        <record id="view_order_category_tree" model="ir.ui.view">
+            <field name="name">report.purchase.order.category.tree</field>
+            <field name="model">report.purchase.order.category</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Purchases by Category of Products">
+                    <field name="name"/>
+                    <field name="category_id"/>
+                    <field name="count"/>
+                    <field name="quantity"/>
+                    <field name="price_total"/>
+                    <field name="price_average"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_order_category_tree' model='ir.actions.act_window'>
-            <field name='name'>Purchases by Category of Product (this month)</field>
-            <field name='res_model'>report.purchase.order.category</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_order_category_tree" model="ir.actions.act_window">
+            <field name="name">Purchases by Category of Product (this month)</field>
+            <field name="res_model">report.purchase.order.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='Purchase Management/Reporting/This Month/Purchases by Category of Products' action='action_order_category_tree' id='menu_report_order_category'/>
-        <record id='action_order_category_tree_all' model='ir.actions.act_window'>
-            <field name='name'>Purchases by Category of Products</field>
-            <field name='res_model'>report.purchase.order.category</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
+        <menuitem action="action_order_category_tree" id="menu_report_order_category" parent="report_purchase.next_id_74"/>
+        <record id="action_order_category_tree_all" model="ir.actions.act_window">
+            <field name="name">Purchases by Category of Products</field>
+            <field name="res_model">report.purchase.order.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
         </record>
-        <menuitem name='Purchase Management/Reporting/All Months/Purchases by Category of Products' action='action_order_category_tree_all' id='menu_report_order_category_all'/>
+        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_purchase.next_id_75"/>
         
-        <act_window name='Monthly purchases' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id)]' id='act_product_product_2_report_purchases_order_product' src_model='product.product' res_model='report.purchase.order.product'/>
+        <act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_purchases_order_product" name="Monthly purchases" res_model="report.purchase.order.product" src_model="product.product"/>
         
-        <act_window name='Monthly purchases' domain='[(&apos;category_id&apos;, &apos;=&apos;, active_id)]' id='act_product_category_2_report_purchase_order_category' src_model='product.category' res_model='report.purchase.order.category'/>
+        <act_window domain="[('category_id', '=', active_id)]" id="act_product_category_2_report_purchase_order_category" name="Monthly purchases" res_model="report.purchase.order.category" src_model="product.category"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_sale/report_sale_graph.xml b/addons/report_sale/report_sale_graph.xml
index f1e89c7fb80..fa33c5f8b7e 100644
--- a/addons/report_sale/report_sale_graph.xml
+++ b/addons/report_sale/report_sale_graph.xml
@@ -1,95 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <menuitem name='Sales Management/Reporting/All Months/Graphs/Monthly Sales Turnover Over One Year' icon='STOCK_PRINT' id='ir_ui_menu1'/>
-        <menuitem name='Sales Management/Reporting/All Months/Graphs/Daily Sales Turnover Over One Year' icon='STOCK_PRINT' id='ir_ui_menu2'/>
-        <menuitem name='Sales Management/Reporting/All Months/Graphs/Monthly Cumulated Sales Turnover Over One Year' icon='STOCK_PRINT' id='ir_ui_menu3'/>
+        <menuitem id="next_id_83" name="Graphs" parent="report_sale.next_id_82"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83"/>
+        <menuitem icon="STOCK_PRINT" id="ir_ui_menu2" name="Daily Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
+        <menuitem icon="STOCK_PRINT" id="ir_ui_menu3" name="Monthly Cumulated Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
         
         <!-- reports -->
-        <record id='ir_report_custom_4' model='ir.report.custom'>
-            <field name='model_id' search='[(&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model'/>
-            <field name='title'>Monthly sales turnover over one year</field>
-            <field name='name'>Monthly sales turnover over one year</field>
-            <field name='frequency'>M</field>
-            <field name='type'>bar</field>
-            <field name='menu_id' ref='ir_ui_menu1'/>
+        <record id="ir_report_custom_4" model="ir.report.custom">
+            <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
+            <field name="title">Monthly sales turnover over one year</field>
+            <field name="name">Monthly sales turnover over one year</field>
+            <field name="frequency">M</field>
+            <field name="type">bar</field>
+            <field name="menu_id" ref="ir_ui_menu1"/>
         </record>
         
-        <record id='ir_report_custom_5' model='ir.report.custom'>
-            <field name='model_id' search='[(&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model'/>
-            <field name='title'>Daily sales turnover over one year</field>
-            <field name='name'>Daily sales turnover over one year</field>
-            <field name='frequency'>D</field>
-            <field name='type'>bar</field>
-            <field name='menu_id' ref='ir_ui_menu2'/>
+        <record id="ir_report_custom_5" model="ir.report.custom">
+            <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
+            <field name="title">Daily sales turnover over one year</field>
+            <field name="name">Daily sales turnover over one year</field>
+            <field name="frequency">D</field>
+            <field name="type">bar</field>
+            <field name="menu_id" ref="ir_ui_menu2"/>
         </record>
         
-        <record id='ir_report_custom_6' model='ir.report.custom'>
-            <field name='model_id' search='[(&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model'/>
-            <field name='title'>Monthly cumulated sales turnover over one year</field>
-            <field name='name'>Monthly cumulated sales turnover over one year</field>
-            <field name='frequency'>M</field>
-            <field name='type'>bar</field>
-            <field name='menu_id' ref='ir_ui_menu3'/>
+        <record id="ir_report_custom_6" model="ir.report.custom">
+            <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
+            <field name="title">Monthly cumulated sales turnover over one year</field>
+            <field name="name">Monthly cumulated sales turnover over one year</field>
+            <field name="frequency">M</field>
+            <field name="type">bar</field>
+            <field name="menu_id" ref="ir_ui_menu3"/>
         </record>
         
         <!-- fields -->
-        <record id='ir_report_custom_fields_0' model='ir.report.custom.fields'>
-            <field name='field_child0' search='[(&apos;name&apos;,&apos;=&apos;,&apos;date_order&apos;), (&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model.fields'/>
-            <field name='sequence'>1</field>
-            <field name='operation' eval='None'/>
-            <field name='report_id' ref='ir_report_custom_4'/>
-            <field name='name'>order date</field>
-            <field name='groupby'>1</field>
+        <record id="ir_report_custom_fields_0" model="ir.report.custom.fields">
+            <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
+            <field name="sequence">1</field>
+            <field eval="None" name="operation"/>
+            <field name="report_id" ref="ir_report_custom_4"/>
+            <field name="name">order date</field>
+            <field name="groupby">1</field>
         </record>
-        <record id='ir_report_custom_fields_sales' model='ir.report.custom.fields'>
-            <field name='operation'>calc_sum</field>
-            <field name='sequence'>2</field>
-            <field name='field_child1' search='[(&apos;name&apos;,&apos;=&apos;,&apos;price_subtotal&apos;), (&apos;model&apos;,&apos;=&apos;,&apos;sale.order.line&apos;)]' model='ir.model.fields'/>
-            <field name='field_child0' search='[(&apos;name&apos;,&apos;=&apos;,&apos;order_line&apos;), (&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model.fields'/>
-            <field name='report_id' ref='ir_report_custom_4'/>
-            <field name='name'>sales</field>
+        <record id="ir_report_custom_fields_sales" model="ir.report.custom.fields">
+            <field name="operation">calc_sum</field>
+            <field name="sequence">2</field>
+            <field model="ir.model.fields" name="field_child1" search="[('name','=','price_subtotal'), ('model','=','sale.order.line')]"/>
+            <field model="ir.model.fields" name="field_child0" search="[('name','=','order_line'), ('model','=','sale.order')]"/>
+            <field name="report_id" ref="ir_report_custom_4"/>
+            <field name="name">sales</field>
         </record>
         
-        <record id='ir_report_custom_fields_2' model='ir.report.custom.fields'>
-            <field name='field_child0' search='[(&apos;name&apos;,&apos;=&apos;,&apos;date_order&apos;), (&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model.fields'/>
-            <field name='sequence'>1</field>
-            <field name='operation' eval='None'/>
-            <field name='report_id' ref='ir_report_custom_5'/>
-            <field name='name'>order date</field>
-            <field name='groupby'>1</field>
+        <record id="ir_report_custom_fields_2" model="ir.report.custom.fields">
+            <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
+            <field name="sequence">1</field>
+            <field eval="None" name="operation"/>
+            <field name="report_id" ref="ir_report_custom_5"/>
+            <field name="name">order date</field>
+            <field name="groupby">1</field>
         </record>
-        <record id='ir_report_custom_fields_sale' model='ir.report.custom.fields'>
-            <field name='operation'>calc_sum</field>
-            <field name='sequence'>2</field>
-            <field name='field_child1' search='[(&apos;name&apos;,&apos;=&apos;,&apos;price_subtotal&apos;), (&apos;model&apos;,&apos;=&apos;,&apos;sale.order.line&apos;)]' model='ir.model.fields'/>
-            <field name='field_child0' search='[(&apos;name&apos;,&apos;=&apos;,&apos;order_line&apos;),(&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model.fields'/>
-            <field name='cumulate'>1</field>
-            <field name='report_id' ref='ir_report_custom_5'/>
-            <field name='name'>sale</field>
+        <record id="ir_report_custom_fields_sale" model="ir.report.custom.fields">
+            <field name="operation">calc_sum</field>
+            <field name="sequence">2</field>
+            <field model="ir.model.fields" name="field_child1" search="[('name','=','price_subtotal'), ('model','=','sale.order.line')]"/>
+            <field model="ir.model.fields" name="field_child0" search="[('name','=','order_line'),('model','=','sale.order')]"/>
+            <field name="cumulate">1</field>
+            <field name="report_id" ref="ir_report_custom_5"/>
+            <field name="name">sale</field>
         </record>
         
-        <record id='ir_report_custom_fields_1' model='ir.report.custom.fields'>
-            <field name='field_child0' search='[(&apos;name&apos;,&apos;=&apos;,&apos;date_order&apos;), (&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model.fields'/>
-            <field name='sequence'>1</field>
-            <field name='operation'>calc_sum</field>
-            <field name='report_id' ref='ir_report_custom_6'/>
-            <field name='name'>order date</field>
-            <field name='groupby'>1</field>
+        <record id="ir_report_custom_fields_1" model="ir.report.custom.fields">
+            <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
+            <field name="sequence">1</field>
+            <field name="operation">calc_sum</field>
+            <field name="report_id" ref="ir_report_custom_6"/>
+            <field name="name">order date</field>
+            <field name="groupby">1</field>
         </record>
-        <record id='ir_report_custom_fields_sales2' model='ir.report.custom.fields'>
-            <field name='sequence'>2</field>
-            <field name='field_child1' search='[(&apos;name&apos;,&apos;=&apos;,&apos;price_subtotal&apos;), (&apos;model&apos;,&apos;=&apos;,&apos;sale.order.line&apos;)]' model='ir.model.fields'/>
-            <field name='field_child0' search='[(&apos;name&apos;,&apos;=&apos;,&apos;order_line&apos;), (&apos;model&apos;,&apos;=&apos;,&apos;sale.order&apos;)]' model='ir.model.fields'/>
-            <field name='operation'>calc_sum</field>
-            <field name='cumulate'>1</field>
-            <field name='report_id' ref='ir_report_custom_6'/>
-            <field name='name'>sales</field>
+        <record id="ir_report_custom_fields_sales2" model="ir.report.custom.fields">
+            <field name="sequence">2</field>
+            <field model="ir.model.fields" name="field_child1" search="[('name','=','price_subtotal'), ('model','=','sale.order.line')]"/>
+            <field model="ir.model.fields" name="field_child0" search="[('name','=','order_line'), ('model','=','sale.order')]"/>
+            <field name="operation">calc_sum</field>
+            <field name="cumulate">1</field>
+            <field name="report_id" ref="ir_report_custom_6"/>
+            <field name="name">sales</field>
         </record>
         
-        <function name='subscribe' model='ir.report.custom' eval='[[ir_report_custom_4]]'/>
-        <function name='subscribe' model='ir.report.custom' eval='[[ir_report_custom_5]]'/>
-        <function name='subscribe' model='ir.report.custom' eval='[[ir_report_custom_6]]'/>
+        <function eval="[[ir_report_custom_4]]" model="ir.report.custom" name="subscribe"/>
+        <function eval="[[ir_report_custom_5]]" model="ir.report.custom" name="subscribe"/>
+        <function eval="[[ir_report_custom_6]]" model="ir.report.custom" name="subscribe"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 997b36df30b..f68e7cd28f7 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -1,134 +1,134 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
         <!--  Sales by products by month -->
-        <record id='view_order_product_form' model='ir.ui.view'>
-            <field name='name'>report.sale.order.product.form</field>
-            <field name='model'>report.sale.order.product</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Sales by Product'>
-                    <field name='name' select='1'/>
-                    <field name='product_id' select='1'/>
-                    <field name='count'/>
-                    <field name='quantity' select='2'/>
-                    <field name='price_total' select='2'/>
-                    <field name='price_average' select='2'/>
-                    <field name='state' select='1'/>
+        <record id="view_order_product_form" model="ir.ui.view">
+            <field name="name">report.sale.order.product.form</field>
+            <field name="model">report.sale.order.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales by Product">
+                    <field name="name" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="count"/>
+                    <field name="quantity" select="2"/>
+                    <field name="price_total" select="2"/>
+                    <field name="price_average" select="2"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='view_order_product_tree' model='ir.ui.view'>
-            <field name='name'>report.sale.order.product.tree</field>
-            <field name='model'>report.sale.order.product</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Sales by Product'>
-                    <field name='name'/>
-                    <field name='product_id'/>
-                    <field name='count'/>
-                    <field name='quantity'/>
-                    <field name='price_total'/>
-                    <field name='price_average'/>
-                    <field name='state'/>
+        <record id="view_order_product_tree" model="ir.ui.view">
+            <field name="name">report.sale.order.product.tree</field>
+            <field name="model">report.sale.order.product</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sales by Product">
+                    <field name="name"/>
+                    <field name="product_id"/>
+                    <field name="count"/>
+                    <field name="quantity"/>
+                    <field name="price_total"/>
+                    <field name="price_average"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_order_product_tree' model='ir.actions.act_window'>
-            <field name='name'>Sales by Product (this month)</field>
-            <field name='res_model'>report.sale.order.product</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_order_product_tree" model="ir.actions.act_window">
+            <field name="name">Sales by Product (this month)</field>
+            <field name="res_model">report.sale.order.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='Sales Management/Reporting/This Month/Sales by Product' action='action_order_product_tree' id='menu_report_order_product'/>
-        <record id='action_order_product_tree_all' model='ir.actions.act_window'>
-            <field name='name'>Sales by Product</field>
-            <field name='res_model'>report.sale.order.product</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
+        <menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/><menuitem id="next_id_81" name="This Month" parent="next_id_80"/><menuitem action="action_order_product_tree" id="menu_report_order_product" parent="next_id_81"/>
+        <record id="action_order_product_tree_all" model="ir.actions.act_window">
+            <field name="name">Sales by Product</field>
+            <field name="res_model">report.sale.order.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
         </record>
-        <menuitem name='Sales Management/Reporting/All Months/Sales by Product' action='action_order_product_tree_all' id='menu_report_order_product_all'/>
+        <menuitem id="next_id_82" name="All Months" parent="report_sale.next_id_80"/><menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_82"/>
         
         <!-- Sales by category by month -->
         
-        <record id='view_order_category_form' model='ir.ui.view'>
-            <field name='name'>report.sale.order.category.form</field>
-            <field name='model'>report.sale.order.category</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Sales Orders by category'>
-                    <field name='name' select='1'/>
-                    <field name='category_id' select='1'/>
-                    <field name='count'/>
-                    <field name='quantity' select='2'/>
-                    <field name='price_total' select='2'/>
-                    <field name='price_average' select='2'/>
-                    <field name='state' select='1'/>
+        <record id="view_order_category_form" model="ir.ui.view">
+            <field name="name">report.sale.order.category.form</field>
+            <field name="model">report.sale.order.category</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Orders by category">
+                    <field name="name" select="1"/>
+                    <field name="category_id" select="1"/>
+                    <field name="count"/>
+                    <field name="quantity" select="2"/>
+                    <field name="price_total" select="2"/>
+                    <field name="price_average" select="2"/>
+                    <field name="state" select="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_order_category_tree' model='ir.ui.view'>
-            <field name='name'>report.sale.order.category.tree</field>
-            <field name='model'>report.sale.order.category</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Sales by Category of Products'>
-                    <field name='name'/>
-                    <field name='category_id'/>
-                    <field name='count'/>
-                    <field name='quantity'/>
-                    <field name='price_total'/>
-                    <field name='price_average'/>
-                    <field name='state'/>
+        <record id="view_order_category_tree" model="ir.ui.view">
+            <field name="name">report.sale.order.category.tree</field>
+            <field name="model">report.sale.order.category</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sales by Category of Products">
+                    <field name="name"/>
+                    <field name="category_id"/>
+                    <field name="count"/>
+                    <field name="quantity"/>
+                    <field name="price_total"/>
+                    <field name="price_average"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_order_category_graph' model='ir.ui.view'>
-            <field name='name'>report.sale.order.category.graph</field>
-            <field name='model'>report.sale.order.category</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='pie' string='Sales by Category of Products'>
-                    <field name='category_id'/>
-                    <field name='price_average'/>
+        <record id="view_order_category_graph" model="ir.ui.view">
+            <field name="name">report.sale.order.category.graph</field>
+            <field name="model">report.sale.order.category</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Sales by Category of Products" type="pie">
+                    <field name="category_id"/>
+                    <field name="price_average"/>
                 </graph>
             </field>
         </record>
-        <record id='action_order_category_tree' model='ir.actions.act_window'>
-            <field name='name'>Sales by Category of Product (this month)</field>
-            <field name='res_model'>report.sale.order.category</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree</field>
-            <field name='domain'>[('name','=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_order_category_tree" model="ir.actions.act_window">
+            <field name="name">Sales by Category of Product (this month)</field>
+            <field name="res_model">report.sale.order.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='Sales Management/Reporting/This Month/Sales by Category of Products' action='action_order_category_tree' id='menu_report_order_category'/>
-        <record id='action_order_category_tree_all' model='ir.actions.act_window'>
-            <field name='name'>Sales by Category of Products</field>
-            <field name='res_model'>report.sale.order.category</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,graph</field>
+        <menuitem action="action_order_category_tree" id="menu_report_order_category" parent="report_sale.next_id_81"/>
+        <record id="action_order_category_tree_all" model="ir.actions.act_window">
+            <field name="name">Sales by Category of Products</field>
+            <field name="res_model">report.sale.order.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
         </record>
-        <menuitem name='Sales Management/Reporting/All Months/Sales by Category of Products' action='action_order_category_tree_all' id='menu_report_order_category_all'/>
+        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_sale.next_id_82"/>
         
         <!-- Sales of the month -->
-        <record id='action_order_sale_list' model='ir.actions.act_window'>
-            <field name='name'>Sales of the Month</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('date_order','>=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
+        <record id="action_order_sale_list" model="ir.actions.act_window">
+            <field name="name">Sales of the Month</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
         </record>
-        <menuitem name='Sales Management/Reporting/This Month/Sales of the Month' action='action_order_sale_list' id='menu_report_order_sale_list'/>
+        <menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_81"/>
         
         
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_stock/report_stock_view.xml b/addons/report_stock/report_stock_view.xml
index 29cbd8e59dc..8e3d11b4313 100644
--- a/addons/report_stock/report_stock_view.xml
+++ b/addons/report_stock/report_stock_view.xml
@@ -1,36 +1,36 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <record id='report_stock_prodlots_tree' model='ir.ui.view'>
-            <field name='name'>report.stock.prodlots.view</field>
-            <field name='model'>report.stock.prodlots</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Stock by production lots'>
-                    <field name='location_id' select='1'/>
-                    <field name='product_id' select='1'/>
-                    <field name='prodlot_id' select='1'/>
-                    <field name='name'/>
+        <record id="report_stock_prodlots_tree" model="ir.ui.view">
+            <field name="name">report.stock.prodlots.view</field>
+            <field name="model">report.stock.prodlots</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock by production lots">
+                    <field name="location_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="prodlot_id" select="1"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_report_stock_prodlots_form' model='ir.actions.act_window'>
-            <field name='name'>Stock by production lots</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>report.stock.prodlots</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form,tree</field>
+        <record id="action_report_stock_prodlots_form" model="ir.actions.act_window">
+            <field name="name">Stock by production lots</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">report.stock.prodlots</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
         </record>
         
-        <menuitem name='Stock Management/Reporting/Traceability/Stock by Production Lots' action='action_report_stock_prodlots_form' id='menu_report_stock_prodlots'/>
+        <menuitem id="next_id_61" name="Reporting" parent="stock.menu_stock_root"/><menuitem id="next_id_62" name="Traceability" parent="next_id_61"/><menuitem action="action_report_stock_prodlots_form" id="menu_report_stock_prodlots" parent="next_id_62"/>
         
-        <act_window name='Stock by production lots' domain='[(&apos;location_id&apos;, &apos;=&apos;, active_id)]' id='act_stock_location_2_report_stock_prodlots' src_model='stock.location' res_model='report.stock.prodlots'/>
+        <act_window domain="[('location_id', '=', active_id)]" id="act_stock_location_2_report_stock_prodlots" name="Stock by production lots" res_model="report.stock.prodlots" src_model="stock.location"/>
         
-        <act_window name='Stock by production lots' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id)]' id='act_product_product_2_report_stock_prodlots' src_model='product.product' res_model='report.stock.prodlots'/>
+        <act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_stock_prodlots" name="Stock by production lots" res_model="report.stock.prodlots" src_model="product.product"/>
         
-        <act_window name='Stock' domain='[(&apos;prodlot_id&apos;, &apos;=&apos;, active_id)]' id='act_stock_production_lot_2_report_stock_prodlots' src_model='stock.production.lot' res_model='report.stock.prodlots'/>
+        <act_window domain="[('prodlot_id', '=', active_id)]" id="act_stock_production_lot_2_report_stock_prodlots" name="Stock" res_model="report.stock.prodlots" src_model="stock.production.lot"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index 27994c07baf..8f2083cbe35 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -1,59 +1,59 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
         <!-- Tasks by projects and users -->
         
-        <record id='view_task_project_form' model='ir.ui.view'>
-            <field name='name'>report.project.task.form</field>
-            <field name='model'>report.task.user.pipeline.open</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Tasks by User'>
-                    <field name='user_id' select='1'/>
-                    <field name='company_id' select='1'/>
-                    <field name='task_nbr' select='2'/>
-                    <field name='task_hrs' select='2'/>
-                    <field name='task_progress' select='2'/>
+        <record id="view_task_project_form" model="ir.ui.view">
+            <field name="name">report.project.task.form</field>
+            <field name="model">report.task.user.pipeline.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Tasks by User">
+                    <field name="user_id" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="task_nbr" select="2"/>
+                    <field name="task_hrs" select="2"/>
+                    <field name="task_progress" select="2"/>
                 </form>
             </field>
         </record>
         
-        <record id='view_task_project_graph' model='ir.ui.view'>
-            <field name='name'>report.project.task.graph</field>
-            <field name='model'>report.task.user.pipeline.open</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' string='Tasks by User'>
-                    <field name='user_id'/>
-                    <field name='task_progress' operator='+'/>
+        <record id="view_task_project_graph" model="ir.ui.view">
+            <field name="name">report.project.task.graph</field>
+            <field name="model">report.task.user.pipeline.open</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Tasks by User" type="bar">
+                    <field name="user_id"/>
+                    <field name="task_progress" operator="+"/>
                 </graph>
             </field>
         </record>
         
-        <record id='view_task_project_tree' model='ir.ui.view'>
-            <field name='name'>report.project.task.tree</field>
-            <field name='model'>report.task.user.pipeline.open</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Tasks by User'>
-                    <field name='user_id'/>
-                    <field name='company_id'/>
-                    <field name='task_nbr'/>
-                    <field name='task_hrs'/>
-                    <field name='task_progress'/>
+        <record id="view_task_project_tree" model="ir.ui.view">
+            <field name="name">report.project.task.tree</field>
+            <field name="model">report.task.user.pipeline.open</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tasks by User">
+                    <field name="user_id"/>
+                    <field name="company_id"/>
+                    <field name="task_nbr"/>
+                    <field name="task_hrs"/>
+                    <field name="task_progress"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_project_task' model='ir.actions.act_window'>
-            <field name='name'>Tasks by User</field>
-            <field name='res_model'>report.task.user.pipeline.open</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,graph</field>
-            <field name='domain'>[]</field>
+        <record id="action_project_task" model="ir.actions.act_window">
+            <field name="name">Tasks by User</field>
+            <field name="res_model">report.task.user.pipeline.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="domain">[]</field>
         </record>
-        <menuitem name='Project Management/Reporting/All Months/Tasks by User' action='action_project_task' id='menu_project_task_user_tree'/>
+        <menuitem id="next_id_57" name="Reporting" parent="project.menu_main"/><menuitem id="next_id_58" name="All Months" parent="next_id_57"/><menuitem action="action_project_task" id="menu_project_task_user_tree" parent="next_id_58"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index f37e1b31fa5..9a53bf9a609 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -1,282 +1,282 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
         <!-- Statistics report on timesheet by user -->
         
-        <record id='view_timesheet_user_graph' model='ir.ui.view'>
-            <field name='name'>report_timesheet.user.graph</field>
-            <field name='model'>report_timesheet.user</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' string='Timesheet by user'>
-                    <field name='name'/>
-                    <field name='quantity' operator='+'/>
-                    <field name='user_id' group='True'/>
+        <record id="view_timesheet_user_graph" model="ir.ui.view">
+            <field name="name">report_timesheet.user.graph</field>
+            <field name="model">report_timesheet.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet by user" type="bar">
+                    <field name="name"/>
+                    <field name="quantity" operator="+"/>
+                    <field group="True" name="user_id"/>
                 </graph>
             </field>
         </record>
         
         
-        <record id='view_timesheet_user_form' model='ir.ui.view'>
-            <field name='name'>report_timesheet.timesheet.user.form</field>
-            <field name='model'>report_timesheet.user</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet by user'>
-                    <field name='name' select='1'/>
-                    <field name='user_id' select='1'/>
+        <record id="view_timesheet_user_form" model="ir.ui.view">
+            <field name="name">report_timesheet.timesheet.user.form</field>
+            <field name="model">report_timesheet.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet by user">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='view_timesheet_user_tree' model='ir.ui.view'>
-            <field name='name'>report_timesheet.timesheet.user.tree</field>
-            <field name='model'>report_timesheet.user</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Timesheet by user'>
-                    <field name='name'/>
-                    <field name='user_id'/>
-                    <field name='quantity'/>
-                    <field name='cost'/>
+        <record id="view_timesheet_user_tree" model="ir.ui.view">
+            <field name="name">report_timesheet.timesheet.user.tree</field>
+            <field name="model">report_timesheet.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheet by user">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="quantity"/>
+                    <field name="cost"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_timesheet_user_stat' model='ir.actions.act_window'>
-            <field name='name'>Timesheet by user (this month)</field>
-            <field name='res_model'>report_timesheet.user</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
-            <field name='domain'>[('name','&gt;=',time.strftime('%Y-%m-01'))]</field>
+        <record id="action_timesheet_user_stat" model="ir.actions.act_window">
+            <field name="name">Timesheet by user (this month)</field>
+            <field name="res_model">report_timesheet.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01'))]</field>
         </record>
-        <menuitem name='Human Resources/Reporting/This Month/Timesheet by User' action='action_timesheet_user_stat' id='menu_report_timesheet_user'/>
+        <menuitem id="next_id_69" name="This Month" parent="hr.menu_hr_reporting"/><menuitem action="action_timesheet_user_stat" id="menu_report_timesheet_user" parent="next_id_69"/>
         
-        <record id='view_timesheet_account_date_graph_account' model='ir.ui.view'>
-            <field name='name'>report_timesheet.account.date.graph</field>
-            <field name='model'>report_timesheet.account.date</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph type='bar' orientation='horizontal' string='Daily timesheet per account'>
-                    <field name='name'/>
-                    <field name='quantity' operator='+'/>
-                    <field name='account_id' group='True'/>
+        <record id="view_timesheet_account_date_graph_account" model="ir.ui.view">
+            <field name="name">report_timesheet.account.date.graph</field>
+            <field name="model">report_timesheet.account.date</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Daily timesheet per account" type="bar">
+                    <field name="name"/>
+                    <field name="quantity" operator="+"/>
+                    <field group="True" name="account_id"/>
                 </graph>
             </field>
         </record>
         
         
         
-        <record id='action_timesheet_user_stat_my' model='ir.actions.act_window'>
-            <field name='name'>My Timesheet of the Month</field>
-            <field name='res_model'>report_timesheet.account.date</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
-            <field name='view_id' ref='view_timesheet_account_date_graph_account'/>
-            <field name='domain'>[('name','&gt;=',time.strftime('%Y-%m-01')), ('user_id','=',uid)]</field>
+        <record id="action_timesheet_user_stat_my" model="ir.actions.act_window">
+            <field name="name">My Timesheet of the Month</field>
+            <field name="res_model">report_timesheet.account.date</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_timesheet_account_date_graph_account"/>
+            <field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01')), ('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Human Resources/Reporting/This Month/' action='action_timesheet_user_stat_my' id='menu_report_timesheet_user_my'/>
+        <menuitem action="action_timesheet_user_stat_my" id="menu_report_timesheet_user_my" parent="report_timesheet.next_id_69"/>
         
         
-        <record id='action_timesheet_user_stat_all' model='ir.actions.act_window'>
-            <field name='name'>Timesheet by User</field>
-            <field name='res_model'>report_timesheet.user</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_timesheet_user_stat_all" model="ir.actions.act_window">
+            <field name="name">Timesheet by User</field>
+            <field name="res_model">report_timesheet.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Human Resources/Reporting/All Months/Timesheet by User' action='action_timesheet_user_stat_all' id='menu_report_timesheet_user_all'/>
+        <menuitem id="next_id_70" name="All Months" parent="hr.menu_hr_reporting"/><menuitem action="action_timesheet_user_stat_all" id="menu_report_timesheet_user_all" parent="next_id_70"/>
         
         <!-- Statistics report on timesheets to invoice -->
         
-        <record id='view_timesheet_invoice_graph' model='ir.ui.view'>
-            <field name='name'>report_timesheet.invoice.graph</field>
-            <field name='model'>report_timesheet.invoice</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph string='Timesheet by invoice'>
-                    <field name='account_id'/>
-                    <field name='amount_invoice' operator='+'/>
+        <record id="view_timesheet_invoice_graph" model="ir.ui.view">
+            <field name="name">report_timesheet.invoice.graph</field>
+            <field name="model">report_timesheet.invoice</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet by invoice">
+                    <field name="account_id"/>
+                    <field name="amount_invoice" operator="+"/>
                 </graph>
             </field>
         </record>
         
         
-        <record id='view_timesheet_invoice_form' model='ir.ui.view'>
-            <field name='name'>report_timesheet.timesheet.invoice.form</field>
-            <field name='model'>report_timesheet.invoice</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet by invoice'>
-                    <field name='account_id' select='1'/>
-                    <field name='manager_id' select='1'/>
-                    <field name='user_id' select='1'/>
+        <record id="view_timesheet_invoice_form" model="ir.ui.view">
+            <field name="name">report_timesheet.timesheet.invoice.form</field>
+            <field name="model">report_timesheet.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet by invoice">
+                    <field name="account_id" select="1"/>
+                    <field name="manager_id" select="1"/>
+                    <field name="user_id" select="1"/>
                 </form>
             </field>
         </record>
         
         
-        <record id='view_timesheet_invoice_tree' model='ir.ui.view'>
-            <field name='name'>report_timesheet.timesheet.invoice.tree</field>
-            <field name='model'>report_timesheet.invoice</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Timesheets to invoice'>
-                    <field name='user_id'/>
-                    <field name='account_id'/>
-                    <field name='manager_id'/>
-                    <field name='quantity'/>
-                    <field name='amount_invoice'/>
+        <record id="view_timesheet_invoice_tree" model="ir.ui.view">
+            <field name="name">report_timesheet.timesheet.invoice.tree</field>
+            <field name="model">report_timesheet.invoice</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheets to invoice">
+                    <field name="user_id"/>
+                    <field name="account_id"/>
+                    <field name="manager_id"/>
+                    <field name="quantity"/>
+                    <field name="amount_invoice"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_timesheet_invoice_stat_all' model='ir.actions.act_window'>
-            <field name='name'>Timesheet by Invoice</field>
-            <field name='res_model'>report_timesheet.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_timesheet_invoice_stat_all" model="ir.actions.act_window">
+            <field name="name">Timesheet by Invoice</field>
+            <field name="res_model">report_timesheet.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Human Resources/Reporting/All Months/Timesheet by Invoice' action='action_timesheet_invoice_stat_all' id='menu_report_timesheet_invoice_all'/>
+        <menuitem action="action_timesheet_invoice_stat_all" id="menu_report_timesheet_invoice_all" parent="report_timesheet.next_id_70"/>
         
-        <record id='action_timesheet_invoice_stat_my' model='ir.actions.act_window'>
-            <field name='name'>My timesheets to invoice</field>
-            <field name='res_model'>report_timesheet.invoice</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
-            <field name='domain'>[('manager_id','=',uid)]</field>
+        <record id="action_timesheet_invoice_stat_my" model="ir.actions.act_window">
+            <field name="name">My timesheets to invoice</field>
+            <field name="res_model">report_timesheet.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('manager_id','=',uid)]</field>
         </record>
-        <menuitem name='Human Resources/Reporting/This Month/My Timesheets to Invoice' action='action_timesheet_invoice_stat_my' id='menu_report_timesheet_invoice_my'/>
+        <menuitem action="action_timesheet_invoice_stat_my" id="menu_report_timesheet_invoice_my" parent="report_timesheet.next_id_69"/>
         
         <!-- Statistics report on daily timesheets per account -->
         
-        <record id='view_timesheet_account_date_tree' model='ir.ui.view'>
-            <field name='name'>report_timesheet.account.date.tree</field>
-            <field name='model'>report_timesheet.account.date</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Daily timesheet per account'>
-                    <field name='name'/>
-                    <field name='account_id'/>
-                    <field name='user_id'/>
-                    <field name='quantity'/>
+        <record id="view_timesheet_account_date_tree" model="ir.ui.view">
+            <field name="name">report_timesheet.account.date.tree</field>
+            <field name="model">report_timesheet.account.date</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Daily timesheet per account">
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="user_id"/>
+                    <field name="quantity"/>
                 </tree>
             </field>
         </record>
-        <record id='view_timesheet_account_date_graph' model='ir.ui.view'>
-            <field name='name'>report_timesheet.account.date.graph</field>
-            <field name='model'>report_timesheet.account.date</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph orientation='horizontal' string='Daily timesheet per account'>
-                    <field name='account_id'/>
-                    <field name='quantity' operator='+'/>
-                    <field name='user_id' group='True'/>
+        <record id="view_timesheet_account_date_graph" model="ir.ui.view">
+            <field name="name">report_timesheet.account.date.graph</field>
+            <field name="model">report_timesheet.account.date</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Daily timesheet per account">
+                    <field name="account_id"/>
+                    <field name="quantity" operator="+"/>
+                    <field group="True" name="user_id"/>
                 </graph>
             </field>
         </record>
         
         
-        <record id='view_timesheet_account_date_form' model='ir.ui.view'>
-            <field name='name'>report_timesheet.timesheet.account.date.form</field>
-            <field name='model'>report_timesheet.account.date</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Daily timesheet by account'>
-                    <field name='name' select='1'/>
-                    <field name='account_id' select='1'/>
-                    <field name='user_id' select='1'/>
-                    <field name='quantity'/>
+        <record id="view_timesheet_account_date_form" model="ir.ui.view">
+            <field name="name">report_timesheet.timesheet.account.date.form</field>
+            <field name="model">report_timesheet.account.date</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Daily timesheet by account">
+                    <field name="name" select="1"/>
+                    <field name="account_id" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="quantity"/>
                 </form>
             </field>
         </record>
         
-        <record id='action_timesheet_account_date_stat_all' model='ir.actions.act_window'>
-            <field name='name'>Daily Timesheet by Account</field>
-            <field name='res_model'>report_timesheet.account.date</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_timesheet_account_date_stat_all" model="ir.actions.act_window">
+            <field name="name">Daily Timesheet by Account</field>
+            <field name="res_model">report_timesheet.account.date</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Human Resources/Reporting/All Months/Daily Timesheet by Account' action='action_timesheet_account_date_stat_all' id='menu_report_timesheet_account_date_all'/>
+        <menuitem action="action_timesheet_account_date_stat_all" id="menu_report_timesheet_account_date_all" parent="report_timesheet.next_id_70"/>
         
-        <record id='action_timesheet_account_date_stat_my' model='ir.actions.act_window'>
-            <field name='name'>My daily timesheets by account</field>
-            <field name='res_model'>report_timesheet.account.date</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="action_timesheet_account_date_stat_my" model="ir.actions.act_window">
+            <field name="name">My daily timesheets by account</field>
+            <field name="res_model">report_timesheet.account.date</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Human Resources/Reporting/This Month/My Daily Timesheets by Account' action='action_timesheet_account_date_stat_my' id='menu_report_timesheet_account_date_my'/>
+        <menuitem action="action_timesheet_account_date_stat_my" id="menu_report_timesheet_account_date_my" parent="report_timesheet.next_id_69"/>
         
         <!-- Statistics report on timesheets per account -->
         
-        <record id='view_timesheet_account_tree' model='ir.ui.view'>
-            <field name='name'>report_timesheet.account.tree</field>
-            <field name='model'>report_timesheet.account</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Timesheet per account'>
-                    <field name='name'/>
-                    <field name='account_id'/>
-                    <field name='user_id'/>
-                    <field name='quantity'/>
+        <record id="view_timesheet_account_tree" model="ir.ui.view">
+            <field name="name">report_timesheet.account.tree</field>
+            <field name="model">report_timesheet.account</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheet per account">
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="user_id"/>
+                    <field name="quantity"/>
                 </tree>
             </field>
         </record>
-        <record id='view_timesheet_account_graph' model='ir.ui.view'>
-            <field name='name'>report_timesheet.account.graph</field>
-            <field name='model'>report_timesheet.account</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph string='Timesheet per account'>
-                    <field name='account_id'/>
-                    <field name='quantity' operator='+'/>
-                    <field name='user_id' group='True'/>
+        <record id="view_timesheet_account_graph" model="ir.ui.view">
+            <field name="name">report_timesheet.account.graph</field>
+            <field name="model">report_timesheet.account</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet per account">
+                    <field name="account_id"/>
+                    <field name="quantity" operator="+"/>
+                    <field group="True" name="user_id"/>
                 </graph>
             </field>
         </record>
         
         
         
-        <record id='view_timesheet_account_form' model='ir.ui.view'>
-            <field name='name'>report_timesheet.timesheet.account.form</field>
-            <field name='model'>report_timesheet.account</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Timesheet by account'>
-                    <field name='name' select='1'/>
-                    <field name='account_id' select='1'/>
-                    <field name='user_id' select='1'/>
-                    <field name='quantity'/>
+        <record id="view_timesheet_account_form" model="ir.ui.view">
+            <field name="name">report_timesheet.timesheet.account.form</field>
+            <field name="model">report_timesheet.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Timesheet by account">
+                    <field name="name" select="1"/>
+                    <field name="account_id" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="quantity"/>
                 </form>
             </field>
         </record>
         
-        <record id='action_timesheet_account_stat_all' model='ir.actions.act_window'>
-            <field name='name'>Timesheet by Account</field>
-            <field name='res_model'>report_timesheet.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
+        <record id="action_timesheet_account_stat_all" model="ir.actions.act_window">
+            <field name="name">Timesheet by Account</field>
+            <field name="res_model">report_timesheet.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem name='Human Resources/Reporting/All Months/Timesheet by Account' action='action_timesheet_account_stat_all' id='menu_report_timesheet_account_all'/>
+        <menuitem action="action_timesheet_account_stat_all" id="menu_report_timesheet_account_all" parent="report_timesheet.next_id_70"/>
         
-        <record id='action_timesheet_account_stat_my' model='ir.actions.act_window'>
-            <field name='name'>My timesheets by account</field>
-            <field name='res_model'>report_timesheet.account</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>graph,tree</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="action_timesheet_account_stat_my" model="ir.actions.act_window">
+            <field name="name">My timesheets by account</field>
+            <field name="res_model">report_timesheet.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Human Resources/Reporting/This Month/My Timesheets by Account' action='action_timesheet_account_stat_my' id='menu_report_timesheet_account_my'/>
+        <menuitem action="action_timesheet_account_stat_my" id="menu_report_timesheet_account_my" parent="report_timesheet.next_id_69"/>
         
-        <act_window name='Timesheets per day' domain='[(&apos;user_id&apos;, &apos;=&apos;, active_id)]' id='act_res_users_2_report_timesheet_user' src_model='res.users' res_model='report_timesheet.user'/>
+        <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_timesheet_user" name="Timesheets per day" res_model="report_timesheet.user" src_model="res.users"/>
         
-        <act_window name='Timesheets per account' domain='[(&apos;user_id&apos;, &apos;=&apos;, active_id)]' id='act_res_users_2_report_timehsheet_account' src_model='res.users' res_model='report_timesheet.account'/>
+        <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_timehsheet_account" name="Timesheets per account" res_model="report_timesheet.account" src_model="res.users"/>
         
-        <act_window name='Timesheets' domain='[(&apos;account_id&apos;, &apos;=&apos;, active_id)]' id='act_account_analytic_account_2_report_timehsheet_account' src_model='account.analytic.account' res_model='report_timesheet.account'/>
+        <act_window domain="[('account_id', '=', active_id)]" id="act_account_analytic_account_2_report_timehsheet_account" name="Timesheets" res_model="report_timesheet.account" src_model="account.analytic.account"/>
         
-        <act_window name='Costs to invoice' domain='[(&apos;manager_id&apos;, &apos;=&apos;, active_id)]' id='act_res_users_2_report_timesheet.invoice' src_model='res.users' res_model='report_timesheet.invoice'/>
+        <act_window domain="[('manager_id', '=', active_id)]" id="act_res_users_2_report_timesheet.invoice" name="Costs to invoice" res_model="report_timesheet.invoice" src_model="res.users"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 12d33819ec5..b6e4c670b7c 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!--
 	Requests Links
 	-->
-        <record model="res.request.link" id="req_link_sale_order">
+        <record id="req_link_sale_order" model="res.request.link">
             <field name="name">Sale Order</field>
             <field name="object">sale.order</field>
         </record>
@@ -12,7 +12,7 @@
         <!--
 	Partner event type 
 	-->
-        <record model="res.partner.event.type" id="event_type_sale_open">
+        <record id="event_type_sale_open" model="res.partner.event.type">
             <field name="name">SALE: Sale Confirmation</field>
             <field name="key">sale_open</field>
         </record>
@@ -22,17 +22,13 @@
         <!--
 	Resource: sale.shop
 	-->
-        <record model="sale.shop" id="shop">
-            <field name="name" search="[]" model="res.company" use="name"/>
-            <field name="warehouse_id" search="[]" model="stock.warehouse"/>
-            <field name="payment_default_id" search="[]" model="account.payment.term"/>
+        <record id="shop" model="sale.shop">
+            <field model="res.company" name="name" search="[]" use="name"/>
+            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
+            <field model="account.payment.term" name="payment_default_id" search="[]"/>
         </record>
         
-        <function 
-		model="ir.values" 
-		id="sale_default_set"
-		name="set"
-		eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)"/>
+        <function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index b455ddc1ce9..67584eb2a3b 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -6,30 +6,30 @@
 	Resource: sale.order
 	-->
         
-        <record model="sale.order" id="order">
+        <record id="order" model="sale.order">
             <field name="shop_id" ref="shop"/>
-            <field name="pricelist_id" search="[]" model="product.pricelist"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_admin"/>
-            <field name="partner_id" search="[]" model="res.partner"/>
-            <field name="partner_invoice_id" search="[]" model="res.partner.address"/>
-            <field name="partner_shipping_id" search="[]" model="res.partner.address"/>
-            <field name="partner_order_id" search="[]" model="res.partner.address"/>
+            <field model="res.partner" name="partner_id" search="[]"/>
+            <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
+            <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
+            <field model="res.partner.address" name="partner_order_id" search="[]"/>
         </record>
         
         <!--
 	Resource: sale.order.line
 	-->
         
-        <record model="sale.order.line" id="line">
+        <record id="line" model="sale.order.line">
             <field name="order_id" ref="order"/>
             <field name="name">New server config + material</field>
-            <field name="product_id" search="[]" model="product.product"/>
-            <field name="product_uom" search="[]" model="product.uom"/>
+            <field model="product.product" name="product_id" search="[]"/>
+            <field model="product.uom" name="product_uom" search="[]"/>
             <field name="price_unit">123</field>
             <field name="type">make_to_stock</field>
         </record>
         
-        <record model="sale.order.line" id="line1">
+        <record id="line1" model="sale.order.line">
             <field name="order_id" ref="order"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
@@ -39,7 +39,7 @@
             <field name="product_uos_qty">3</field>
             <field name="type">make_to_stock</field>
         </record>
-        <record model="sale.order.line" id="line13">
+        <record id="line13" model="sale.order.line">
             <field name="order_id" ref="order"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
@@ -49,7 +49,7 @@
             <field name="product_uos_qty">3</field>
             <field name="type">make_to_stock</field>
         </record>
-        <record model="sale.order.line" id="line12">
+        <record id="line12" model="sale.order.line">
             <field name="order_id" ref="order"/>
             <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
             <field name="product_id" ref="product.product_product_mb1"/>
@@ -67,9 +67,9 @@
 	Resource: sale.order
 	-->
         
-        <record model="sale.order" id="order2">
+        <record id="order2" model="sale.order">
             <field name="shop_id" ref="shop"/>
-            <field name="pricelist_id" search="[]" model="product.pricelist"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_9"/>
@@ -81,7 +81,7 @@
 	Resource: sale.order.line
 	-->
         
-        <record model="sale.order.line" id="line3">
+        <record id="line3" model="sale.order.line">
             <field name="order_id" ref="order2"/>
             <field name="name">[PC2] Computer assembled on demand</field>
             <field name="product_id" ref="product.product_product_pc2"/>
@@ -89,7 +89,7 @@
             <field name="price_unit">540</field>
             <field name="type">make_to_order</field>
         </record>
-        <record model="sale.order.line" id="line4">
+        <record id="line4" model="sale.order.line">
             <field name="order_id" ref="order2"/>
             <field name="name">[MB1] Mainboard ASUStek (purchased on order)</field>
             <field name="product_id" ref="product.product_product_mb1"/>
@@ -106,16 +106,16 @@
         <!--
 	Resource: sale.order
 	-->
-        <record model="sale.order" id="order3">
+        <record id="order3" model="sale.order">
             <field name="shop_id" ref="shop"/>
-            <field name="pricelist_id" search="[]" model="product.pricelist"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_8"/>
             <field name="partner_order_id" ref="base.res_partner_address_8"/>
         </record>
-        <record model="sale.order.line" id="line5">
+        <record id="line5" model="sale.order.line">
             <field name="order_id" ref="order3"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
@@ -125,7 +125,7 @@
             <field name="type">make_to_order</field>
             <field name="delay">2</field>
         </record>
-        <record model="sale.order.line" id="line6">
+        <record id="line6" model="sale.order.line">
             <field name="order_id" ref="order3"/>
             <field name="name">[PC2] Basic+ PC (assembly on order)</field>
             <field name="product_id" ref="product.product_product_pc2"/>
@@ -135,21 +135,21 @@
             <field name="type">make_to_order</field>
             <field name="delay">7</field>
         </record>
-        <workflow model="sale.order" ref="order3" action="order_confirm" />
+        <workflow action="order_confirm" model="sale.order" ref="order3"/>
         
         <!--
 	Resource: sale.order
 	-->
-        <record model="sale.order" id="order4">
+        <record id="order4" model="sale.order">
             <field name="shop_id" ref="shop"/>
-            <field name="pricelist_id" search="[]" model="product.pricelist"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="partner_id" ref="base.res_partner_5"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_10"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_10"/>
             <field name="partner_order_id" ref="base.res_partner_address_10"/>
         </record>
-        <record model="sale.order.line" id="line7">
+        <record id="line7" model="sale.order.line">
             <field name="order_id" ref="order4"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
@@ -159,7 +159,7 @@
             <field name="type">make_to_order</field>
             <field name="delay">8</field>
         </record>
-        <record model="sale.order.line" id="line8">
+        <record id="line8" model="sale.order.line">
             <field name="order_id" ref="order4"/>
             <field name="name">[PC3] Medium PC</field>
             <field name="product_id" ref="product.product_product_pc3"/>
@@ -169,21 +169,21 @@
             <field name="type">make_to_order</field>
             <field name="delay">1</field>
         </record>
-        <workflow model="sale.order" ref="order4" action="order_confirm" />
+        <workflow action="order_confirm" model="sale.order" ref="order4"/>
         
         <!--
 	Resource: sale.order
 	-->
-        <record model="sale.order" id="order5">
+        <record id="order5" model="sale.order">
             <field name="shop_id" ref="shop"/>
-            <field name="pricelist_id" search="[]" model="product.pricelist"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_zen"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_zen"/>
             <field name="partner_order_id" ref="base.res_partner_address_zen"/>
         </record>
-        <record model="sale.order.line" id="line9">
+        <record id="line9" model="sale.order.line">
             <field name="order_id" ref="order5"/>
             <field name="name">[PC2] Basic+ PC (assembly on order)</field>
             <field name="product_id" ref="product.product_product_pc2"/>
@@ -193,9 +193,9 @@
             <field name="type">make_to_order</field>
             <field name="delay">15</field>
         </record>
-        <workflow model="sale.order" ref="order5" action="order_confirm" />
+        <workflow action="order_confirm" model="sale.order" ref="order5"/>
         
         <!-- Run all schedulers -->
-        <function model="mrp.procurement" name="run_scheduler" />
+        <function model="mrp.procurement" name="run_scheduler"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_report.xml b/addons/sale/sale_report.xml
index a3989205866..a647e924890 100644
--- a/addons/sale/sale_report.xml
+++ b/addons/sale/sale_report.xml
@@ -1,16 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!-- 
 	this report is defined here instead of in the stock module because it uses the
 	sale_id field defined in the sale module
 	-->
-        <report 
-		id="report_shipping"
-		string="Delivery order"
-		model="stock.picking"
-		name="sale.shipping"
-		rml="sale/report/shipping.rml"/>
+        <report id="report_shipping" model="stock.picking" name="sale.shipping" rml="sale/report/shipping.rml" string="Delivery order"/>
         
         <!--
 	<report
@@ -28,13 +23,7 @@
 		rml="sale/report/prepare_allot.rml"
 		auto="False"/>
 	-->
-        <report
-		id="report_sale_order"
-		string="Print Order"
-		model="sale.order"
-		name="sale.order"
-		rml="sale/report/order.rml"
-		auto="False"/>
+        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/order.rml" string="Print Order"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_security.xml b/addons/sale/sale_security.xml
index 5df66026f94..84a48e4f765 100644
--- a/addons/sale/sale_security.xml
+++ b/addons/sale/sale_security.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="res.groups" id="group_sale_manager">
+        <record id="group_sale_manager" model="res.groups">
             <field name="name">Sale Manager</field>
         </record>
-        <record model="res.groups" id="group_sale_salesman">
+        <record id="group_sale_salesman" model="res.groups">
             <field name="name">Salesman</field>
         </record>
         
-        <record model="res.users" id="base.user_admin">
-            <field name="groups_id" eval="[(4, ref('group_sale_manager')),(4, ref('group_sale_salesman'))]"/>
+        <record id="base.user_admin" model="res.users">
+            <field eval="[(4, ref('group_sale_manager')),(4, ref('group_sale_salesman'))]" name="groups_id"/>
         </record>
         
         <record id="ir_model_access_stockmove0" model="ir.model.access">
@@ -53,14 +53,14 @@
             <field name="group_id" ref="group_sale_manager"/>
         </record>
         
-        <record model="ir.model.access" id="access_mrp_procurement">
+        <record id="access_mrp_procurement" model="ir.model.access">
             <field name="name">Mrp procurement</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.procurement')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.procurement')]"/>
             <field name="group_id" ref="group_sale_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="False"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
         <record id="ir_model_access_stockmove0" model="ir.model.access">
@@ -103,75 +103,75 @@
             <field name="group_id" ref="group_sale_salesman"/>
         </record>
         
-        <record model="ir.model.access" id="access_mrp_procurement">
+        <record id="access_mrp_procurement" model="ir.model.access">
             <field name="name">Mrp procurement</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'mrp.procurement')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.procurement')]"/>
             <field name="group_id" ref="group_sale_salesman"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="False"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
         <!-- Sales order security -->
-        <record model="ir.model.access" id="access_sale_order">
+        <record id="access_sale_order" model="ir.model.access">
             <field name="name">Sale Order</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'sale.order')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_sale_order_sale_manager">
+        <record id="access_sale_order_sale_manager" model="ir.model.access">
             <field name="name">Sale Order</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'sale.order')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order')]"/>
             <field name="group_id" ref="group_sale_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_sale_order_salesman">
+        <record id="access_sale_order_salesman" model="ir.model.access">
             <field name="name">Sale Order</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'sale.order')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order')]"/>
             <field name="group_id" ref="group_sale_salesman"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
         <!-- Sales order line security -->
-        <record model="ir.model.access" id="access_sale_order_line">
+        <record id="access_sale_order_line" model="ir.model.access">
             <field name="name">Sale Order Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'sale.order.line')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order.line')]"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="False" name="perm_write"/>
+            <field eval="False" name="perm_create"/>
+            <field eval="False" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_sale_order_line_manager">
+        <record id="access_sale_order_line_manager" model="ir.model.access">
             <field name="name">Sale Order Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'sale.order.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order.line')]"/>
             <field name="group_id" ref="group_sale_manager"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
-        <record model="ir.model.access" id="access_sale_order_line_salesman">
+        <record id="access_sale_order_line_salesman" model="ir.model.access">
             <field name="name">Sale Order Line</field>
-            <field name="model_id" model="ir.model" search="[('model', '=', 'sale.order.line')]"/>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order.line')]"/>
             <field name="group_id" ref="group_sale_salesman"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_sequence.xml b/addons/sale/sale_sequence.xml
index e14c6c2d7d1..6425cb9e97c 100644
--- a/addons/sale/sale_sequence.xml
+++ b/addons/sale/sale_sequence.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!-- Sequences for sale.order -->
-        <record model="ir.sequence.type" id="seq_type_sale_order">
+        <record id="seq_type_sale_order" model="ir.sequence.type">
             <field name="name">Sale Order</field>
             <field name="code">sale.order</field>
         </record>
-        <record model="ir.sequence" id="seq_sale_order">
+        <record id="seq_sale_order" model="ir.sequence">
             <field name="name">Sale Order</field>
             <field name="code">sale.order</field>
             <field name="prefix">SO</field>
             <field name="padding">3</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index e381ca3aaba..89b64507f95 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         <!-- Resource: sale.order -->
-        <record model="sale.order" id="test_order_1">
+        <record id="test_order_1" model="sale.order">
             <field name="shop_id" ref="shop"/>
-            <field name="pricelist_id" search="[]" model="product.pricelist"/>
+            <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_admin"/>
-            <field name="partner_id" search="[]" model="res.partner"/>
-            <field name="partner_invoice_id" search="[]" model="res.partner.address"/>
-            <field name="partner_shipping_id" search="[]" model="res.partner.address"/>
-            <field name="partner_order_id" search="[]" model="res.partner.address"/>
+            <field model="res.partner" name="partner_id" search="[]"/>
+            <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
+            <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
+            <field model="res.partner.address" name="partner_order_id" search="[]"/>
         </record>
         <!-- Resource: sale.order.line -->
-        <record model="sale.order.line" id="test_order_1_line_1">
+        <record id="test_order_1_line_1" model="sale.order.line">
             <field name="order_id" ref="test_order_1"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
@@ -22,7 +22,7 @@
             <field name="product_uos_qty">2</field>
             <field name="type">make_to_stock</field>
         </record>
-        <record model="sale.order.line" id="test_order_1_line_3">
+        <record id="test_order_1_line_3" model="sale.order.line">
             <field name="order_id" ref="test_order_1"/>
             <field name="name">[RAM512] DDR 512MB PC400</field>
             <field name="product_id" ref="product.product_product_ram512"/>
@@ -33,90 +33,89 @@
             <field name="type">make_to_stock</field>
         </record>
         
-        <assert model="sale.order" id="test_order_1" string="The amount of the sale order is correctly computed" severity="error">
-            <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed" />
+        <assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sale order is correctly computed">
+            <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed"/>
         </assert>
         
-        <workflow model="sale.order" ref="test_order_1" action="order_confirm" />
+        <workflow action="order_confirm" model="sale.order" ref="test_order_1"/>
         
-        <assert model="sale.order" id="test_order_1" string="the sale order is now in 'Manual in progress' state">
+        <assert id="test_order_1" model="sale.order" string="the sale order is now in 'Manual in progress' state">
             <test expr="state">manual</test>
         </assert>
         
-        <workflow model="sale.order" ref="test_order_1" action="manual_invoice" uid="base.user_admin" />
+        <workflow action="manual_invoice" model="sale.order" ref="test_order_1" uid="base.user_admin"/>
         
-        <assert model="sale.order" id="test_order_1" string="the sale order is now in progress">
+        <assert id="test_order_1" model="sale.order" string="the sale order is now in progress">
             <test expr="state">progress</test>
         </assert>
         
         <!-- Treat generated invoice -->
-        <assert model="sale.order" id="test_order_1" string="the sale order has now a corresponding invoice" severity="fatal">
-            <test expr="len(invoice_ids) == 1" />
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a corresponding invoice">
+            <test expr="len(invoice_ids) == 1"/>
         </assert>
         
-        <assert model="sale.order" id="test_order_1" string="the sale order's has the same amount and is currently a draft" severity="fatal">
-            <test expr="invoice_ids[0].amount_untaxed == amount_untaxed" />
-            <test expr="invoice_ids[0].amount_total == amount_total" />
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's has the same amount and is currently a draft">
+            <test expr="invoice_ids[0].amount_untaxed == amount_untaxed"/>
+            <test expr="invoice_ids[0].amount_total == amount_total"/>
             <test expr="invoice_ids[0].state">draft</test>
         </assert>
         
-        <workflow model="account.invoice" action="invoice_open">
-            <value model="sale.order" eval="obj(ref('test_order_1')).invoice_ids[0].id" />
+        <workflow action="invoice_open" model="account.invoice">
+            <value eval="obj(ref('test_order_1')).invoice_ids[0].id" model="sale.order"/>
         </workflow>
         
         <function model="account.invoice" name="pay_and_reconcile">
-            <value model="sale.order" eval="[obj(ref('test_order_1')).invoice_ids[0].id]" />
-            <value model="sale.order" eval="obj(ref('test_order_1')).amount_total" />
-            <value search="[('type', '=', 'cash')]" model="account.account"/>
-            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
-            <value eval="ref('account.bank_journal')" />
-            <value search="[('type', '=', 'cash')]" model="account.account"/>
-            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
-            <value eval="ref('account.bank_journal')" />
+            <value eval="[obj(ref('test_order_1')).invoice_ids[0].id]" model="sale.order"/>
+            <value eval="obj(ref('test_order_1')).amount_total" model="sale.order"/>
+            <value model="account.account" search="[('type', '=', 'cash')]"/>
+            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <value eval="ref('account.bank_journal')"/>
+            <value model="account.account" search="[('type', '=', 'cash')]"/>
+            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <value eval="ref('account.bank_journal')"/>
         </function>
         
-        <assert model="sale.order" id="test_order_1" string="the sale order's invoice is now paid" severity="fatal">
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's invoice is now paid">
             <test expr="invoice_ids[0].state">paid</test>
         </assert>
         
         <!-- Treat generated picking -->
-        <assert model="sale.order" id="test_order_1" string="the sale order has now a correspending packing" severity="fatal">
-            <test expr="len(picking_ids) == 1" />
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a correspending packing">
+            <test expr="len(picking_ids) == 1"/>
         </assert>
         
-        <assert model="sale.order" id="test_order_1" string="the sale order's picking will be sent to the good address and is already confirmed" severity="error">
-            <test expr="picking_ids[0].address_id == partner_shipping_id" />
+        <assert id="test_order_1" model="sale.order" severity="error" string="the sale order's picking will be sent to the good address and is already confirmed">
+            <test expr="picking_ids[0].address_id == partner_shipping_id"/>
             <!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of MRP_JIT -->
         </assert>
         
         <!-- Here we need to use the function tag because action_assign is a method of stock_picking and not part of the workflow -->
         <function model="stock.picking" name="action_assign">
-            <value model="sale.order" eval="[obj(ref('test_order_1')).picking_ids[0].id]" />
+            <value eval="[obj(ref('test_order_1')).picking_ids[0].id]" model="sale.order"/>
         </function>
         
-        <assert model="sale.order" id="test_order_1" string="the sale order's picking is now assigned" severity="fatal">
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's picking is now assigned">
             <test expr="picking_ids[0].state">assigned</test>
         </assert>
         
         <!-- Do the same as in wizard_partial_picking lines 143-144 -->
         <function model="stock.picking" name="action_move">
-            <value model="sale.order" eval="[obj(ref('test_order_1')).picking_ids[0].id]" />
+            <value eval="[obj(ref('test_order_1')).picking_ids[0].id]" model="sale.order"/>
         </function>
         
-        <workflow model="stock.picking" action="button_done">
-            <value model="sale.order" eval="obj(ref('test_order_1')).picking_ids[0].id" />
+        <workflow action="button_done" model="stock.picking">
+            <value eval="obj(ref('test_order_1')).picking_ids[0].id" model="sale.order"/>
         </workflow>
         
-        <assert model="sale.order" id="test_order_1" string="the sale order's picking is now done">
+        <assert id="test_order_1" model="sale.order" string="the sale order's picking is now done">
             <test expr="picking_ids[0].state">done</test>
         </assert>
         
         <!-- Run all schedulers -->
-        <function model="mrp.procurement" name="run_scheduler" />
+        <function model="mrp.procurement" name="run_scheduler"/>
         
-        <assert model="sale.order" id="test_order_1" string="the sale order is now done">
+        <assert id="test_order_1" model="sale.order" string="the sale order is now done">
             <test expr="state">done</test>
         </assert>
     </data>
-</terp>
- 
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c16224c04c1..5a42c67de46 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,366 +1,366 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem name='Sales Management' icon='terp-sale' id='menu_sale_root'/>
+        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"/>
         
-        <record id='view_shop_form' model='ir.ui.view'>
-            <field name='name'>sale.shop</field>
-            <field name='model'>sale.shop</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Sale Shop'>
-                    <field name='name' select='1'/>
-                    <field name='warehouse_id' required='1' select='1'/>
-                    <separator string='Accounting' colspan='4'/>
-                    <field name='payment_default_id'/>
-                    <field name='pricelist_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;sale&apos;)]' select='1'/>
-                    <field name='project_id' select='1'/>
-                    <separator string='Payment accounts' colspan='4'/>
-                    <field name='payment_account_id' nolabel='1' colspan='4'/>
+        <record id="view_shop_form" model="ir.ui.view">
+            <field name="name">sale.shop</field>
+            <field name="model">sale.shop</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sale Shop">
+                    <field name="name" select="1"/>
+                    <field name="warehouse_id" required="1" select="1"/>
+                    <separator colspan="4" string="Accounting"/>
+                    <field name="payment_default_id"/>
+                    <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
+                    <field name="project_id" select="1"/>
+                    <separator colspan="4" string="Payment accounts"/>
+                    <field colspan="4" name="payment_account_id" nolabel="1"/>
                 </form>
             </field>
         </record>
-        <record id='view_shop_tree' model='ir.ui.view'>
-            <field name='name'>sale.shop</field>
-            <field name='model'>sale.shop</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Sale Shop'>
-                    <field name='name'/>
-                    <field name='pricelist_id'/>
-                    <field name='project_id'/>
-                    <field name='warehouse_id'/>
+        <record id="view_shop_tree" model="ir.ui.view">
+            <field name="name">sale.shop</field>
+            <field name="model">sale.shop</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sale Shop">
+                    <field name="name"/>
+                    <field name="pricelist_id"/>
+                    <field name="project_id"/>
+                    <field name="warehouse_id"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_shop_form' model='ir.actions.act_window'>
-            <field name='name'>Shop</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.shop</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_shop_tree'/>
+        <record id="action_shop_form" model="ir.actions.act_window">
+            <field name="name">Shop</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.shop</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_shop_tree"/>
         </record>
-        <menuitem name='Sales Management/Configuration' sequence='1' groups='base.group_admin' id='menu_shop_configuration'/>
-        <menuitem name='Sales Management/Configuration/Shop' action='action_shop_form' id='menu_action_shop_form'/>
+        <menuitem groups="base.group_admin" id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
+        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="sale.menu_shop_configuration"/>
         
-        <record id='view_order_tree' model='ir.ui.view'>
-            <field name='name'>sale.order.tree</field>
-            <field name='model'>sale.order</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Sales orders'>
-                    <field name='date_order'/>
-                    <field name='name'/>
-                    <field name='partner_id'/>
-                    <field name='partner_shipping_id'/>
-                    <field name='shipped'/>
-                    <field name='invoiced'/>
-                    <field name='amount_untaxed'/>
-                    <field name='state'/>
+        <record id="view_order_tree" model="ir.ui.view">
+            <field name="name">sale.order.tree</field>
+            <field name="model">sale.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sales orders">
+                    <field name="date_order"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="partner_shipping_id"/>
+                    <field name="shipped"/>
+                    <field name="invoiced"/>
+                    <field name="amount_untaxed"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_order_form' model='ir.ui.view'>
-            <field name='name'>sale.order.form</field>
-            <field name='model'>sale.order</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Sales order'>
+        <record id="view_order_form" model="ir.ui.view">
+            <field name="name">sale.order.form</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales order">
                     <notebook>
-                        <page string='Sale Order'>
-                            <field name='name' select='1'/>
-                            <group col='4' colspan='2'>
-                                <field name='shipped' select='2'/>
-                                <field name='invoiced' select='2'/>
+                        <page string="Sale Order">
+                            <field name="name" select="1"/>
+                            <group col="4" colspan="2">
+                                <field name="shipped" select="2"/>
+                                <field name="invoiced" select="2"/>
                             </group>
                             <newline/>
-                            <field name='date_order' select='1'/>
-                            <field name='shop_id' on_change='onchange_shop_id(shop_id)' select='2'/>
-                            <field name='partner_id' on_change='onchange_partner_id(partner_id)' required='1' select='1'/>
-                            <field name='partner_order_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]'/>
-                            <field name='partner_invoice_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]'/>
-                            <field name='partner_shipping_id' domain='[(&apos;partner_id&apos;,&apos;=&apos;,partner_id)]'/>
-                            <field name='pricelist_id' domain='[(&apos;type&apos;,&apos;=&apos;,&apos;sale&apos;)]'/>
-                            <field name='project_id' select='2'/>
+                            <field name="date_order" select="1"/>
+                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" select="1"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id"/>
+                            <field name="project_id" select="2"/>
                             <newline/>
-                            <field name='order_line' mode='tree,graph' widget='one2many_list' nolabel='1' colspan='4'>
-                                <form string='Sale Order Lines'>
+                            <field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
+                                <form string="Sale Order Lines">
                                     <notebook>
-                                        <page string='Order Line'>
-                                            <separator string='Automatic Declaration' colspan='4'/>
-                                            <field 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, &apos;lang&apos; in context and context[&apos;lang&apos;], True, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom' colspan='4' select='1'/>
-                                            <field 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, &apos;lang&apos; in context and context[&apos;lang&apos;], False, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom' select='1'/>
-                                            <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, &apos;lang&apos; in context and context[&apos;lang&apos;], False, parent.date_order)'/>
-                                            <separator string='Manual Description' colspan='4'/>
-                                            <field name='name' colspan='4' select='2'/>
-                                            <field name='price_unit' select='2'/>
-                                            <field name='discount'/>
-                                            <field name='type'/>
-                                            <field name='delay' select='2'/>
+                                        <page string="Order Line">
+                                            <separator colspan="4" string="Automatic Declaration"/>
+                                            <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, 'lang' in context and context['lang'], True, parent.date_order)" select="1"/>
+                                            <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, 'lang' in context and context['lang'], False, parent.date_order)" select="1"/>
+                                            <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, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                            <separator colspan="4" string="Manual Description"/>
+                                            <field colspan="4" name="name" select="2"/>
+                                            <field name="price_unit" select="2"/>
+                                            <field name="discount"/>
+                                            <field name="type"/>
+                                            <field name="delay" select="2"/>
                                             <newline/>
-                                            <field name='tax_id' colspan='4'/>
-                                            <separator string='States' colspan='4'/>
-                                            <field name='state' select='2'/>
-                                            <group col='3' colspan='2'>
-                                                <field name='invoiced' select='2'/>
-                                                <button name='%(wizard_sale_order_line_invoice)d' type='action' states='confirmed' string='Make Invoice' colspan='1'/>
+                                            <field colspan="4" name="tax_id"/>
+                                            <separator colspan="4" string="States"/>
+                                            <field name="state" select="2"/>
+                                            <group col="3" colspan="2">
+                                                <field name="invoiced" select="2"/>
+                                                <button colspan="1" name="%(wizard_sale_order_line_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
                                             </group>
                                         </page>
-                                        <page groups='base.group_extended' string='Extra Info'>
-                                            <field name='product_uos_qty' groups='product.group_uos' on_change='uos_change(product_uos, product_uos_qty, product_id)'/>
-                                            <field name='product_uos' groups='product.group_uos'/>
-                                            <field name='product_packaging'/>
-                                            <field name='address_allotment_id' select='2'/>
-                                            <separator string='Properties' colspan='4'/>
-                                            <field name='property_ids' nolabel='1' colspan='4'/>
+                                        <page groups="base.group_extended" string="Extra Info">
+                                            <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
+                                            <field groups="product.group_uos" name="product_uos"/>
+                                            <field name="product_packaging"/>
+                                            <field name="address_allotment_id" select="2"/>
+                                            <separator colspan="4" string="Properties"/>
+                                            <field colspan="4" name="property_ids" nolabel="1"/>
                                         </page>
-                                        <page string='Notes'>
-                                            <field name='notes' nolabel='1' colspan='4'/>
+                                        <page string="Notes">
+                                            <field colspan="4" name="notes" nolabel="1"/>
                                         </page>
-                                        <page string='History'>
-                                            <separator string='Invoice Lines' colspan='4'/>
-                                            <field name='invoice_lines' nolabel='1' colspan='4'/>
-                                            <separator string='Stock Moves' colspan='4'/>
-                                            <field name='move_ids' nolabel='1' colspan='4'/>
+                                        <page string="History">
+                                            <separator colspan="4" string="Invoice Lines"/>
+                                            <field colspan="4" name="invoice_lines" nolabel="1"/>
+                                            <separator colspan="4" string="Stock Moves"/>
+                                            <field colspan="4" name="move_ids" nolabel="1"/>
                                         </page>
                                     </notebook>
                                 </form>
-                                <tree string='Sales order lines'>
-                                    <field name='name' colspan='4'/>
-                                    <field name='product_uom_qty' string='Qty'/>
-                                    <field name='product_uom' string='UoM'/>
-                                    <field name='discount'/>
-                                    <field name='price_unit'/>
-                                    <field name='price_net'/>
-                                    <field name='price_subtotal'/>
+                                <tree string="Sales order lines">
+                                    <field colspan="4" name="name"/>
+                                    <field name="product_uom_qty" string="Qty"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="discount"/>
+                                    <field name="price_unit"/>
+                                    <field name="price_net"/>
+                                    <field name="price_subtotal"/>
                                 </tree>
                             </field>
                             <newline/>
-                            <group col='7' colspan='4'>
-                                <field name='amount_untaxed' sum='Untaxed amount'/>
-                                <field name='amount_tax'/>
-                                <field name='amount_total' sum='Total amount'/>
-                                <button name='button_dummy' type='object' states='draft' string='Compute'/>
+                            <group col="7" colspan="4">
+                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                                <field name="amount_tax"/>
+                                <field name="amount_total" sum="Total amount"/>
+                                <button name="button_dummy" states="draft" string="Compute" type="object"/>
                             </group>
-                            <group col='13' colspan='4'>
-                                <field name='state' select='2'/>
-                                <button name='order_confirm' states='draft' string='Confirm Order'/>
-                                <button name='invoice_recreate' states='invoice_except' string='Recreate Invoice'/>
-                                <button name='invoice_corrected' states='invoice_except' string='Invoice Corrected'/>
-                                <button name='ship_recreate' states='shipping_except' string='Recreate Procurement'/>
-                                <button name='ship_corrected' states='shipping_except' string='Procurement Corrected'/>
-                                <button name='manual_invoice' states='manual' string='Create Invoice'/>
-                                <button name='ship_cancel' states='shipping_except' string='Cancel Order'/>
-                                <button name='action_cancel_draft' type='object' states='cancel' string='Set to Draft'/>
-                                <button name='action_cancel' type='object' states='manual,progress' string='Cancel Order'/>
-                                <button name='cancel' states='draft' string='Cancel Order'/>
-                                <button name='invoice_cancel' states='invoice_except' string='Cancel Order'/>
+                            <group col="13" colspan="4">
+                                <field name="state" select="2"/>
+                                <button name="order_confirm" states="draft" string="Confirm Order"/>
+                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
+                                <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
+                                <button name="ship_recreate" states="shipping_except" string="Recreate Procurement"/>
+                                <button name="ship_corrected" states="shipping_except" string="Procurement Corrected"/>
+                                <button name="manual_invoice" states="manual" string="Create Invoice"/>
+                                <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
+                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
+                                <button name="cancel" states="draft" string="Cancel Order"/>
+                                <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
                             </group>
                         </page>
-                        <page string='Other data'>
-                            <field name='incoterm' groups='base.group_extended'/>
-                            <field name='picking_policy' groups='base.group_extended' required='True'/>
-                            <field name='user_id'/>
-                            <field name='order_policy'/>
-                            <field name='origin' groups='base.group_extended'/>
-                            <field name='invoice_quantity' groups='base.group_extended'/>
-                            <field name='client_order_ref'/>
-                            <separator string='Notes' colspan='4'/>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Other data">
+                            <field groups="base.group_extended" name="incoterm"/>
+                            <field groups="base.group_extended" name="picking_policy" required="True"/>
+                            <field name="user_id"/>
+                            <field name="order_policy"/>
+                            <field groups="base.group_extended" name="origin"/>
+                            <field groups="base.group_extended" name="invoice_quantity"/>
+                            <field name="client_order_ref"/>
+                            <separator colspan="4" string="Notes"/>
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page groups='base.group_extended' string='History'>
-                            <separator string='Related invoices' colspan='4'/>
-                            <field name='invoice_ids' nolabel='1' colspan='4'/>
-                            <separator string='Related packings' colspan='4'/>
-                            <field name='picking_ids' nolabel='1' colspan='4'/>
+                        <page groups="base.group_extended" string="History">
+                            <separator colspan="4" string="Related invoices"/>
+                            <field colspan="4" name="invoice_ids" nolabel="1"/>
+                            <separator colspan="4" string="Related packings"/>
+                            <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_order_form' model='ir.actions.act_window'>
-            <field name='name'>Sales Order</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_order_form'/>
+        <record id="action_order_form" model="ir.actions.act_window">
+            <field name="name">Sales Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_order_form"/>
         </record>
-        <menuitem name='Sales Management/Sales Order' action='action_order_form' id='menu_sale_order'/>
+        <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
         
-        <record id='action_order_tree' model='ir.actions.act_window'>
-            <field name='name'>My Sales Order</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid)]</field>
+        <record id="action_order_tree" model="ir.actions.act_window">
+            <field name="name">My Sales Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/' action='action_order_tree' id='menu_action_order_tree'/>
+        <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order"/>
         
         
-        <record id='action_order_tree_all' model='ir.actions.act_window'>
-            <field name='name'>All Sales Order</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_order_tree_all" model="ir.actions.act_window">
+            <field name="name">All Sales Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/' action='action_order_tree_all' id='menu_action_order_tree_all'/>
+        <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order"/>
         
         
-        <record id='action_order_tree2' model='ir.actions.act_window'>
-            <field name='name'>Sales in Exception</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','in',('shipping_except','invoice_except')]</field>
+        <record id="action_order_tree2" model="ir.actions.act_window">
+            <field name="name">Sales in Exception</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','in',('shipping_except','invoice_except')]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/All Sales Order/' action='action_order_tree2' id='menu_action_order_tree2'/>
+        <menuitem id="next_id_78" name="All Sales Order" parent="sale.menu_sale_order"/><menuitem action="action_order_tree2" id="menu_action_order_tree2" parent="next_id_78"/>
         
-        <record id='action_order_tree3' model='ir.actions.act_window'>
-            <field name='name'>Sales Order To Be Invoiced</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','manual')]</field>
+        <record id="action_order_tree3" model="ir.actions.act_window">
+            <field name="name">Sales Order To Be Invoiced</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','manual')]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/All Sales Order/' action='action_order_tree3' id='menu_action_order_tree3'/>
+        <menuitem action="action_order_tree3" id="menu_action_order_tree3" parent="sale.next_id_78"/>
         
-        <record id='action_order_tree4' model='ir.actions.act_window'>
-            <field name='name'>Sales Order in Progress</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','in',('progress','waiting_date','manual'))]</field>
+        <record id="action_order_tree4" model="ir.actions.act_window">
+            <field name="name">Sales Order in Progress</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/All Sales Order/Sales in Progress' sequence='2' action='action_order_tree4' id='menu_action_order_tree4'/>
+        <menuitem action="action_order_tree4" id="menu_action_order_tree4" parent="sale.next_id_78" sequence="2"/>
         
         
-        <record id='action_order_tree5' model='ir.actions.act_window'>
-            <field name='name'>All Quotations</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft')]</field>
+        <record id="action_order_tree5" model="ir.actions.act_window">
+            <field name="name">All Quotations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/All Sales Order/All Quotations' sequence='1' action='action_order_tree5' id='menu_action_order_tree5'/>
+        <menuitem action="action_order_tree5" id="menu_action_order_tree5" parent="sale.next_id_78" sequence="1"/>
         
-        <record id='action_order_tree7' model='ir.actions.act_window'>
-            <field name='name'>My sales in shipping exception</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
+        <record id="action_order_tree7" model="ir.actions.act_window">
+            <field name="name">My sales in shipping exception</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/My Sales Order/My Sales in Exception' action='action_order_tree7' id='menu_action_order_tree7'/>
+        <menuitem id="next_id_79" name="My Sales Order" parent="sale.menu_sale_order"/><menuitem action="action_order_tree7" id="menu_action_order_tree7" parent="next_id_79"/>
         
-        <record id='action_order_tree8' model='ir.actions.act_window'>
-            <field name='name'>My sales order waiting Invoice</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','manual'),('user_id','=',uid)]</field>
+        <record id="action_order_tree8" model="ir.actions.act_window">
+            <field name="name">My sales order waiting Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/My Sales Order/My Sales to be Invoiced' action='action_order_tree8' id='menu_action_order_tree8'/>
+        <menuitem action="action_order_tree8" id="menu_action_order_tree8" parent="sale.next_id_79"/>
         
-        <record id='action_order_tree9' model='ir.actions.act_window'>
-            <field name='name'>My sales order in progress</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
+        <record id="action_order_tree9" model="ir.actions.act_window">
+            <field name="name">My sales order in progress</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/My Sales Order/My Sales in Progress' sequence='2' action='action_order_tree9' id='menu_action_order_tree9'/>
+        <menuitem action="action_order_tree9" id="menu_action_order_tree9" parent="sale.next_id_79" sequence="2"/>
         
         
-        <record id='action_order_tree10' model='ir.actions.act_window'>
-            <field name='name'>My Quotations</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft'),('user_id','=',uid)]</field>
+        <record id="action_order_tree10" model="ir.actions.act_window">
+            <field name="name">My Quotations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order/My Sales Order/' sequence='1' action='action_order_tree10' id='menu_action_order_tree10'/>
+        <menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.next_id_79" sequence="1"/>
         
         
-        <record id='view_order_line_graph' model='ir.ui.view'>
-            <field name='name'>sale.order.line.graph</field>
-            <field name='model'>sale.order.line</field>
-            <field name='type'>graph</field>
-            <field name='arch' type='xml'>
-                <graph string='Sales order lines'>
-                    <field name='product_id'/>
-                    <field name='price_unit' operator='+'/>
+        <record id="view_order_line_graph" model="ir.ui.view">
+            <field name="name">sale.order.line.graph</field>
+            <field name="model">sale.order.line</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Sales order lines">
+                    <field name="product_id"/>
+                    <field name="price_unit" operator="+"/>
                 </graph>
             </field>
         </record>
         
         
-        <record id='view_order_line_tree' model='ir.ui.view'>
-            <field name='name'>sale.order.line.tree</field>
-            <field name='model'>sale.order.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Sales order lines'>
-                    <field name='order_id'/>
-                    <field name='name' colspan='4'/>
-                    <field name='product_id'/>
-                    <field name='product_uom_qty' string='Qty'/>
-                    <field name='product_uom' string='UoM'/>
-                    <field name='discount'/>
-                    <field name='price_unit'/>
-                    <field name='price_net'/>
-                    <field name='price_subtotal'/>
+        <record id="view_order_line_tree" model="ir.ui.view">
+            <field name="name">sale.order.line.tree</field>
+            <field name="model">sale.order.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sales order lines">
+                    <field name="order_id"/>
+                    <field colspan="4" name="name"/>
+                    <field name="product_id"/>
+                    <field name="product_uom_qty" string="Qty"/>
+                    <field name="product_uom" string="UoM"/>
+                    <field name="discount"/>
+                    <field name="price_unit"/>
+                    <field name="price_net"/>
+                    <field name="price_subtotal"/>
                 </tree>
             </field>
         </record>
-        <record id='view_order_line_form2' model='ir.ui.view'>
-            <field name='name'>sale.order.line.form2</field>
-            <field name='model'>sale.order.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Sales Order Lines'>
+        <record id="view_order_line_form2" model="ir.ui.view">
+            <field name="name">sale.order.line.form2</field>
+            <field name="model">sale.order.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Order Lines">
                     <notebook>
-                        <page string='Order Lines'>
-                            <separator string='Automatic Declaration' colspan='4'/>
-                            <field name='order_id' select='1'/>
-                            <field name='invoiced' select='2'/>
-                            <field name='product_uom_qty' readonly='1' select='2'/>
-                            <field name='product_uom' readonly='2'/>
-                            <field name='product_id' readonly='1' select='1'/>
+                        <page string="Order Lines">
+                            <separator colspan="4" string="Automatic Declaration"/>
+                            <field name="order_id" select="1"/>
+                            <field name="invoiced" select="2"/>
+                            <field name="product_uom_qty" readonly="1" select="2"/>
+                            <field name="product_uom" readonly="2"/>
+                            <field name="product_id" readonly="1" select="1"/>
                             
-                            <separator string='Manual Designation' colspan='4'/>
-                            <field name='name' colspan='4' select='2'/>
-                            <field name='price_unit' select='2'/>
-                            <field name='discount'/>
-                            <field name='type'/>
-                            <field name='delay' select='2'/>
-                            <field name='price_subtotal'/>
-                            <field name='tax_id' colspan='4'/>
-                            <separator string='States' colspan='4'/>
-                            <field name='state' select='2'/>
-                            <group col='2' colspan='2'>
-                                <button name='button_done' type='object' states='confirmed' string='Done'/>
+                            <separator colspan="4" string="Manual Designation"/>
+                            <field colspan="4" name="name" select="2"/>
+                            <field name="price_unit" select="2"/>
+                            <field name="discount"/>
+                            <field name="type"/>
+                            <field name="delay" select="2"/>
+                            <field name="price_subtotal"/>
+                            <field colspan="4" name="tax_id"/>
+                            <separator colspan="4" string="States"/>
+                            <field name="state" select="2"/>
+                            <group col="2" colspan="2">
+                                <button name="button_done" states="confirmed" string="Done" type="object"/>
                             </group>
                         </page>
-                        <page string='Properties'>
-                            <field name='property_ids' nolabel='1'/>
+                        <page string="Properties">
+                            <field name="property_ids" nolabel="1"/>
                         </page>
-                        <page string='Notes'>
-                            <field name='notes' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
                         </page>
-                        <page string='Invoice Lines'>
-                            <field name='invoice_lines' nolabel='1' colspan='4'/>
+                        <page string="Invoice Lines">
+                            <field colspan="4" name="invoice_lines" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -368,87 +368,87 @@
         </record>
         
         
-        <record id='action_order_line_tree1' model='ir.actions.act_window'>
-            <field name='name'>Sales Order Lines</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_order_line_form2'/>
+        <record id="action_order_line_tree1" model="ir.actions.act_window">
+            <field name="name">Sales Order Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_order_line_form2"/>
         </record>
-        <menuitem name='Sales Management/Sales Order Lines' action='action_order_line_tree1' id='menu_action_order_line_tree1'/>
+        <menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sale_root"/>
         
-        <record id='action_order_line_tree2' model='ir.actions.act_window'>
-            <field name='name'>Uninvoiced lines</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
+        <record id="action_order_line_tree2" model="ir.actions.act_window">
+            <field name="name">Uninvoiced lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order Lines/Uninvoiced Lines' action='action_order_line_tree2' id='menu_action_order_line_tree2'/>
+        <menuitem action="action_order_line_tree2" id="menu_action_order_line_tree2" parent="sale.menu_action_order_line_tree1"/>
         
-        <record id='action_order_line_tree3' model='ir.actions.act_window'>
-            <field name='name'>Uninvoiced and Delivered Lines</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
+        <record id="action_order_line_tree3" model="ir.actions.act_window">
+            <field name="name">Uninvoiced and Delivered Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
         </record>
-        <menuitem name='Sales Management/Sales Order Lines/Uninvoiced Lines/Uninvoiced &amp; Delivered Lines' action='action_order_line_tree3' id='menu_action_order_line_tree3'/>
+        <menuitem action="action_order_line_tree3" id="menu_action_order_line_tree3" parent="sale.menu_action_order_line_tree2"/>
         
-        <record id='action_order_line_tree4' model='ir.actions.act_window'>
-            <field name='name'>All Sale Order Lines</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.order.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_order_line_tree4" model="ir.actions.act_window">
+            <field name="name">All Sale Order Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name='Sales Management/Sales Order Lines/All Sale Order Lines' action='action_order_line_tree4' id='menu_action_order_line_tree4'/>
+        <menuitem action="action_order_line_tree4" id="menu_action_order_line_tree4" parent="sale.menu_action_order_line_tree1"/>
         
-        <act_window name='Sales' domain='[(&apos;partner_id&apos;, &apos;=&apos;, active_id)]' id='act_res_partner_2_sale_order' src_model='res.partner' context='{&apos;partner_id&apos;: active_id}' res_model='sale.order'/>
+        <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_sale_order" name="Sales" res_model="sale.order" src_model="res.partner"/>
         
-        <act_window name='Product sales' domain='[(&apos;product_id&apos;,&apos;=&apos;,active_id)]' id='action_order_line_product_tree' src_model='product.product' res_model='sale.order.line'/>
+        <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
         
         
         
         
         <!-- configartion view -->
         
-        <record id='view_config_picking_policy' model='ir.ui.view'>
-            <field name='name'>Configure Picking Policy for Sale Order </field>
-            <field name='model'>sale.config.picking_policy</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Configure Picking Policy for Sale Order'>
-                    <separator col='4' string='Configure Picking Policy for Sale Order' colspan='4'/>
+        <record id="view_config_picking_policy" model="ir.ui.view">
+            <field name="name">Configure Picking Policy for Sale Order </field>
+            <field name="model">sale.config.picking_policy</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure Picking Policy for Sale Order">
+                    <separator col="4" colspan="4" string="Configure Picking Policy for Sale Order"/>
                     <newline/>
-                    <field name='picking_policy'/>
-                    <group col='4' colspan='4'>
-                        <button icon='gtk-cancel' special='cancel' string='Cancel'/>
-                        <button name='set_default' icon='gtk-ok' type='object' string='Set Default'/>
+                    <field name="picking_policy"/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
         
-        <record id='action_config_picking_policy' model='ir.actions.act_window'>
-            <field name='name'>Configure Picking Policy for Sale Order</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>sale.config.picking_policy</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>form</field>
-            <field name='target'>new</field>
+        <record id="action_config_picking_policy" model="ir.actions.act_window">
+            <field name="name">Configure Picking Policy for Sale Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.config.picking_policy</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
         </record>
         
         <!-- register configuration wizard -->
-        <record id='config_wizard_step_sale_picking_policy' model='ir.module.module.configuration.step'>
-            <field name='name'>Select the default picking policy for Sale Order</field>
-            <field name='note'>This Configuration step use to set default picking policy when make sale order</field>
-            <field name='action_id' ref='action_config_picking_policy'/>
-            <field name='state'>open</field>
+        <record id="config_wizard_step_sale_picking_policy" model="ir.module.module.configuration.step">
+            <field name="name">Select the default picking policy for Sale Order</field>
+            <field name="note">This Configuration step use to set default picking policy when make sale order</field>
+            <field name="action_id" ref="action_config_picking_policy"/>
+            <field name="state">open</field>
         </record>
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_wizard.xml b/addons/sale/sale_wizard.xml
index 8a1582d5c5e..6a0d388e75f 100644
--- a/addons/sale/sale_wizard.xml
+++ b/addons/sale/sale_wizard.xml
@@ -1,20 +1,10 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <wizard
-			string="Make invoices"
-			model="sale.order"
-			name="sale.order.make_invoice"
-			keyword="client_action_multi"
-			id="wizard_sale_order_make_invoice"/>
+        <wizard id="wizard_sale_order_make_invoice" keyword="client_action_multi" model="sale.order" name="sale.order.make_invoice" string="Make invoices"/>
         
-        <wizard
-			string="Make invoices"
-			model="sale.order.line"
-			name="sale.order.line.make_invoice"
-			keyword="client_action_multi"
-			id="wizard_sale_order_line_invoice"/>
+        <wizard id="wizard_sale_order_line_invoice" keyword="client_action_multi" model="sale.order.line" name="sale.order.line.make_invoice" string="Make invoices"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index ed4a4983f6a..bab64fa038f 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="workflow" id="wkf_sale">
+        <record id="wkf_sale" model="workflow">
             <field name="name">sale.order.basic</field>
             <field name="osv">sale.order</field>
             <field name="on_create">True</field>
         </record>
         
         <!-- Activity -->
-        <record model="workflow.activity" id="act_draft">
+        <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
-        <record model="workflow.activity" id="act_router">
+        <record id="act_router" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">router</field>
             <field name="kind">function</field>
             <field name="action">action_wait()</field>
             <field name="split_mode">OR</field>
         </record>
-        <record model="workflow.activity" id="act_wait_invoice">
+        <record id="act_wait_invoice" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">wait_invoice</field>
         </record>
-        <record model="workflow.activity" id="act_wait_ship">
+        <record id="act_wait_ship" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">wait_ship</field>
         </record>
         
-        <record model="workflow.activity" id="act_done">
+        <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">done</field>
             <field name="flow_stop">True</field>
@@ -37,21 +37,21 @@
             <field name="action">write({'state':'done'})</field>
             <field name="join_mode">AND</field>
         </record>
-        <record model="workflow.activity" id="act_cancel">
+        <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">cancel</field>
             <field name="flow_stop">True</field>
             <field name="kind">stopall</field>
             <field name="action">action_cancel()</field>
         </record>
-        <record model="workflow.activity" id="act_cancel2">
+        <record id="act_cancel2" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">cancel2</field>
             <field name="flow_stop">True</field>
             <field name="kind">stopall</field>
             <field name="action">action_cancel()</field>
         </record>
-        <record model="workflow.activity" id="act_cancel3">
+        <record id="act_cancel3" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">cancel3</field>
             <field name="flow_stop">True</field>
@@ -59,25 +59,25 @@
             <field name="action">action_cancel()</field>
         </record>
         
-        <record model="workflow.activity" id="act_invoice">
+        <record id="act_invoice" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">invoice</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" search="[('name','=','account.invoice.basic')]"/>
             <field name="action">action_invoice_create()</field>
         </record>
-        <record model="workflow.activity" id="act_invoice_except">
+        <record id="act_invoice_except" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">invoice_except</field>
             <field name="kind">function</field>
             <field name="action">action_invoice_cancel()</field>
         </record>
-        <record model="workflow.activity" id="act_invoice_end">
+        <record id="act_invoice_end" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">invoice_end</field>
             <field name="kind">dummy</field>
         </record>
-        <record model="workflow.activity" id="act_invoice_cancel">
+        <record id="act_invoice_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">invoice_cancel</field>
             <field name="flow_stop">True</field>
@@ -85,7 +85,7 @@
             <field name="action">action_cancel()</field>
         </record>
         
-        <record model="workflow.activity" id="act_ship">
+        <record id="act_ship" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">ship</field>
             <field name="kind">function</field>
@@ -95,19 +95,19 @@
 			-->
             <field name="action">action_ship_create()</field>
         </record>
-        <record model="workflow.activity" id="act_ship_except">
+        <record id="act_ship_except" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">ship_except</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'shipping_except'})</field>
         </record>
-        <record model="workflow.activity" id="act_ship_end">
+        <record id="act_ship_end" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">ship_end</field>
             <field name="kind">function</field>
             <field name="action">action_ship_end()</field>
         </record>
-        <record model="workflow.activity" id="act_ship_cancel">
+        <record id="act_ship_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">ship_cancel</field>
             <field name="flow_stop">True</field>
@@ -117,113 +117,113 @@
         
         <!-- Transistion -->
         
-        <record model="workflow.transition" id="trans_invoice_end_done">
+        <record id="trans_invoice_end_done" model="workflow.transition">
             <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
         </record>
         
-        <record model="workflow.transition" id="trans_draft_router">
+        <record id="trans_draft_router" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_router"/>
             <field name="signal">order_confirm</field>
         </record>
         
-        <record model="workflow.transition" id="trans_draft_cancel">
+        <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
         
-        <record model="workflow.transition" id="trans_wait_invoice_all_lines_invoiced">
+        <record id="trans_wait_invoice_all_lines_invoiced" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="signal">all_lines</field>
         </record>
         
-        <record model="workflow.transition" id="trans_router_wait_invoice_shipping">
+        <record id="trans_router_wait_invoice_shipping" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="condition">(order_policy=='picking')</field>
         </record>
         
-        <record model="workflow.transition" id="trans_router_wait_invoice">
+        <record id="trans_router_wait_invoice" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_wait_invoice"/>
         </record>
         
-        <record model="workflow.transition" id="trans_router_wait_ship">
+        <record id="trans_router_wait_ship" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_wait_ship"/>
         </record>
         
-        <record model="workflow.transition" id="trans_wait_invoice_cancel2">
+        <record id="trans_wait_invoice_cancel2" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_cancel2"/>
             <field name="signal">cancel</field>
         </record>
         
-        <record model="workflow.transition" id="trans_wait_ship_cancel3">
+        <record id="trans_wait_ship_cancel3" model="workflow.transition">
             <field name="act_from" ref="act_wait_ship"/>
             <field name="act_to" ref="act_cancel3"/>
             <field name="signal">cancel</field>
         </record>
         
-        <record model="workflow.transition" id="trans_wait_ship_ship">
+        <record id="trans_wait_ship_ship" model="workflow.transition">
             <field name="act_from" ref="act_wait_ship"/>
             <field name="act_to" ref="act_ship"/>
             <field name="condition">(order_policy!='prepaid') or invoiced</field>
         </record>
         
-        <record model="workflow.transition" id="trans_wait_invoice_invoice">
+        <record id="trans_wait_invoice_invoice" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="condition">(order_policy=='prepaid') or ((order_policy=='postpaid') and shipped)</field>
         </record>
         
-        <record model="workflow.transition" id="trans_wait_invoice_invoice_manual">
+        <record id="trans_wait_invoice_invoice_manual" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">manual_invoice</field>
         </record>
         
-        <record model="workflow.transition" id="trans_invoice_invoice_end">
+        <record id="trans_invoice_invoice_end" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="signal">subflow.paid</field>
         </record>
-        <record model="workflow.transition" id="trans_invoice_invoice_except">
+        <record id="trans_invoice_invoice_except" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_invoice_except"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_invoice_except_invoice">
+        <record id="trans_invoice_except_invoice" model="workflow.transition">
             <field name="act_from" ref="act_invoice_except"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">invoice_recreate</field>
         </record>
-        <record model="workflow.transition" id="trans_invoice_except_invoice_end">
+        <record id="trans_invoice_except_invoice_end" model="workflow.transition">
             <field name="act_from" ref="act_invoice_except"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="signal">invoice_corrected</field>
         </record>
-        <record model="workflow.transition" id="trans_invoice_except_invoice_cancel">
+        <record id="trans_invoice_except_invoice_cancel" model="workflow.transition">
             <field name="act_from" ref="act_invoice_except"/>
             <field name="act_to" ref="act_invoice_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_ship_end_done">
+        <record id="trans_ship_end_done" model="workflow.transition">
             <field name="act_from" ref="act_ship_end"/>
             <field name="act_to" ref="act_done"/>
         </record>
         
-        <record model="workflow.transition" id="trans_ship_ship_end">
+        <record id="trans_ship_ship_end" model="workflow.transition">
             <field name="act_from" ref="act_ship"/>
             <field name="act_to" ref="act_ship_end"/>
             <field name="trigger_model">mrp.procurement</field>
             <field name="trigger_expr_id">procurement_lines_get()</field>
             <field name="condition">test_state('finished')</field>
         </record>
-        <record model="workflow.transition" id="trans_ship_ship_except">
+        <record id="trans_ship_ship_except" model="workflow.transition">
             <field name="act_from" ref="act_ship"/>
             <field name="act_to" ref="act_ship_except"/>
             <!--
@@ -232,21 +232,21 @@
 			-->
             <field name="condition">test_state('canceled')</field>
         </record>
-        <record model="workflow.transition" id="trans_ship_except_ship">
+        <record id="trans_ship_except_ship" model="workflow.transition">
             <field name="act_from" ref="act_ship_except"/>
             <field name="act_to" ref="act_ship"/>
             <field name="signal">ship_recreate</field>
         </record>
-        <record model="workflow.transition" id="trans_ship_except_ship_end">
+        <record id="trans_ship_except_ship_end" model="workflow.transition">
             <field name="act_from" ref="act_ship_except"/>
             <field name="act_to" ref="act_ship_end"/>
             <field name="signal">ship_corrected</field>
         </record>
-        <record model="workflow.transition" id="trans_ship_except_ship_cancel">
+        <record id="trans_ship_except_ship_cancel" model="workflow.transition">
             <field name="act_from" ref="act_ship_except"/>
             <field name="act_to" ref="act_ship_cancel"/>
             <field name="signal">ship_cancel</field>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index f1ee6ea7377..46c21107532 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="ir.ui.view" id="stock_picking_inherit_sale">
+        <record id="stock_picking_inherit_sale" model="ir.ui.view">
             <field name="name">stock.picking.form</field>
             <field name="model">stock.picking</field>
             <field name="type">form</field>
@@ -13,4 +14,4 @@
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/scrum/scrum_demo.xml b/addons/scrum/scrum_demo.xml
index d4f0348d1ba..4ec1b43644d 100644
--- a/addons/scrum/scrum_demo.xml
+++ b/addons/scrum/scrum_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -7,10 +7,10 @@
         <record id="scrum_project_1" model="scrum.project">
             <!-- FIXME !!! -->
             <field name="tasks">[24, 25, 28, 26, 27, 29, 30, 31, 32, 33, 34, 35, 37, 36, 38]</field>
-            <field name="manager" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="manager" search="[('login','=','demo')]"/>
             <field name="planned_hours">156.0</field>
             <field name="name">Tiny ERP - dev branch</field>
-            <field name="product_owner_id" model="res.users" search="[('login','=','demo')]"/>
+            <field model="res.users" name="product_owner_id" search="[('login','=','demo')]"/>
         </record>
         
         <!-- Resource: scrum.sprint -->
@@ -18,8 +18,8 @@
         <record id="scrum_sprint_0" model="scrum.sprint">
             <field name="date_stop">2005-12-20</field>
             <field name="name">Sprint for V3.2.0</field>
-            <field name="scrum_master_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="product_owner_id" model="res.users" search="[('login','=','admin')]"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field model="res.users" name="product_owner_id" search="[('login','=','admin')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="state">open</field>
         </record>
@@ -83,111 +83,111 @@
         
         <record id="scrum_task_3" model="scrum.task">
             <field name="planned_hours">4.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Review all English Terms</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_4" model="scrum.task">
             <field name="planned_hours">4.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Review all french terms</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_5" model="scrum.task">
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Analytic Accounting features</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_6" model="scrum.task">
             <field name="planned_hours">6.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Test and improve automatic migration system</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_0"/>
         </record>
         <record id="scrum_task_7" model="scrum.task">
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">General accounting features</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_8" model="scrum.task">
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Accounting Budgets</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_9" model="scrum.task">
             <field name="planned_hours">24.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="description">Cash book, general ledger, accounts list, aged trial balance</field>
             <field name="name">Accounting Report General</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_10" model="scrum.task">
             <field name="planned_hours">7.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Accounting Report Budget</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_11" model="scrum.task">
             <field name="planned_hours">8.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Accounting Report Analytic</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_12" model="scrum.task">
             <field name="planned_hours">4.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Bugfix - memory leak</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_13" model="scrum.task">
             <field name="planned_hours">2.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Bugfix - Translations</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_14" model="scrum.task">
             <field name="planned_hours">4.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Finnish the automated plugin system</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_2"/>
         </record>
         <record id="scrum_task_15" model="scrum.task">
             <field name="planned_hours">4.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Reshape the complete menu structure</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_6"/>
         </record>
         <record id="scrum_task_16" model="scrum.task">
             <field name="planned_hours">5.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="name">Test 3.2.0 before releasing</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_5"/>
         </record>
         <record id="scrum_task_17" model="scrum.task">
             <field name="planned_hours">12.0</field>
-            <field name="user_id" model="res.users" search="[('login','=','demo')]"/>
-            <field name="project_id" model="scrum.project" ref="scrum_project_1"/>
+            <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
+            <field model="scrum.project" name="project_id" ref="scrum_project_1"/>
             <field name="description">default values, onchange, required, add on top or bottom and shortcuts (Ctrl S, Ctrl X, ...)</field>
             <field name="name">Editable trees</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_7"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/scrum/scrum_report.xml b/addons/scrum/scrum_report.xml
index 6be7cf2ad92..0735a4bcbb0 100644
--- a/addons/scrum/scrum_report.xml
+++ b/addons/scrum/scrum_report.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <report string="Burndown Chart" model="project.task" name="project.tasks.burndown" auto="False"/>
+        <report auto="False" model="project.task" name="project.tasks.burndown" string="Burndown Chart"/>
         
-        <report string="Burndown Chart" model="scrum.sprint" name="scrum.sprint.burndown" auto="False"/>
+        <report auto="False" model="scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 06413c47824..6d008707018 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
@@ -10,128 +10,128 @@
         
         <!-- Scrum Project -->
         
-        <record id='view_scrum_project_form' model='ir.ui.view'>
-            <field name='name'>scrum.project.form</field>
-            <field name='model'>scrum.project</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='project.edit_project'/>
-            <field name='arch' type='xml'>
-                <field name='warn_manager' position='after'>
+        <record id="view_scrum_project_form" model="ir.ui.view">
+            <field name="name">scrum.project.form</field>
+            <field name="model">scrum.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <field name="warn_manager" position="after">
                     <newline/>
-                    <field name='product_owner_id' required='1' select='1'/>
-                    <field name='sprint_size'/>
+                    <field name="product_owner_id" required="1" select="1"/>
+                    <field name="sprint_size"/>
                 </field>
             </field>
         </record>
         
-        <record id='view_scrum_project_tree' model='ir.ui.view'>
-            <field name='name'>scrum.project.tree</field>
-            <field name='model'>scrum.project</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_id</field>
-            <field name='arch' type='xml'>
-                <tree string='Scrum Projects'>
-                    <field name='name'/>
-                    <field name='manager'/>
-                    <field name='product_owner_id'/>
-                    <field name='planned_hours' sum='Planned hours' widget='float_time'/>
-                    <field name='effective_hours' sum='Effective hours' widget='float_time'/>
+        <record id="view_scrum_project_tree" model="ir.ui.view">
+            <field name="name">scrum.project.tree</field>
+            <field name="model">scrum.project</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree string="Scrum Projects">
+                    <field name="name"/>
+                    <field name="manager"/>
+                    <field name="product_owner_id"/>
+                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
+                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                 </tree>
             </field>
         </record>
-        <record id='action_scrum_project_tree' model='ir.actions.act_window'>
-            <field name='name'>Projects</field>
-            <field name='res_model'>scrum.project</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_scrum_project_tree'/>
-            <field name='domain'>[('parent_id','=',False),('scrum','=',1)]</field>
+        <record id="action_scrum_project_tree" model="ir.actions.act_window">
+            <field name="name">Projects</field>
+            <field name="res_model">scrum.project</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_scrum_project_tree"/>
+            <field name="domain">[('parent_id','=',False),('scrum','=',1)]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Projects' action='action_scrum_project_tree' id='menu_action_scrum_project_tree'/>
+        <menuitem id="next_id_67" name="Scrum" parent="project.menu_main"/><menuitem action="action_scrum_project_tree" id="menu_action_scrum_project_tree" parent="next_id_67"/>
         
-        <record id='action_scrum_project_form' model='ir.actions.act_window'>
-            <field name='name'>Edit Projects</field>
-            <field name='res_model'>scrum.project</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_scrum_project_form'/>
-            <field name='domain'>[('scrum','=',1)]</field>
+        <record id="action_scrum_project_form" model="ir.actions.act_window">
+            <field name="name">Edit Projects</field>
+            <field name="res_model">scrum.project</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_scrum_project_form"/>
+            <field name="domain">[('scrum','=',1)]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Projects/Edit Projects' action='action_scrum_project_form' id='menu_action_scrum_project_form'/>
+        <menuitem action="action_scrum_project_form" id="menu_action_scrum_project_form" parent="scrum.menu_action_scrum_project_tree"/>
         
         
         <!--
 	Product backlog
 	-->
         
-        <record id='view_scrum_product_backlog_tree' model='ir.ui.view'>
-            <field name='name'>scrum.product.backlog.tree</field>
-            <field name='model'>scrum.product.backlog</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Scrum Product backlog'>
-                    <field name='priority'/>
-                    <field name='sequence'/>
-                    <field name='name'/>
-                    <field name='sprint_id'/>
-                    <field name='progress'/>
-                    <field name='effective_hours' sum='Effective hours' widget='float_time'/>
-                    <field name='planned_hours' sum='Planned hours' widget='float_time'/>
-                    <field name='state'/>
+        <record id="view_scrum_product_backlog_tree" model="ir.ui.view">
+            <field name="name">scrum.product.backlog.tree</field>
+            <field name="model">scrum.product.backlog</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Scrum Product backlog">
+                    <field name="priority"/>
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="sprint_id"/>
+                    <field name="progress"/>
+                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
+                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_scrum_product_backlog_form' model='ir.ui.view'>
-            <field name='name'>scrum.product.backlog.form</field>
-            <field name='model'>scrum.product.backlog</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Scrum Product backlog'>
+        <record id="view_scrum_product_backlog_form" model="ir.ui.view">
+            <field name="name">scrum.product.backlog.form</field>
+            <field name="model">scrum.product.backlog</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scrum Product backlog">
                     <notebook>
-                        <page string='Product backlog'>
-                            <field name='name' select='1' colspan='4'/>
-                            <field name='priority'/>
-                            <field name='sequence'/>
-                            <field name='project_id' select='1'/>
-                            <field name='sprint_id' domain='[(&apos;project_id&apos;,&apos;=&apos;,project_id)]' select='1'/>
-                            <field name='user_id' select='1'/>
-                            <field name='active' select='1'/>
-                            <field name='note' colspan='4'/>
-                            <field name='state' select='1'/>
-                            <field name='progress'/>
-                            <field name='effective_hours' widget='float_time'/>
-                            <field name='planned_hours' widget='float_time'/>
+                        <page string="Product backlog">
+                            <field colspan="4" name="name" select="1"/>
+                            <field name="priority"/>
+                            <field name="sequence"/>
+                            <field name="project_id" select="1"/>
+                            <field domain="[('project_id','=',project_id)]" name="sprint_id" select="1"/>
+                            <field name="user_id" select="1"/>
+                            <field name="active" select="1"/>
+                            <field colspan="4" name="note"/>
+                            <field name="state" select="1"/>
+                            <field name="progress"/>
+                            <field name="effective_hours" widget="float_time"/>
+                            <field name="planned_hours" widget="float_time"/>
                         </page>
-                        <page string='Tasks'>
-                            <field name='tasks_id' nolabel='1' widget='one2many_list' colspan='4'/>
+                        <page string="Tasks">
+                            <field colspan="4" name="tasks_id" nolabel="1" widget="one2many_list"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_product_backlog_form' model='ir.actions.act_window'>
-            <field name='name'>Backlogs</field>
-            <field name='res_model'>scrum.product.backlog</field>
-            <field name='view_type'>form</field>
+        <record id="action_product_backlog_form" model="ir.actions.act_window">
+            <field name="name">Backlogs</field>
+            <field name="res_model">scrum.product.backlog</field>
+            <field name="view_type">form</field>
         </record>
-        <menuitem name='Project Management/Scrum/Product Backlog' action='action_product_backlog_form' id='menu_action_product_backlog_form'/>
+        <menuitem action="action_product_backlog_form" id="menu_action_product_backlog_form" parent="scrum.next_id_67"/>
         
-        <record id='action_product_backlog_form_draft' model='ir.actions.act_window'>
-            <field name='name'>Draft Backlogs</field>
-            <field name='res_model'>scrum.product.backlog</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft')]</field>
+        <record id="action_product_backlog_form_draft" model="ir.actions.act_window">
+            <field name="name">Draft Backlogs</field>
+            <field name="res_model">scrum.product.backlog</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Product Backlog/Draft Backlogs' action='action_product_backlog_form_draft' id='menu_action_product_backlog_form_draft'/>
+        <menuitem action="action_product_backlog_form_draft" id="menu_action_product_backlog_form_draft" parent="scrum.menu_action_product_backlog_form"/>
         
-        <record id='action_product_backlog_form_open' model='ir.actions.act_window'>
-            <field name='name'>Opened Backlogs</field>
-            <field name='res_model'>scrum.product.backlog</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','open')]</field>
+        <record id="action_product_backlog_form_open" model="ir.actions.act_window">
+            <field name="name">Opened Backlogs</field>
+            <field name="res_model">scrum.product.backlog</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','open')]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Product Backlog/Opened Backlogs' action='action_product_backlog_form_open' id='menu_action_product_backlog_form_open'/>
+        <menuitem action="action_product_backlog_form_open" id="menu_action_product_backlog_form_open" parent="scrum.menu_action_product_backlog_form"/>
         
         
         
@@ -139,118 +139,118 @@
 		Scrum Sprint
 	-->
         
-        <record id='view_scrum_sprint_tree' model='ir.ui.view'>
-            <field name='name'>scrum.sprint.tree</field>
-            <field name='model'>scrum.sprint</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Scrum Sprint'>
-                    <field name='name'/>
-                    <field name='project_id'/>
-                    <field name='date_start'/>
-                    <field name='date_stop'/>
-                    <field name='progress'/>
-                    <field name='effective_hours' sum='Effective hours' widget='float_time'/>
-                    <field name='planned_hours' sum='Planned hours' widget='float_time'/>
-                    <field name='state'/>
+        <record id="view_scrum_sprint_tree" model="ir.ui.view">
+            <field name="name">scrum.sprint.tree</field>
+            <field name="model">scrum.sprint</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Scrum Sprint">
+                    <field name="name"/>
+                    <field name="project_id"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="progress"/>
+                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
+                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='view_scrum_sprint_form' model='ir.ui.view'>
-            <field name='name'>scrum.sprint.form</field>
-            <field name='model'>scrum.sprint</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Scrum Sprint'>
+        <record id="view_scrum_sprint_form" model="ir.ui.view">
+            <field name="name">scrum.sprint.form</field>
+            <field name="model">scrum.sprint</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scrum Sprint">
                     <notebook>
-                        <page string='Sprint Info'>
-                            <field name='name' select='1' colspan='4'/>
+                        <page string="Sprint Info">
+                            <field colspan="4" name="name" select="1"/>
                             <newline/>
-                            <field name='project_id' on_change='onchange_project_id(project_id)'/>
+                            <field name="project_id" on_change="onchange_project_id(project_id)"/>
                             <newline/>
-                            <field name='date_start' select='1'/>
-                            <field name='date_stop'/>
-                            <field name='product_owner_id'/>
-                            <field name='scrum_master_id'/>
-                            <field name='progress'/>
-                            <field name='effective_hours' widget='float_time'/>
-                            <field name='planned_hours' widget='float_time'/>
+                            <field name="date_start" select="1"/>
+                            <field name="date_stop"/>
+                            <field name="product_owner_id"/>
+                            <field name="scrum_master_id"/>
+                            <field name="progress"/>
+                            <field name="effective_hours" widget="float_time"/>
+                            <field name="planned_hours" widget="float_time"/>
                             <newline/>
-                            <separator colspan='4' string='State'/>
-                            <field name='state'/>
+                            <separator colspan="4" string="State"/>
+                            <field name="state"/>
                         </page>
-                        <page string='Daily Meetings'>
-                            <field name='meetings_id' nolabel='1' widget='one2many_list' colspan='4'/>
+                        <page string="Daily Meetings">
+                            <field colspan="4" name="meetings_id" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string='Review'>
-                            <field name='review' nolabel='1' colspan='4'/>
+                        <page string="Review">
+                            <field colspan="4" name="review" nolabel="1"/>
                         </page>
-                        <page string='Retrospective'>
-                            <field name='retrospective' nolabel='1' colspan='4'/>
+                        <page string="Retrospective">
+                            <field colspan="4" name="retrospective" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_sprint_form' model='ir.actions.act_window'>
-            <field name='name'>Sprint</field>
-            <field name='res_model'>scrum.sprint</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_scrum_sprint_form'/>
+        <record id="action_sprint_form" model="ir.actions.act_window">
+            <field name="name">Sprint</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_scrum_sprint_form"/>
         </record>
-        <menuitem name='Project Management/Scrum/Sprint' action='action_sprint_form' id='menu_action_sprint_form'/>
+        <menuitem action="action_sprint_form" id="menu_action_sprint_form" parent="scrum.next_id_67"/>
         
-        <record id='action_sprint_open_tree' model='ir.actions.act_window'>
-            <field name='name'>Opened Sprints</field>
-            <field name='res_model'>scrum.sprint</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('state','=','open')]</field>
+        <record id="action_sprint_open_tree" model="ir.actions.act_window">
+            <field name="name">Opened Sprints</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('state','=','open')]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Sprint/Opened Sprints' action='action_sprint_open_tree' id='menu_action_sprint_open_tree'/>
-        <record id='action_sprint_open_tree2' model='ir.actions.act_window'>
-            <field name='name'>Draft Sprints</field>
-            <field name='res_model'>scrum.sprint</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('state','=','draft')]</field>
+        <menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form"/>
+        <record id="action_sprint_open_tree2" model="ir.actions.act_window">
+            <field name="name">Draft Sprints</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('state','=','draft')]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Sprint/Draft Sprints' action='action_sprint_open_tree2' id='menu_action_sprint_open_tree2'/>
-        <record id='action_sprint_open_tree3' model='ir.actions.act_window'>
-            <field name='name'>Sprints Done</field>
-            <field name='res_model'>scrum.sprint</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('state','=','done')]</field>
+        <menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form"/>
+        <record id="action_sprint_open_tree3" model="ir.actions.act_window">
+            <field name="name">Sprints Done</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('state','=','done')]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Sprint/Sprints Done' action='action_sprint_open_tree3' id='menu_action_sprint_open_tree3'/>
+        <menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form"/>
         
-        <record id='action_sprint_open_tree4' model='ir.actions.act_window'>
-            <field name='name'>My Sprints (Product Owner)</field>
-            <field name='res_model'>scrum.sprint</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('product_owner_id','=',uid)]</field>
+        <record id="action_sprint_open_tree4" model="ir.actions.act_window">
+            <field name="name">My Sprints (Product Owner)</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('product_owner_id','=',uid)]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Sprint/My Sprints (Product Owner)' action='action_sprint_open_tree4' id='menu_action_sprint_open_tree4'/>
-        <record id='action_sprint_open_tree5' model='ir.actions.act_window'>
-            <field name='name'>My Sprints (Scrum Master)</field>
-            <field name='res_model'>scrum.sprint</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('scrum_master_id','=',uid)]</field>
+        <menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form"/>
+        <record id="action_sprint_open_tree5" model="ir.actions.act_window">
+            <field name="name">My Sprints (Scrum Master)</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('scrum_master_id','=',uid)]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Sprint/My Sprints (Scrum Master)' action='action_sprint_open_tree5' id='menu_action_sprint_open_tree5'/>
+        <menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form"/>
         
-        <record id='action_sprint_open_tree6' model='ir.actions.act_window'>
-            <field name='name'>My opened sprints (Product Owner)</field>
-            <field name='res_model'>scrum.sprint</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('product_owner_id','=',uid),('state','=','open')]</field>
+        <record id="action_sprint_open_tree6" model="ir.actions.act_window">
+            <field name="name">My opened sprints (Product Owner)</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('product_owner_id','=',uid),('state','=','open')]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Sprint/My Sprints (Product Owner)/Opened' action='action_sprint_open_tree6' id='menu_action_sprint_open_tree6'/>
-        <record id='action_sprint_open_tree7' model='ir.actions.act_window'>
-            <field name='name'>My opened sprints (Scrum Master)</field>
-            <field name='res_model'>scrum.sprint</field>
-            <field name='view_type'>tree</field>
-            <field name='domain'>[('scrum_master_id','=',uid),('state','=','open')]</field>
+        <menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4"/>
+        <record id="action_sprint_open_tree7" model="ir.actions.act_window">
+            <field name="name">My opened sprints (Scrum Master)</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('scrum_master_id','=',uid),('state','=','open')]</field>
         </record>
-        <menuitem name='Project Management/Scrum/Sprint/My Sprints (Scrum Master)/Opened' action='action_sprint_open_tree7' id='menu_action_sprint_open_tree7'/>
+        <menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5"/>
         
         
         
@@ -259,118 +259,118 @@
 	-->
         
         
-        <record id='view_scrum_meeting_tree' model='ir.ui.view'>
-            <field name='name'>scrum.meeting.tree</field>
-            <field name='model'>scrum.meeting</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Scrum Sprint'>
-                    <field name='date'/>
-                    <field name='name'/>
-                    <field name='sprint_id'/>
+        <record id="view_scrum_meeting_tree" model="ir.ui.view">
+            <field name="name">scrum.meeting.tree</field>
+            <field name="model">scrum.meeting</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Scrum Sprint">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="sprint_id"/>
                 </tree>
             </field>
         </record>
-        <record id='view_scrum_meeting_form' model='ir.ui.view'>
-            <field name='name'>Scrum Meeting</field>
-            <field name='model'>scrum.meeting</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Scrum Sprint'>
+        <record id="view_scrum_meeting_form" model="ir.ui.view">
+            <field name="name">Scrum Meeting</field>
+            <field name="model">scrum.meeting</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scrum Sprint">
                     <notebook>
-                        <page string='Scrum Meeting'>
-                            <field name='name' select='1'/>
-                            <field name='sprint_id'/>
-                            <separator string='What have you accomplished since yesterday ?' colspan='4'/>
-                            <field name='question_yesterday' nolabel='1' colspan='4'/>
-                            <separator string='What are you working on today ?' colspan='4'/>
-                            <field name='question_today' nolabel='1' colspan='4'/>
-                            <separator string='Is there anything blocking you ?' colspan='4'/>
-                            <field name='question_blocks' nolabel='1' colspan='4'/>
+                        <page string="Scrum Meeting">
+                            <field name="name" select="1"/>
+                            <field name="sprint_id"/>
+                            <separator colspan="4" string="What have you accomplished since yesterday ?"/>
+                            <field colspan="4" name="question_yesterday" nolabel="1"/>
+                            <separator colspan="4" string="What are you working on today ?"/>
+                            <field colspan="4" name="question_today" nolabel="1"/>
+                            <separator colspan="4" string="Is there anything blocking you ?"/>
+                            <field colspan="4" name="question_blocks" nolabel="1"/>
                         </page>
-                        <page string='Optionnal Info'>
-                            <field name='date'/>
+                        <page string="Optionnal Info">
+                            <field name="date"/>
                             <newline/>
-                            <separator string='Are your Sprint Backlog estimate accurate ?' colspan='4'/>
-                            <field name='question_backlog' nolabel='1' colspan='4'/>
+                            <separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/>
+                            <field colspan="4" name="question_backlog" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_meeting_form' model='ir.actions.act_window'>
-            <field name='name'>scrum.meeting.form</field>
-            <field name='res_model'>scrum.meeting</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_scrum_meeting_form'/>
+        <record id="action_meeting_form" model="ir.actions.act_window">
+            <field name="name">scrum.meeting.form</field>
+            <field name="res_model">scrum.meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_scrum_meeting_form"/>
         </record>
-        <menuitem name='Project Management/Scrum/Daily Meeting' action='action_meeting_form' id='menu_action_meeting_form'/>
+        <menuitem action="action_meeting_form" id="menu_action_meeting_form" parent="scrum.next_id_67"/>
         
         <!--
 	Clicks on a sprint: what a hack
 	-->
         
-        <record id='action_sprint_task_open' model='ir.actions.act_window'>
-            <field name='res_model'>scrum.task</field>
-            <field name='name'>View sprint Tasks</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('product_backlog_id', '=', 'S('+str(active_id)+')')]</field>
+        <record id="action_sprint_task_open" model="ir.actions.act_window">
+            <field name="res_model">scrum.task</field>
+            <field name="name">View sprint Tasks</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('product_backlog_id', '=', 'S('+str(active_id)+')')]</field>
         </record>
-        <record id='ir_scrum_sprint_open_task' model='ir.values'>
-            <field name='key2' eval=' &apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;scrum.sprint&apos;'/>
-            <field name='name'>View sprint tasks</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(action_sprint_task_open)'/>
-            <field name='object' eval='True'/>
+        <record id="ir_scrum_sprint_open_task" model="ir.values">
+            <field eval=" 'tree_but_open'" name="key2"/>
+            <field eval="'scrum.sprint'" name="model"/>
+            <field name="name">View sprint tasks</field>
+            <field eval="'ir.actions.act_window,'+str(action_sprint_task_open)" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
-        <record id='action_sprint_backlog_open' model='ir.actions.act_window'>
-            <field name='res_model'>scrum.product.backlog</field>
-            <field name='name'>View sprint backlog</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('sprint_id', '=', active_id)]</field>
+        <record id="action_sprint_backlog_open" model="ir.actions.act_window">
+            <field name="res_model">scrum.product.backlog</field>
+            <field name="name">View sprint backlog</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('sprint_id', '=', active_id)]</field>
         </record>
-        <record id='ir_scrum_sprint_open_sprint' model='ir.values'>
-            <field name='key2' eval=' &apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;scrum.sprint&apos;'/>
-            <field name='name'>View sprint backlog</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(action_sprint_backlog_open)'/>
-            <field name='object' eval='True'/>
+        <record id="ir_scrum_sprint_open_sprint" model="ir.values">
+            <field eval=" 'tree_but_open'" name="key2"/>
+            <field eval="'scrum.sprint'" name="model"/>
+            <field name="name">View sprint backlog</field>
+            <field eval="'ir.actions.act_window,'+str(action_sprint_backlog_open)" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         <!--
 	Clicks on a project
 	-->
         
-        <record id='dblc_proj' model='ir.actions.act_window'>
-            <field name='res_model'>scrum.product.backlog</field>
-            <field name='name'>View project's backlog</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('project_id', 'child_of', [active_id])]</field>
+        <record id="dblc_proj" model="ir.actions.act_window">
+            <field name="res_model">scrum.product.backlog</field>
+            <field name="name">View project's backlog</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('project_id', 'child_of', [active_id])]</field>
         </record>
-        <record id='ir_scrum_project_backlog' model='ir.values'>
-            <field name='key2' eval=' &apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;scrum.project&apos;'/>
-            <field name='name'>View project's backlog</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(dblc_proj)'/>
-            <field name='object' eval='True'/>
+        <record id="ir_scrum_project_backlog" model="ir.values">
+            <field eval=" 'tree_but_open'" name="key2"/>
+            <field eval="'scrum.project'" name="model"/>
+            <field name="name">View project's backlog</field>
+            <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
+            <field eval="True" name="object"/>
         </record>
-        <record id='dblc_proj2' model='ir.actions.act_window'>
-            <field name='res_model'>scrum.task</field>
-            <field name='name'>View project's tasks</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('project_id', 'child_of', [active_id])]</field>
+        <record id="dblc_proj2" model="ir.actions.act_window">
+            <field name="res_model">scrum.task</field>
+            <field name="name">View project's tasks</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('project_id', 'child_of', [active_id])]</field>
         </record>
-        <record id='ir_scrum_project_task' model='ir.values'>
-            <field name='key2' eval=' &apos;tree_but_open&apos;'/>
-            <field name='model' eval='&apos;scrum.project&apos;'/>
-            <field name='name'>View project's tasks</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(dblc_proj2)'/>
-            <field name='object' eval='True'/>
+        <record id="ir_scrum_project_task" model="ir.values">
+            <field eval=" 'tree_but_open'" name="key2"/>
+            <field eval="'scrum.project'" name="model"/>
+            <field name="name">View project's tasks</field>
+            <field eval="'ir.actions.act_window,'+str(dblc_proj2)" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         
@@ -378,72 +378,72 @@
         <!--
 	 Tasks
 	 -->
-        <record id='view_task_tree' model='ir.ui.view'>
-            <field name='name'>scrum.task.tree</field>
-            <field name='model'>scrum.task</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Scrum Tasks'>
-                    <field name='sequence'/>
-                    <field name='name'/>
-                    <field name='user_id'/>
-                    <field name='priority'/>
-                    <field name='date_deadline'/>
-                    <field name='progress'/>
-                    <field name='planned_hours' sum='Planned hours' widget='float_time'/>
-                    <field name='effective_hours' sum='Effective hours' widget='float_time'/>
-                    <field name='state'/>
+        <record id="view_task_tree" model="ir.ui.view">
+            <field name="name">scrum.task.tree</field>
+            <field name="model">scrum.task</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Scrum Tasks">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="priority"/>
+                    <field name="date_deadline"/>
+                    <field name="progress"/>
+                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
+                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_task_form2' model='ir.ui.view'>
-            <field name='name'>scrum.task.form</field>
-            <field name='model'>scrum.task</field>
-            <field name='type'>form</field>
-            <field name='inherit_id' ref='project.view_task_form2'/>
-            <field name='arch' type='xml'>
-                <field name='project_id' position='replace'>
+        <record id="view_task_form2" model="ir.ui.view">
+            <field name="name">scrum.task.form</field>
+            <field name="model">scrum.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="project_id" position="replace">
                     <newline/>
                     	
-                    <field name='project_id' required='1' select='1'/>
-                    <field name='product_backlog_id' domain='[(&apos;project_id&apos;,&apos;=&apos;,project_id)]' select='1'/>
+                    <field name="project_id" required="1" select="1"/>
+                    <field domain="[('project_id','=',project_id)]" name="product_backlog_id" select="1"/>
                 </field>
             </field>
         </record>
-        <record id='action_view_task' model='ir.actions.act_window'>
-            <field name='name'>All Tasks</field>
-            <field name='res_model'>scrum.task</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('scrum','=',1)]</field>
+        <record id="action_view_task" model="ir.actions.act_window">
+            <field name="name">All Tasks</field>
+            <field name="res_model">scrum.task</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('scrum','=',1)]</field>
         </record>
-        <menuitem name='Project Management/Scrum/All Tasks' action='action_view_task' id='menu_action_view_task'/>
+        <menuitem action="action_view_task" id="menu_action_view_task" parent="scrum.next_id_67"/>
         
-        <record id='action_view_task4' model='ir.actions.act_window'>
-            <field name='name'>My tasks</field>
-            <field name='res_model'>scrum.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id', '=', uid),('scrum','=',1)]</field>
+        <record id="action_view_task4" model="ir.actions.act_window">
+            <field name="name">My tasks</field>
+            <field name="res_model">scrum.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
         </record>
-        <menuitem name='Project Management/Scrum/All Tasks/My Tasks' action='action_view_task4' id='menu_action_view_task4'/>
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.menu_action_view_task"/>
         
-        <record id='action_view_task5' model='ir.actions.act_window'>
-            <field name='name'>My opened tasks</field>
-            <field name='res_model'>scrum.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('user_id','=',uid),('state','=','open'),('scrum','=',1)]</field>
+        <record id="action_view_task5" model="ir.actions.act_window">
+            <field name="name">My opened tasks</field>
+            <field name="res_model">scrum.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('state','=','open'),('scrum','=',1)]</field>
         </record>
-        <menuitem name='Project Management/Scrum/All Tasks/My Tasks/Opened' action='action_view_task5' id='menu_tasks_yours'/>
+        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="scrum.menu_action_view_task4"/>
         
-        <record id='action_view_task6' model='ir.actions.act_window'>
-            <field name='name'>Opened tasks</field>
-            <field name='res_model'>project.task</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','open'),('scrum','=',1)]</field>
+        <record id="action_view_task6" model="ir.actions.act_window">
+            <field name="name">Opened tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','open'),('scrum','=',1)]</field>
         </record>
-        <menuitem name='Project Management/All Tasks/Opened' action='action_view_task6' id='menu_action_view_task6'/>
+        <menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/scrum/scrum_wizard.xml b/addons/scrum/scrum_wizard.xml
index 88450bfe3bc..b744543dbc9 100644
--- a/addons/scrum/scrum_wizard.xml
+++ b/addons/scrum/scrum_wizard.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <wizard id="wizard_scrum_backlog_task" string="Created tasks" model="scrum.product.backlog" name="scrum.product.backlog.task.create"/>
+        <wizard id="wizard_scrum_backlog_task" model="scrum.product.backlog" name="scrum.product.backlog.task.create" string="Created tasks"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/stock/product_data.xml b/addons/stock/product_data.xml
index 2bf6a2d41b9..636a42178aa 100644
--- a/addons/stock/product_data.xml
+++ b/addons/stock/product_data.xml
@@ -1,45 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
-        <record model="ir.property" id="property_stock_journal">
+        <record id="property_stock_journal" model="ir.property">
             <field name="name">property_stock_journal</field>
             <field name="fields_id" search="[('model', '=', 'product.category'), ('name', '=', 'property_stock_journal')]"/>
-            <field name="value" eval="'account.journal,'+str(ref('account.stock_journal'))" model="account.journal"/>
+            <field eval="'account.journal,'+str(ref('account.stock_journal'))" model="account.journal" name="value"/>
         </record>
         
-        <record model="ir.property" id="property_stock_account_output_prd"
-			forcecreate="True">
+        <record forcecreate="True" id="property_stock_account_output_prd" model="ir.property">
             <field name="name">property_stock_account_output</field>
-            <field name="fields_id"
-				search="[('model','=','product.template'),('name','=','property_stock_account_output')]"/>
-            <field name="value" eval="False"/>
+            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_output')]"/>
+            <field eval="False" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="ir.property" id="property_stock_account_input_prd"
-			forcecreate="True">
+        <record forcecreate="True" id="property_stock_account_input_prd" model="ir.property">
             <field name="name">property_stock_account_input</field>
-            <field name="fields_id"
-				search="[('model','=','product.template'),('name','=','property_stock_account_input')]"/>
-            <field name="value" eval="False"/>
+            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_input')]"/>
+            <field eval="False" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="ir.property" id="property_stock_account_output_categ"
-			forcecreate="True">
+        <record forcecreate="True" id="property_stock_account_output_categ" model="ir.property">
             <field name="name">property_stock_account_output_categ</field>
-            <field name="fields_id"
-				search="[('model','=','product.category'),('name','=','property_stock_account_output_categ')]"/>
-            <field name="value" eval="False"/>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_output_categ')]"/>
+            <field eval="False" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record model="ir.property" id="property_stock_account_input_categ"
-			forcecreate="True">
+        <record forcecreate="True" id="property_stock_account_input_categ" model="ir.property">
             <field name="name">property_stock_account_input_categ</field>
-            <field name="fields_id"
-				search="[('model','=','product.category'),('name','=','property_stock_account_input_categ')]"/>
-            <field name="value" eval="False"/>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_input_categ')]"/>
+            <field eval="False" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index f7b8cd31508..d9332a643f1 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!--
 	Request link
 	-->
-        <record model="res.request.link" id="req_link_tracking">
+        <record id="req_link_tracking" model="res.request.link">
             <field name="name">Production Lot</field>
             <field name="object">stock.production.lot</field>
         </record>
@@ -25,12 +25,12 @@
             <field name="usage">view</field>
         </record>
         
-        <record model="stock.location" id="location_inventory">
+        <record id="location_inventory" model="stock.location">
             <field name="name">Inventory loss</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="usage">inventory</field>
         </record>
-        <record model="stock.location" id="location_procurement">
+        <record id="location_procurement" model="stock.location">
             <field name="name">Procurements</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
             <field name="usage">procurement</field>
@@ -51,7 +51,7 @@
             <field name="usage">customer</field>
         </record>
         <record id="stock_location_company" model="stock.location">
-            <field name="name" model="res.company" use="name" search="[]"/>
+            <field model="res.company" name="name" search="[]" use="name"/>
             <field name="usage">view</field>
             <field name="location_id" ref="stock_location_locations"/>
         </record>
@@ -69,41 +69,41 @@
         <!--
 	Properties
 	-->
-        <record model="ir.property" id="property_stock_supplier" forcecreate="True">
+        <record forcecreate="True" id="property_stock_supplier" model="ir.property">
             <field name="name">property_stock_supplier</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_stock_supplier')]"/>
-            <field name="value" eval="'stock.location,'+str(stock_location_suppliers)"/>
+            <field eval="'stock.location,'+str(stock_location_suppliers)" name="value"/>
         </record>
-        <record model="ir.property" id="property_stock_customer" forcecreate="True">
+        <record forcecreate="True" id="property_stock_customer" model="ir.property">
             <field name="name">property_stock_customer</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_stock_customer')]"/>
-            <field name="value" eval="'stock.location,'+str(stock_location_customers)"/>
+            <field eval="'stock.location,'+str(stock_location_customers)" name="value"/>
         </record>
         
-        <record model="ir.property" id="property_stock_procurement" forcecreate="True">
+        <record forcecreate="True" id="property_stock_procurement" model="ir.property">
             <field name="name">property_stock_procurement</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_procurement')]"/>
-            <field name="value" eval="'stock.location,'+str(location_procurement)"/>
+            <field eval="'stock.location,'+str(location_procurement)" name="value"/>
         </record>
-        <record model="ir.property" id="property_stock_inventory" forcecreate="True">
+        <record forcecreate="True" id="property_stock_inventory" model="ir.property">
             <field name="name">property_stock_inventory</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_inventory')]"/>
-            <field name="value" eval="'stock.location,'+str(location_inventory)"/>
+            <field eval="'stock.location,'+str(location_inventory)" name="value"/>
         </record>
-        <record model="ir.property" id="property_stock_production" forcecreate="True">
+        <record forcecreate="True" id="property_stock_production" model="ir.property">
             <field name="name">property_stock_production</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_production')]"/>
-            <field name="value" eval="'stock.location,'+str(location_production)"/>
+            <field eval="'stock.location,'+str(location_production)" name="value"/>
         </record>
         
         <!--
 	Resource: stock.warehouse
 	-->
-        <record model="stock.warehouse" id="warehouse0">
-            <field name="name" search="[]" model="res.company" use="name"/>
+        <record id="warehouse0" model="stock.warehouse">
+            <field model="res.company" name="name" search="[]" use="name"/>
             <field name="lot_input_id" ref="stock_location_stock"/>
             <field name="lot_stock_id" ref="stock_location_stock"/>
             <field name="lot_output_id" ref="stock_location_output"/>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 1721fa595a0..7b31c99db89 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         
@@ -37,7 +37,7 @@
         <record id="stock_location_14" model="stock.location">
             <field name="name">Finished products</field>
             <field name="location_id" ref="stock_location_13"/>
-            <field name="account_id" model="account.account" search="[('name','=','Merchandise Type B')]"/>
+            <field model="account.account" name="account_id" search="[('name','=','Merchandise Type B')]"/>
         </record>
         <record id="stock_location_15" model="stock.location">
             <field name="name">Sub Products</field>
@@ -181,9 +181,8 @@
         </record>
         
         <function model="stock.inventory" name="action_done">
-            <function model="stock.inventory" name="search" eval="[[]]"/>
+            <function eval="[[]]" model="stock.inventory" name="search"/>
         </function>
         
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/stock/stock_incoterms.xml b/addons/stock/stock_incoterms.xml
index 2b2ca6cff11..09db0b06255 100644
--- a/addons/stock/stock_incoterms.xml
+++ b/addons/stock/stock_incoterms.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="stock.incoterms" id="incoterm_EXW">
+        <record id="incoterm_EXW" model="stock.incoterms">
             <field name="code">EXW</field>
             <field name="name">EX WORKS</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_FCA">
+        <record id="incoterm_FCA" model="stock.incoterms">
             <field name="code">FCA</field>
             <field name="name">FREE CARRIER</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_FAS">
+        <record id="incoterm_FAS" model="stock.incoterms">
             <field name="code">FAS</field>
             <field name="name">FREE ALONGSIDE SHIP</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_FOB">
+        <record id="incoterm_FOB" model="stock.incoterms">
             <field name="code">FOB</field>
             <field name="name">FREE ON BOARD</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_CFR">
+        <record id="incoterm_CFR" model="stock.incoterms">
             <field name="code">CFR</field>
             <field name="name">COST AND FREIGHT</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_CIF">
+        <record id="incoterm_CIF" model="stock.incoterms">
             <field name="code">CIF</field>
             <field name="name">COST, INSURANCE AND FREIGHT</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_CPT">
+        <record id="incoterm_CPT" model="stock.incoterms">
             <field name="code">CPT</field>
             <field name="name">CARRIAGE PAID TO</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_CIP">
+        <record id="incoterm_CIP" model="stock.incoterms">
             <field name="code">CIP</field>
             <field name="name">CARRIAGE AND INSURANCE PAID TO</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_DAF">
+        <record id="incoterm_DAF" model="stock.incoterms">
             <field name="code">DAF</field>
             <field name="name">DELIVERED AT FRONTIER</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_DES">
+        <record id="incoterm_DES" model="stock.incoterms">
             <field name="code">DES</field>
             <field name="name">DELIVERED EX SHIP</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_DEQ">
+        <record id="incoterm_DEQ" model="stock.incoterms">
             <field name="code">DEQ</field>
             <field name="name">DELIVERED EX QUAY</field>
         </record>
-        <record model="stock.incoterms" id="incoterm_DDU">
+        <record id="incoterm_DDU" model="stock.incoterms">
             <field name="code">DDU</field>
             <field name="name">DELIVERED DUTY UNPAID</field>
         </record>
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index f0a4c36678e..7a092ded724 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -1,61 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <report
-			id="report_product_history"
-			string="Future stock forecast"
-			model="product.product"
-			name="stock.product.history"
-			auto="False"/>
+        <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future stock forecast"/>
         
         
-        <report
-			id="report_picking_list"
-			string="Packing list"
-			model="stock.picking"
-			name="stock.picking.list"
-			xml="stock/report/picking.xml"
-			xsl="stock/report/picking.xsl"/>
+        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Packing list" xml="stock/report/picking.xml" xsl="stock/report/picking.xsl"/>
         
-        <report
-			id="report_move_labels"
-			string="Print Item Labels"
-			model="stock.move"
-			name="stock.move.label"
-			xml="stock/report/lot_move_label.xml"
-			xsl="stock/report/lot_move_label.xsl"/>
+        <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         
-        <report
-			id="report_location_overview"
-			string="Location Overview"
-			model="stock.location"
-			name="stock.location.overview"
-			xml="stock/report/lot_overview.xml"
-			xsl="stock/report/lot_overview.xsl"/>
+        <report id="report_location_overview" model="stock.location" name="stock.location.overview" string="Location Overview" xml="stock/report/lot_overview.xml" xsl="stock/report/lot_overview.xsl"/>
         
-        <report
-			id="report_lot_location"
-			string="Lots by location"
-			model="stock.location"
-			name="lot.location"
-			rml="stock/report/lot_location.rml"
-			auto="False"/>
+        <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
         
-        <report
-			id="report_product_location"
-			string="Products Localisations"
-			model="product.product"
-			name="stock.product.location"
-			auto="False"/>
+        <report auto="False" id="report_product_location" model="product.product" name="stock.product.location" string="Products Localisations"/>
         
-        <report
-			id="report_location_overview_all"
-			string="Location Content (With childs)"
-			model="stock.location"
-			name="stock.location.overview.all"
-			xml="stock/report/lot_overview_all.xml"
-			xsl="stock/report/lot_overview_all.xsl"/>
+        <report id="report_location_overview_all" model="stock.location" name="stock.location.overview.all" string="Location Content (With childs)" xml="stock/report/lot_overview_all.xml" xsl="stock/report/lot_overview_all.xsl"/>
         <!--
 		<report
 			id="report_lot_ups"
@@ -66,4 +26,4 @@
 			auto="False" />
 -->
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 541ab371bb8..b5fd1fb138d 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data noupdate="1">
         <!--
 	Sequences for packings
 	-->
         
-        <record model="ir.sequence.type" id="seq_type_picking_out">
+        <record id="seq_type_picking_out" model="ir.sequence.type">
             <field name="name">Packing Out</field>
             <field name="code">stock.picking.out</field>
         </record>
-        <record model="ir.sequence.type" id="seq_type_picking_in">
+        <record id="seq_type_picking_in" model="ir.sequence.type">
             <field name="name">Packing In</field>
             <field name="code">stock.picking.in</field>
         </record>
-        <record model="ir.sequence.type" id="seq_type_picking_internal">
+        <record id="seq_type_picking_internal" model="ir.sequence.type">
             <field name="name">Packing Internal</field>
             <field name="code">stock.picking.internal</field>
         </record>
         
-        <record model="ir.sequence" id="seq_picking_out">
+        <record id="seq_picking_out" model="ir.sequence">
             <field name="name">Packing Out</field>
             <field name="code">stock.picking.out</field>
             <field name="prefix">OUT:</field>
         </record>
-        <record model="ir.sequence" id="seq_picking_in">
+        <record id="seq_picking_in" model="ir.sequence">
             <field name="name">Packing In</field>
             <field name="code">stock.picking.in</field>
             <field name="prefix">IN:</field>
         </record>
-        <record model="ir.sequence" id="seq_picking_internal">
+        <record id="seq_picking_internal" model="ir.sequence">
             <field name="name">Packing Internal</field>
             <field name="code">stock.picking.internal</field>
             <field name="prefix">INTERNAL:</field>
@@ -37,26 +37,26 @@
         <!--
 	Sequences from tracking numbers
 	-->
-        <record model="ir.sequence.type" id="sequence_type_serial">
+        <record id="sequence_type_serial" model="ir.sequence.type">
             <field name="name">Stock Production Lots</field>
             <field name="code">stock.lot.serial</field>
         </record>
-        <record model="ir.sequence" id="sequence_production_lots">
+        <record id="sequence_production_lots" model="ir.sequence">
             <field name="name">Stock Production Lots</field>
             <field name="code">stock.lot.serial</field>
             <field name="prefix">1234567890</field>
             <field name="padding">7</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
-            <field name="active" eval="False"/>
+            <field eval="False" name="active"/>
         </record>
         
-        <record model="ir.sequence.type" id="sequence_type_tracking">
+        <record id="sequence_type_tracking" model="ir.sequence.type">
             <field name="name">Stock Tracking Lots</field>
             <field name="code">stock.lot.tracking</field>
         </record>
         
-        <record model="ir.sequence" id="sequence_tracking">
+        <record id="sequence_tracking" model="ir.sequence">
             <field name="name">Stock Tracking Lots</field>
             <field name="code">stock.lot.tracking</field>
             <field name="prefix">1234567890</field>
@@ -65,5 +65,4 @@
             <field name="number_increment">1</field>
         </record>
     </data>
-</terp>
-
+</terp>
\ No newline at end of file
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2290d991908..5c8cab2bca9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1,35 +1,35 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <menuitem name='Stock Management' icon='terp-stock' id='menu_stock_root'/>
-        <menuitem name='Configuration' sequence='1' groups='base.group_admin' id='menu_stock_configuration' parent='menu_stock_root'/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Stock Management"/>
+        <menuitem groups="base.group_admin" id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="1"/>
         
         =============================
         Inventory Line
         =============================
-        <record id='stock_inventory_line_tree' model='ir.ui.view'>
-            <field name='name'>stock.inventory.line.tree</field>
-            <field name='model'>stock.inventory.line</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Stock Inventory Lines'>
-                    <field name='location_id'/>
-                    <field name='product_id'/>
-                    <field name='product_qty'/>
-                    <field name='product_uom'/>
+        <record id="stock_inventory_line_tree" model="ir.ui.view">
+            <field name="name">stock.inventory.line.tree</field>
+            <field name="model">stock.inventory.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock Inventory Lines">
+                    <field name="location_id"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>
                 </tree>
             </field>
         </record>
-        <record id='view_inventory_line_form' model='ir.ui.view'>
-            <field name='name'>stock.inventory.line.form</field>
-            <field name='model'>stock.inventory.line</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Stock Inventory Lines'>
-                    <field name='location_id' domain='[(&apos;usage&apos;,&apos;=&apos;,&apos;internal&apos;)]' colspan='4' select='1'/>
-                    <field name='product_id' on_change='on_change_product_id(location_id,product_id,product_uom)' context='location=location_id,uom=product_uom' select='1'/>
-                    <field name='product_uom'/>
-                    <field name='product_qty'/>
+        <record id="view_inventory_line_form" model="ir.ui.view">
+            <field name="name">stock.inventory.line.form</field>
+            <field name="model">stock.inventory.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock Inventory Lines">
+                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                    <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1"/>
+                    <field name="product_uom"/>
+                    <field name="product_qty"/>
                 </form>
             </field>
         </record>
@@ -37,245 +37,245 @@
         =============================
         Inventory
         =============================
-        <record id='view_inventory_tree' model='ir.ui.view'>
-            <field name='name'>stock.inventory.tree</field>
-            <field name='model'>stock.inventory</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Lot Inventory'>
-                    <field name='name'/>
-                    <field name='date'/>
-                    <field name='state'/>
+        <record id="view_inventory_tree" model="ir.ui.view">
+            <field name="name">stock.inventory.tree</field>
+            <field name="model">stock.inventory</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Lot Inventory">
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id='view_inventory_form' model='ir.ui.view'>
-            <field name='name'>stock.inventory.form</field>
-            <field name='model'>stock.inventory</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Lot Inventory'>
+        <record id="view_inventory_form" model="ir.ui.view">
+            <field name="name">stock.inventory.form</field>
+            <field name="model">stock.inventory</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Lot Inventory">
                     <notebook>
-                        <page string='General Informations'>
-                            <field name='name' select='1'/>
-                            <field name='date' select='1'/>
-                            <field name='inventory_line_id' nolabel='1' widget='one2many_list' colspan='4'/>
-                            <field name='state' select='1'/>
-                            <group col='2' colspan='2'>
-                                <button name='action_done' type='object' states='draft' string='Confirm Inventory'/>
-                                <button name='action_cancel' type='object' states='done' string='Cancel Inventory'/>
+                        <page string="General Informations">
+                            <field name="name" select="1"/>
+                            <field name="date" select="1"/>
+                            <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list"/>
+                            <field name="state" select="1"/>
+                            <group col="2" colspan="2">
+                                <button name="action_done" states="draft" string="Confirm Inventory" type="object"/>
+                                <button name="action_cancel" states="done" string="Cancel Inventory" type="object"/>
                             </group>
                         </page>
-                        <page string='Posted Inventory'>
-                            <field name='move_ids' nolabel='1' colspan='4'/>
+                        <page string="Posted Inventory">
+                            <field colspan="4" name="move_ids" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='action_inventory_form' model='ir.actions.act_window'>
-            <field name='name'>Physical Inventory</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>stock.inventory</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_inventory_tree'/>
+        <record id="action_inventory_form" model="ir.actions.act_window">
+            <field name="name">Physical Inventory</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_inventory_tree"/>
         </record>
-        <menuitem action='action_inventory_form' id='menu_action_inventory_form' parent='menu_stock_root'/>
+        <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_root"/>
         
-        <record id='action_inventory_line_form' model='ir.actions.act_window'>
-            <field name='name'>Inventory Lines</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>stock.inventory.line</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='view_id' ref='stock_inventory_line_tree'/>
+        <record id="action_inventory_line_form" model="ir.actions.act_window">
+            <field name="name">Inventory Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="stock_inventory_line_tree"/>
         </record>
-        <menuitem groups='base.group_extended' action='action_inventory_line_form' id='menu_action_inventory_line_form' parent='menu_action_inventory_form'/>
+        <menuitem action="action_inventory_line_form" groups="base.group_extended" id="menu_action_inventory_line_form" parent="menu_action_inventory_form"/>
         
         
         =============================
         Lot
         =============================
         
-        <record id='view_tracking_form' model='ir.ui.view'>
-            <field name='name'>stock.tracking.form</field>
-            <field name='model'>stock.tracking</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Tracking/Serial'>
-                    <field name='name' select='1'/>
-                    <field name='serial' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='active' select='1'/>
+        <record id="view_tracking_form" model="ir.ui.view">
+            <field name="name">stock.tracking.form</field>
+            <field name="model">stock.tracking</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Tracking/Serial">
+                    <field name="name" select="1"/>
+                    <field name="serial" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="active" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='view_tracking_tree' model='ir.ui.view'>
-            <field name='name'>stock.tracking.tree</field>
-            <field name='model'>stock.tracking</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Tracking/Serial'>
-                    <field name='name'/>
-                    <field name='serial'/>
-                    <field name='date'/>
-                    <field name='active'/>
+        <record id="view_tracking_tree" model="ir.ui.view">
+            <field name="name">stock.tracking.tree</field>
+            <field name="model">stock.tracking</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tracking/Serial">
+                    <field name="name"/>
+                    <field name="serial"/>
+                    <field name="date"/>
+                    <field name="active"/>
                 </tree>
             </field>
         </record>
-        <record id='action_tracking_form' model='ir.actions.act_window'>
-            <field name='name'>Tracking Lots</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>stock.tracking</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_tracking_tree'/>
+        <record id="action_tracking_form" model="ir.actions.act_window">
+            <field name="name">Tracking Lots</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.tracking</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_tracking_tree"/>
         </record>
-        <menuitem name='Traceability' sequence='2' id='menu_traceability' parent='menu_stock_root'/>
-        <menuitem action='action_tracking_form' id='menu_action_tracking_form' parent='menu_traceability'/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/>
+        <menuitem action="action_tracking_form" id="menu_action_tracking_form" parent="menu_traceability"/>
         
-        <record id='lot_line_tree' model='ir.ui.view'>
-            <field name='name'>stock.tracking.tree</field>
-            <field name='model'>stock.tracking</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree color='grey:not active' string='Tracking Number'>
-                    <field name='name' select='1'/>
-                    <field name='serial' select='1'/>
-                    <field name='date' select='1'/>
+        <record id="lot_line_tree" model="ir.ui.view">
+            <field name="name">stock.tracking.tree</field>
+            <field name="model">stock.tracking</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree color="grey:not active" string="Tracking Number">
+                    <field name="name" select="1"/>
+                    <field name="serial" select="1"/>
+                    <field name="date" select="1"/>
                 </tree>
             </field>
         </record>
         
-        <record id='view_production_lot_revision_form' model='ir.ui.view'>
-            <field name='name'>stock.production.lot.revision.form</field>
-            <field name='model'>stock.production.lot.revision</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Production Lot Revisions'>
-                    <field name='name' colspan='4'/>
-                    <field name='indice' colspan='2'/>
-                    <field name='date' colspan='2'/>
+        <record id="view_production_lot_revision_form" model="ir.ui.view">
+            <field name="name">stock.production.lot.revision.form</field>
+            <field name="model">stock.production.lot.revision</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Production Lot Revisions">
+                    <field colspan="4" name="name"/>
+                    <field colspan="2" name="indice"/>
+                    <field colspan="2" name="date"/>
                     <newline/>
-                    <field name='author_id' readonly='1'/>
+                    <field name="author_id" readonly="1"/>
                     <newline/>
-                    <field name='description'/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
-        <record id='view_production_lot_revision_tree' model='ir.ui.view'>
-            <field name='name'>stock.production.lot.revision.tree</field>
-            <field name='model'>stock.production.lot.revision</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Production Lot Revisions'>
-                    <field name='indice'/>
-                    <field name='author_id'/>
-                    <field name='date'/>
-                    <field name='name'/>
+        <record id="view_production_lot_revision_tree" model="ir.ui.view">
+            <field name="name">stock.production.lot.revision.tree</field>
+            <field name="model">stock.production.lot.revision</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Production Lot Revisions">
+                    <field name="indice"/>
+                    <field name="author_id"/>
+                    <field name="date"/>
+                    <field name="name"/>
                 </tree>
             </field>
         </record>
-        <record id='view_production_lot_form' model='ir.ui.view'>
-            <field name='name'>stock.production.lot.form</field>
-            <field name='model'>stock.production.lot</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Production Lot'>
-                    <field name='name' select='1'/>
-                    <field name='ref' select='1'/>
-                    <field name='date' select='1'/>
-                    <separator string='Revisions' colspan='4'/>
-                    <field name='revisions' widget='one2many_list' nolabel='1' colspan='4'/>
+        <record id="view_production_lot_form" model="ir.ui.view">
+            <field name="name">stock.production.lot.form</field>
+            <field name="model">stock.production.lot</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Production Lot">
+                    <field name="name" select="1"/>
+                    <field name="ref" select="1"/>
+                    <field name="date" select="1"/>
+                    <separator colspan="4" string="Revisions"/>
+                    <field colspan="4" name="revisions" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
-        <record id='view_production_lot_tree' model='ir.ui.view'>
-            <field name='name'>stock.production.lot.tree</field>
-            <field name='model'>stock.production.lot</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Production Lot'>
-                    <field name='name'/>
-                    <field name='ref'/>
-                    <field name='date'/>
-                    <field name='revisions'/>
+        <record id="view_production_lot_tree" model="ir.ui.view">
+            <field name="name">stock.production.lot.tree</field>
+            <field name="model">stock.production.lot</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Production Lot">
+                    <field name="name"/>
+                    <field name="ref"/>
+                    <field name="date"/>
+                    <field name="revisions"/>
                 </tree>
             </field>
         </record>
-        <record id='action_production_lot_form' model='ir.actions.act_window'>
-            <field name='name'>Production Lots</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>stock.production.lot</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_production_lot_tree'/>
+        <record id="action_production_lot_form" model="ir.actions.act_window">
+            <field name="name">Production Lots</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.production.lot</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_production_lot_tree"/>
         </record>
-        <menuitem action='action_production_lot_form' id='menu_action_production_lot_form' parent='menu_traceability'/>
+        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
         
         
         #
         # Lot composition (history)
         #
-        <record id='stock_move_tree' model='ir.ui.view'>
-            <field name='name'>stock.move.tree2</field>
-            <field name='model'>stock.move</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>move_history_ids</field>
-            <field name='arch' type='xml'>
-                <tree color='grey:state==&apos;cancel&apos;' string='Moves'>
-                    <field name='product_id' select='1'/>
-                    <field name='product_qty' select='1'/>
-                    <field name='product_uom' select='1' string='UOM'/>
-                    <field name='product_packaging'/>
-                    <field name='location_id' select='1'/>
-                    <field name='location_dest_id' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='date_planned' select='1'/>
-                    <field name='state'/>
+        <record id="stock_move_tree" model="ir.ui.view">
+            <field name="name">stock.move.tree2</field>
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field name="field_parent">move_history_ids</field>
+            <field name="arch" type="xml">
+                <tree color="grey:state=='cancel'" string="Moves">
+                    <field name="product_id" select="1"/>
+                    <field name="product_qty" select="1"/>
+                    <field name="product_uom" select="1" string="UOM"/>
+                    <field name="product_packaging"/>
+                    <field name="location_id" select="1"/>
+                    <field name="location_dest_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="date_planned" select="1"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='stock_move_tree2' model='ir.ui.view'>
-            <field name='name'>stock.move.tree2</field>
-            <field name='model'>stock.move</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>move_history_ids2</field>
-            <field name='arch' type='xml'>
-                <tree color='grey:state==&apos;cancel&apos;' string='Moves'>
-                    <field name='product_id' select='1'/>
-                    <field name='product_qty' select='1'/>
-                    <field name='product_uom' select='1' string='UOM'/>
-                    <field name='product_packaging'/>
-                    <field name='location_id' select='1'/>
-                    <field name='location_dest_id' select='1'/>
-                    <field name='date' select='1'/>
-                    <field name='date_planned' select='1'/>
-                    <field name='state'/>
+        <record id="stock_move_tree2" model="ir.ui.view">
+            <field name="name">stock.move.tree2</field>
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field name="field_parent">move_history_ids2</field>
+            <field name="arch" type="xml">
+                <tree color="grey:state=='cancel'" string="Moves">
+                    <field name="product_id" select="1"/>
+                    <field name="product_qty" select="1"/>
+                    <field name="product_uom" select="1" string="UOM"/>
+                    <field name="product_packaging"/>
+                    <field name="location_id" select="1"/>
+                    <field name="location_dest_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="date_planned" select="1"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <wizard name='stock.traceability.lot.amont' id='action_lot2' model='stock.production.lot' string='Downstream traceability'/>
-        <wizard name='stock.traceability.lot.aval' id='action_lot4' model='stock.production.lot' string='Upstream traceability'/>
+        <wizard id="action_lot2" model="stock.production.lot" name="stock.traceability.lot.amont" string="Downstream traceability"/>
+        <wizard id="action_lot4" model="stock.production.lot" name="stock.traceability.lot.aval" string="Upstream traceability"/>
         
-        <wizard name='stock.traceability.amont' id='action2' model='stock.tracking' string='Upstream traceability'/>
-        <wizard name='stock.traceability.aval' id='action4' model='stock.tracking' string='Downstream traceability'/>
+        <wizard id="action2" model="stock.tracking" name="stock.traceability.amont" string="Upstream traceability"/>
+        <wizard id="action4" model="stock.tracking" name="stock.traceability.aval" string="Downstream traceability"/>
         
-        <record id='action3' model='ir.actions.act_window'>
-            <field name='name'>Downstream traceability</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>stock.move</field>
-            <field name='domain'>[('id','in',active_ids)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' eval='stock_move_tree'/>
+        <record id="action3" model="ir.actions.act_window">
+            <field name="name">Downstream traceability</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.move</field>
+            <field name="domain">[('id','in',active_ids)]</field>
+            <field name="view_type">tree</field>
+            <field eval="stock_move_tree" name="view_id"/>
         </record>
-        <record id='ir_move_traceability_upstream' model='ir.values'>
-            <field name='key2' eval='&apos;tree_but_action&apos;'/>
-            <field name='model' eval='&apos;stock.move&apos;'/>
-            <field name='name'>Downstream traceability</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(action3)'/>
-            <field name='object' eval='True'/>
+        <record id="ir_move_traceability_upstream" model="ir.values">
+            <field eval="'tree_but_action'" name="key2"/>
+            <field eval="'stock.move'" name="model"/>
+            <field name="name">Downstream traceability</field>
+            <field eval="'ir.actions.act_window,'+str(action3)" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         
@@ -283,20 +283,20 @@
         # Composed lots
         #
         
-        <record id='action5' model='ir.actions.act_window'>
-            <field name='name'>Upstream traceability</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>stock.move</field>
-            <field name='domain'>[('id','in',active_ids)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' eval='stock_move_tree2'/>
+        <record id="action5" model="ir.actions.act_window">
+            <field name="name">Upstream traceability</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.move</field>
+            <field name="domain">[('id','in',active_ids)]</field>
+            <field name="view_type">tree</field>
+            <field eval="stock_move_tree2" name="view_id"/>
         </record>
-        <record id='ir_move_traceability_downstream' model='ir.values'>
-            <field name='key2' eval='&apos;tree_but_action&apos;'/>
-            <field name='model' eval='&apos;stock.move&apos;'/>
-            <field name='name'>Upstream traceability</field>
-            <field name='value' eval='&apos;ir.actions.act_window,&apos;+str(action5)'/>
-            <field name='object' eval='True'/>
+        <record id="ir_move_traceability_downstream" model="ir.values">
+            <field eval="'tree_but_action'" name="key2"/>
+            <field eval="'stock.move'" name="model"/>
+            <field name="name">Upstream traceability</field>
+            <field eval="'ir.actions.act_window,'+str(action5)" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         
@@ -304,210 +304,210 @@
         =============================
         Location
         =============================
-        <record id='view_location_form' model='ir.ui.view'>
-            <field name='name'>stock.location.form</field>
-            <field name='model'>stock.location</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Stock location'>
+        <record id="view_location_form" model="ir.ui.view">
+            <field name="name">stock.location.form</field>
+            <field name="model">stock.location</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock location">
                     <notebook>
-                        <page string='General Informations'>
-                            <field name='name' select='1'/>
-                            <field name='active' select='2'/>
-                            <field name='usage' select='1'/>
-                            <field name='account_id' select='1'/>
-                            <field name='location_id'/>
-                            <field name='address_id'/>
-                            <field name='chained_location_type'/>
-                            <field name='chained_location_id'/>
-                            <field name='chained_auto_packing'/>
-                            <field name='chained_delay'/>
+                        <page string="General Informations">
+                            <field name="name" select="1"/>
+                            <field name="active" select="2"/>
+                            <field name="usage" select="1"/>
+                            <field name="account_id" select="1"/>
+                            <field name="location_id"/>
+                            <field name="address_id"/>
+                            <field name="chained_location_type"/>
+                            <field name="chained_location_id"/>
+                            <field name="chained_auto_packing"/>
+                            <field name="chained_delay"/>
                             <newline/>
-                            <field name='comment' colspan='4'/>
+                            <field colspan="4" name="comment"/>
                         </page>
-                        <page string='Localisation'>
-                            <field name='posx'/>
-                            <field name='posy'/>
-                            <field name='posz'/>
+                        <page string="Localisation">
+                            <field name="posx"/>
+                            <field name="posy"/>
+                            <field name="posz"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
-        <record id='view_location_tree2' model='ir.ui.view'>
-            <field name='name'>stock.location.tree</field>
-            <field name='model'>stock.location</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Stock location'>
-                    <field name='name'/>
-                    <field name='usage'/>
-                    <field name='account_id'/>
-                    <field name='active'/>
+        <record id="view_location_tree2" model="ir.ui.view">
+            <field name="name">stock.location.tree</field>
+            <field name="model">stock.location</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock location">
+                    <field name="name"/>
+                    <field name="usage"/>
+                    <field name="account_id"/>
+                    <field name="active"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_location_form' model='ir.actions.act_window'>
-            <field name='name'>Locations</field>
-            <field name='res_model'>stock.location</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_location_tree2'/>
+        <record id="action_location_form" model="ir.actions.act_window">
+            <field name="name">Locations</field>
+            <field name="res_model">stock.location</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_location_tree2"/>
         </record>
-        <menuitem action='action_location_form' id='menu_action_location_form' parent='menu_stock_configuration'/>
+        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration"/>
         
-        <record id='view_location_tree' model='ir.ui.view'>
-            <field name='name'>stock.location.tree</field>
-            <field name='model'>stock.location</field>
-            <field name='type'>tree</field>
-            <field name='field_parent'>child_ids</field>
-            <field name='arch' type='xml'>
-                <tree color='grey:usage in (&apos;procurement&apos;,&apos;inventory&apos;,&apos;production&apos;)' string='Stock location tree'>
-                    <field name='name'/>
-                    <field name='usage' visible='0'/>
+        <record id="view_location_tree" model="ir.ui.view">
+            <field name="name">stock.location.tree</field>
+            <field name="model">stock.location</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree color="grey:usage in ('procurement','inventory','production')" string="Stock location tree">
+                    <field name="name"/>
+                    <field name="usage" visible="0"/>
                 </tree>
             </field>
         </record>
-        <record id='action_location_tree' model='ir.actions.act_window'>
-            <field name='name'>Locations Structure</field>
-            <field name='res_model'>stock.location</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='domain'>[('location_id','=',False)]</field>
-            <field name='view_type'>tree</field>
-            <field name='view_id' ref='view_location_tree'/>
+        <record id="action_location_tree" model="ir.actions.act_window">
+            <field name="name">Locations Structure</field>
+            <field name="res_model">stock.location</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="domain">[('location_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_location_tree"/>
         </record>
-        <menuitem action='action_location_tree' id='menu_action_location_tree' parent='menu_stock_root'/>
+        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_root"/>
         
         =============================
         Warehouse
         =============================
-        <record id='view_warehouse' model='ir.ui.view'>
-            <field name='name'>stock.warehouse</field>
-            <field name='model'>stock.warehouse</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Warehouse'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='lot_input_id'/>
-                    <field name='lot_stock_id'/>
-                    <field name='lot_output_id'/>
+        <record id="view_warehouse" model="ir.ui.view">
+            <field name="name">stock.warehouse</field>
+            <field name="model">stock.warehouse</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Warehouse">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="lot_input_id"/>
+                    <field name="lot_stock_id"/>
+                    <field name="lot_output_id"/>
                     <newline/>
-                    <field name='partner_address_id'/>
+                    <field name="partner_address_id"/>
                 </form>
             </field>
         </record>
-        <record id='view_warehouse_tree' model='ir.ui.view'>
-            <field name='name'>stock.warehouse.tree</field>
-            <field name='model'>stock.warehouse</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Warehouse'>
-                    <field name='name'/>
-                    <field name='lot_input_id'/>
-                    <field name='lot_stock_id'/>
-                    <field name='lot_output_id'/>
-                    <field name='partner_address_id'/>
+        <record id="view_warehouse_tree" model="ir.ui.view">
+            <field name="name">stock.warehouse.tree</field>
+            <field name="model">stock.warehouse</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Warehouse">
+                    <field name="name"/>
+                    <field name="lot_input_id"/>
+                    <field name="lot_stock_id"/>
+                    <field name="lot_output_id"/>
+                    <field name="partner_address_id"/>
                 </tree>
             </field>
         </record>
-        <record id='action_warehouse_form' model='ir.actions.act_window'>
-            <field name='name'>Warehouses</field>
-            <field name='res_model'>stock.warehouse</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_warehouse_tree'/>
+        <record id="action_warehouse_form" model="ir.actions.act_window">
+            <field name="name">Warehouses</field>
+            <field name="res_model">stock.warehouse</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_warehouse_tree"/>
         </record>
-        <menuitem action='action_warehouse_form' id='menu_action_warehouse_form' parent='menu_stock_configuration'/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_stock_configuration"/>
         
         =============================
         Packing
         =============================
-        <record id='vpicktree' model='ir.ui.view'>
-            <field name='name'>stock.picking.tree</field>
-            <field name='model'>stock.picking</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree color='red:state==&apos;cancel&apos;' string='Packing list'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='date' select='1'/>
-                    <field name='address_id' select='1'/>
-                    <field name='invoice_state' readonly='1'/>
-                    <field name='origin' select='1'/>
-                    <field name='state' readonly='1'/>
+        <record id="vpicktree" model="ir.ui.view">
+            <field name="name">stock.picking.tree</field>
+            <field name="model">stock.picking</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree color="red:state=='cancel'" string="Packing list">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="address_id" select="1"/>
+                    <field name="invoice_state" readonly="1"/>
+                    <field name="origin" select="1"/>
+                    <field name="state" readonly="1"/>
                 </tree>
             </field>
         </record>
-        <record id='view_picking_form' model='ir.ui.view'>
-            <field name='name'>stock.picking.form</field>
-            <field name='model'>stock.picking</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Packing list'>
+        <record id="view_picking_form" model="ir.ui.view">
+            <field name="name">stock.picking.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Packing list">
                     <notebook>
-                        <page string='General Information'>
-                            <field name='name' select='1'/>
-                            <field name='date' select='1'/>
+                        <page string="General Information">
+                            <field name="name" select="1"/>
+                            <field name="date" select="1"/>
                             <newline/>
-                            <field name='type' select='2'/>
-                            <field name='invoice_state' select='2'/>
+                            <field name="type" select="2"/>
+                            <field name="invoice_state" select="2"/>
                             <newline/>
-                            <field name='location_id'/>
-                            <field name='location_dest_id'/>
-                            <field name='address_id' select='2'/>
-                            <field name='move_lines' widget='one2many_list' nolabel='1' colspan='4'>
-                                <form string='Stock Moves'>
-                                    <separator string='Move Information' colspan='4'/>
-                                    <field name='product_id' on_change='onchange_product_id(product_id, parent.location_id, parent.location_dest_id)' context='location=parent.location_id' colspan='4' select='1'/>
-                                    <field name='product_uom' select='1'/>
-                                    <field name='product_qty' select='1'/>
-                                    <field name='product_uos' groups='product.group_uos'/>
-                                    <field name='product_uos_qty' groups='product.group_uos'/>
-                                    <field name='name' select='1' colspan='4'/>
-                                    <field name='date'/>
-                                    <field name='date_planned'/>
-                                    <field name='priority'/>
-                                    <field name='location_id' select='1'/>
-                                    <field name='location_dest_id' select='1'/>
-                                    <field name='address_id' select='1'/>
-                                    <field name='product_packaging'/>
-                                    <field name='prodlot_id' context='product_id=product_id' select='1'/>
-                                    <field name='tracking_id' select='1'/>
+                            <field name="location_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="address_id" select="2"/>
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
+                                <form string="Stock Moves">
+                                    <separator colspan="4" string="Move Information"/>
+                                    <field colspan="4" context="location=parent.location_id" name="product_id" on_change="onchange_product_id(product_id, parent.location_id, parent.location_dest_id)" select="1"/>
+                                    <field name="product_uom" select="1"/>
+                                    <field name="product_qty" select="1"/>
+                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos_qty"/>
+                                    <field colspan="4" name="name" select="1"/>
+                                    <field name="date"/>
+                                    <field name="date_planned"/>
+                                    <field name="priority"/>
+                                    <field name="location_id" select="1"/>
+                                    <field name="location_dest_id" select="1"/>
+                                    <field name="address_id" select="1"/>
+                                    <field name="product_packaging"/>
+                                    <field context="product_id=product_id" name="prodlot_id" select="1"/>
+                                    <field name="tracking_id" select="1"/>
                                     <newline/>
                                     <label/>
-                                    <button name='%(track_line)d' type='action' string='Split in production lots'/>
+                                    <button name="%(track_line)d" string="Split in production lots" type="action"/>
                                     
-                                    <separator string='Move State' colspan='4'/>
-                                    <field name='state' select='1'/>
+                                    <separator colspan="4" string="Move State"/>
+                                    <field name="state" select="1"/>
                                     <group>
-                                        <button name='force_assign' type='object' states='confirmed' string='Force assignation'/>
-                                        <button name='cancel_assign' type='object' states='assigned' string='Cancel assignation'/>
+                                        <button name="force_assign" states="confirmed" string="Force assignation" type="object"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel assignation" type="object"/>
                                     </group>
                                 </form>
                             </field>
-                            <group col='7' colspan='4'>
-                                <label colspan='6'/>
-                                <button name='%(move_split)d' type='action' string='Split move lines in two'/>
+                            <group col="7" colspan="4">
+                                <label colspan="6"/>
+                                <button name="%(move_split)d" string="Split move lines in two" type="action"/>
                             </group>
-                            <group col='8' colspan='4'>
-                                <field name='state' readonly='1'/>
-                                <button name='button_confirm' states='draft' string='Confirm'/>
-                                <button name='action_assign' type='object' states='confirmed' string='Assign'/>
-                                <button name='force_assign' type='object' states='confirmed' string='Force Assignation'/>
-                                <button name='cancel_assign' type='object' states='assigned' string='Cancel Assignation'/>
-                                <button name='%(partial_picking)d' type='action' states='assigned' string='Validate'/>
-                                <button name='button_cancel' states='assigned,confirmed,draft' string='Cancel'/>
+                            <group col="8" colspan="4">
+                                <field name="state" readonly="1"/>
+                                <button name="button_confirm" states="draft" string="Confirm"/>
+                                <button name="action_assign" states="confirmed" string="Assign" type="object"/>
+                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
+                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
                         </page>
-                        <page string='Notes'>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string='Others info'>
-                            <field name='origin' select='2'/>
-                            <field name='active' select='2'/>
-                            <field name='auto_picking'/>
+                        <page string="Others info">
+                            <field name="origin" select="2"/>
+                            <field name="active" select="2"/>
+                            <field name="auto_picking"/>
                             <newline/>
-                            <field name='move_type'/>
+                            <field name="move_type"/>
                         </page>
                     </notebook>
                 </form>
@@ -518,79 +518,79 @@
         # Delivery Orders
         # 
         
-        <record id='view_picking_delivery_tree' model='ir.ui.view'>
-            <field name='name'>stock.picking.delivery.tree</field>
-            <field name='model'>stock.picking</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree color='red:state==&apos;cancel&apos;' string='Packing list'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='date' select='1'/>
-                    <field name='address_id' select='1'/>
-                    <field name='origin' select='1'/>
-                    <field name='state' readonly='1'/>
+        <record id="view_picking_delivery_tree" model="ir.ui.view">
+            <field name="name">stock.picking.delivery.tree</field>
+            <field name="model">stock.picking</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree color="red:state=='cancel'" string="Packing list">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="address_id" select="1"/>
+                    <field name="origin" select="1"/>
+                    <field name="state" readonly="1"/>
                 </tree>
             </field>
         </record>
-        <record id='view_picking_delivery_form' model='ir.ui.view'>
-            <field name='name'>stock.picking.delivery.form</field>
-            <field name='model'>stock.picking</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Packing list'>
+        <record id="view_picking_delivery_form" model="ir.ui.view">
+            <field name="name">stock.picking.delivery.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Packing list">
                     <notebook>
-                        <page string='General Information'>
-                            <field name='name' select='1'/>
-                            <field name='date' select='1'/>
+                        <page string="General Information">
+                            <field name="name" select="1"/>
+                            <field name="date" select="1"/>
                             <newline/>
-                            <field name='address_id' select='2'/>
-                            <field name='move_lines' widget='one2many_list' nolabel='1' colspan='4'>
-                                <form string='Stock Moves'>
-                                    <separator string='Move Information' colspan='4'/>
-                                    <field name='product_id' on_change='onchange_product_id(product_id, parent.location_id, parent.location_dest_id)' context='location=parent.location_id' colspan='4' select='1'/>
-                                    <field name='product_uom' select='1'/>
-                                    <field name='product_qty' select='1'/>
-                                    <field name='product_uos' groups='product.group_uos'/>
-                                    <field name='product_uos_qty' groups='product.group_uos'/>
-                                    <field name='name' invisible='1' select='1' colspan='4'/>
-                                    <field name='date' invisible='1'/>
-                                    <field name='date_planned'/>
-                                    <field name='location_id' select='1'/>
-                                    <field name='location_dest_id' select='1'/>
-                                    <field name='product_packaging' groups='base.group_extended'/>
-                                    <field name='prodlot_id' context='product_id=product_id' select='1'/>
-                                    <field name='tracking_id' groups='base.group_extended' select='1'/>
-                                    <separator string='Move State' colspan='4'/>
-                                    <field name='state' select='1'/>
+                            <field name="address_id" select="2"/>
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
+                                <form string="Stock Moves">
+                                    <separator colspan="4" string="Move Information"/>
+                                    <field colspan="4" context="location=parent.location_id" name="product_id" on_change="onchange_product_id(product_id, parent.location_id, parent.location_dest_id)" select="1"/>
+                                    <field name="product_uom" select="1"/>
+                                    <field name="product_qty" select="1"/>
+                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos_qty"/>
+                                    <field colspan="4" invisible="1" name="name" select="1"/>
+                                    <field invisible="1" name="date"/>
+                                    <field name="date_planned"/>
+                                    <field name="location_id" select="1"/>
+                                    <field name="location_dest_id" select="1"/>
+                                    <field groups="base.group_extended" name="product_packaging"/>
+                                    <field context="product_id=product_id" name="prodlot_id" select="1"/>
+                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                    <separator colspan="4" string="Move State"/>
+                                    <field name="state" select="1"/>
                                     <group>
-                                        <button name='force_assign' type='object' states='confirmed' string='Force assignation'/>
-                                        <button name='cancel_assign' type='object' states='assigned' string='Cancel assignation'/>
+                                        <button name="force_assign" states="confirmed" string="Force assignation" type="object"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel assignation" type="object"/>
                                     </group>
                                 </form>
                             </field>
-                            <group col='7' colspan='4'>
-                                <label colspan='6'/>
-                                <button name='%(move_split)d' type='action' string='Split in Two'/>
+                            <group col="7" colspan="4">
+                                <label colspan="6"/>
+                                <button name="%(move_split)d" string="Split in Two" type="action"/>
                             </group>
-                            <group col='8' colspan='4'>
-                                <field name='state' readonly='1'/>
-                                <button name='button_confirm' states='draft' string='Confirm'/>
-                                <button name='action_assign' type='object' states='confirmed' string='Assign'/>
-                                <button name='force_assign' type='object' states='confirmed' string='Force Assignation'/>
-                                <button name='cancel_assign' type='object' states='assigned' string='Cancel Assignation'/>
-                                <button name='%(partial_picking)d' type='action' states='assigned' string='Validate'/>
-                                <button name='button_cancel' states='assigned,confirmed,draft' string='Cancel'/>
+                            <group col="8" colspan="4">
+                                <field name="state" readonly="1"/>
+                                <button name="button_confirm" states="draft" string="Confirm"/>
+                                <button name="action_assign" states="confirmed" string="Assign" type="object"/>
+                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
+                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
                         </page>
-                        <page string='Notes'>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string='Others info'>
-                            <field name='origin' select='2'/>
-                            <field name='active' select='2'/>
-                            <field name='auto_picking'/>
+                        <page string="Others info">
+                            <field name="origin" select="2"/>
+                            <field name="active" select="2"/>
+                            <field name="auto_picking"/>
                             <newline/>
-                            <field name='move_type'/>
+                            <field name="move_type"/>
                         </page>
                     </notebook>
                 </form>
@@ -598,318 +598,318 @@
         </record>
         
         
-        <record id='action_picking_tree_delivery' model='ir.actions.act_window'>
-            <field name='name'>Delivery Orders</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('type','=','delivery')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree_delivery" model="ir.actions.act_window">
+            <field name="name">Delivery Orders</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','=','delivery')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <record id='action_picking_tree_delivery_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_delivery_tree'/>
-            <field name='act_window_id' ref='action_picking_tree_delivery'/>
+        <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_delivery_tree"/>
+            <field name="act_window_id" ref="action_picking_tree_delivery"/>
         </record>
-        <record id='action_picking_tree_delivery_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_delivery_form'/>
-            <field name='act_window_id' ref='action_picking_tree_delivery'/>
+        <record id="action_picking_tree_delivery_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_delivery_form"/>
+            <field name="act_window_id" ref="action_picking_tree_delivery"/>
         </record>
         
-        <menuitem sequence='20' groups='base.group_extended' action='action_picking_tree_delivery' id='menu_action_picking_tree_delivery' parent='menu_stock_root'/>
+        <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_root" sequence="20"/>
         
-        <record id='action_picking_tree2_delivery' model='ir.actions.act_window'>
-            <field name='name'>Delivery Orders to Process</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','assigned'),('type','=','delivery')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree2_delivery" model="ir.actions.act_window">
+            <field name="name">Delivery Orders to Process</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <record id='action_picking_tree_delivery_view1_toproc' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_delivery_tree'/>
-            <field name='act_window_id' ref='action_picking_tree2_delivery'/>
+        <record id="action_picking_tree_delivery_view1_toproc" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_delivery_tree"/>
+            <field name="act_window_id" ref="action_picking_tree2_delivery"/>
         </record>
-        <record id='action_picking_tree_delivery_view2_toproc' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_delivery_form'/>
-            <field name='act_window_id' ref='action_picking_tree2_delivery'/>
+        <record id="action_picking_tree_delivery_view2_toproc" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_delivery_form"/>
+            <field name="act_window_id" ref="action_picking_tree2_delivery"/>
         </record>
-        <menuitem action='action_picking_tree2_delivery' id='menu_picking_waiting_delivery' parent='menu_action_picking_tree_delivery'/>
+        <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery"/>
         
-        <record id='action_picking_tree3_delivery' model='ir.actions.act_window'>
-            <field name='name'>Waiting Delivery Orders</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','confirmed'),('type','=','delivery')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree3_delivery" model="ir.actions.act_window">
+            <field name="name">Waiting Delivery Orders</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','confirmed'),('type','=','delivery')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <record id='action_picking_tree_delivery_view1_waiting' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_delivery_tree'/>
-            <field name='act_window_id' ref='action_picking_tree3_delivery'/>
+        <record id="action_picking_tree_delivery_view1_waiting" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_delivery_tree"/>
+            <field name="act_window_id" ref="action_picking_tree3_delivery"/>
         </record>
-        <record id='action_picking_tree_delivery_view2_waiting' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_delivery_form'/>
-            <field name='act_window_id' ref='action_picking_tree3_delivery'/>
+        <record id="action_picking_tree_delivery_view2_waiting" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_delivery_form"/>
+            <field name="act_window_id" ref="action_picking_tree3_delivery"/>
         </record>
-        <menuitem action='action_picking_tree3_delivery' id='menu_action_picking_tree3_delivery' parent='menu_action_picking_tree_delivery'/>
+        <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery"/>
         
         #
         # Sending Products
         #
         
-        <record id='view_picking_out_tree' model='ir.ui.view'>
-            <field name='name'>stock.picking.out.tree</field>
-            <field name='model'>stock.picking</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree color='red:state==&apos;cancel&apos;' string='Packing list'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='date' select='1'/>
-                    <field name='address_id' select='1'/>
-                    <field name='invoice_state' readonly='1'/>
-                    <field name='origin' select='1'/>
-                    <field name='state' readonly='1'/>
+        <record id="view_picking_out_tree" model="ir.ui.view">
+            <field name="name">stock.picking.out.tree</field>
+            <field name="model">stock.picking</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree color="red:state=='cancel'" string="Packing list">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="address_id" select="1"/>
+                    <field name="invoice_state" readonly="1"/>
+                    <field name="origin" select="1"/>
+                    <field name="state" readonly="1"/>
                 </tree>
             </field>
         </record>
-        <record id='view_picking_out_form' model='ir.ui.view'>
-            <field name='name'>stock.picking.out.form</field>
-            <field name='model'>stock.picking</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Packing list'>
+        <record id="view_picking_out_form" model="ir.ui.view">
+            <field name="name">stock.picking.out.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Packing list">
                     <notebook>
-                        <page string='General Information'>
-                            <field name='name' select='1'/>
-                            <field name='date' select='1'/>
+                        <page string="General Information">
+                            <field name="name" select="1"/>
+                            <field name="date" select="1"/>
                             <newline/>
-                            <field name='address_id' select='2'/>
-                            <field name='move_lines' widget='one2many_list' nolabel='1' colspan='4'>
-                                <form string='Stock Moves'>
-                                    <separator string='Move Information' colspan='4'/>
-                                    <field name='product_id' on_change='onchange_product_id(product_id, parent.location_id, parent.location_dest_id)' context='location=parent.location_id' colspan='4' select='1'/>
-                                    <field name='product_uom' select='1'/>
-                                    <field name='product_qty' select='1'/>
-                                    <field name='product_uos' groups='product.group_uos'/>
-                                    <field name='product_uos_qty' groups='product.group_uos'/>
-                                    <field name='name' invisible='1' select='1' colspan='4'/>
-                                    <field name='date' invisible='1'/>
-                                    <field name='date_planned'/>
-                                    <field name='location_id' select='1'/>
-                                    <field name='location_dest_id' select='1'/>
-                                    <field name='product_packaging' groups='base.group_extended'/>
-                                    <field name='prodlot_id' context='product_id=product_id' select='1'/>
-                                    <field name='tracking_id' groups='base.group_extended' select='1'/>
-                                    <separator string='Move State' colspan='4'/>
-                                    <field name='state' select='1'/>
+                            <field name="address_id" select="2"/>
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
+                                <form string="Stock Moves">
+                                    <separator colspan="4" string="Move Information"/>
+                                    <field colspan="4" context="location=parent.location_id" name="product_id" on_change="onchange_product_id(product_id, parent.location_id, parent.location_dest_id)" select="1"/>
+                                    <field name="product_uom" select="1"/>
+                                    <field name="product_qty" select="1"/>
+                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos_qty"/>
+                                    <field colspan="4" invisible="1" name="name" select="1"/>
+                                    <field invisible="1" name="date"/>
+                                    <field name="date_planned"/>
+                                    <field name="location_id" select="1"/>
+                                    <field name="location_dest_id" select="1"/>
+                                    <field groups="base.group_extended" name="product_packaging"/>
+                                    <field context="product_id=product_id" name="prodlot_id" select="1"/>
+                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                    <separator colspan="4" string="Move State"/>
+                                    <field name="state" select="1"/>
                                     <group>
-                                        <button name='force_assign' type='object' states='confirmed' string='Force assignation'/>
-                                        <button name='cancel_assign' type='object' states='assigned' string='Cancel assignation'/>
+                                        <button name="force_assign" states="confirmed" string="Force assignation" type="object"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel assignation" type="object"/>
                                     </group>
                                 </form>
                             </field>
-                            <group col='7' colspan='4'>
-                                <label colspan='6'/>
-                                <button name='%(move_split)d' type='action' string='Split in Two'/>
+                            <group col="7" colspan="4">
+                                <label colspan="6"/>
+                                <button name="%(move_split)d" string="Split in Two" type="action"/>
                             </group>
-                            <group col='8' colspan='4'>
-                                <field name='state' readonly='1'/>
-                                <button name='button_confirm' states='draft' string='Confirm'/>
-                                <button name='action_assign' type='object' states='confirmed' string='Assign'/>
-                                <button name='force_assign' type='object' states='confirmed' string='Force Assignation'/>
-                                <button name='cancel_assign' type='object' states='assigned' string='Cancel Assignation'/>
-                                <button name='%(partial_picking)d' type='action' states='assigned' string='Validate'/>
-                                <button name='button_cancel' states='assigned,confirmed,draft' string='Cancel'/>
+                            <group col="8" colspan="4">
+                                <field name="state" readonly="1"/>
+                                <button name="button_confirm" states="draft" string="Confirm"/>
+                                <button name="action_assign" states="confirmed" string="Assign" type="object"/>
+                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
+                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
                         </page>
-                        <page string='Notes'>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string='Others info'>
-                            <field name='origin' select='2'/>
-                            <field name='active' select='2'/>
-                            <field name='auto_picking'/>
+                        <page string="Others info">
+                            <field name="origin" select="2"/>
+                            <field name="active" select="2"/>
+                            <field name="auto_picking"/>
                             <newline/>
-                            <field name='move_type'/>
+                            <field name="move_type"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
         
-        <record id='action_picking_tree' model='ir.actions.act_window'>
-            <field name='name'>Sending Goods</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('type','=','out')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree" model="ir.actions.act_window">
+            <field name="name">Sending Goods</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','=','out')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <record id='action_picking_tree_out_view1_waiting' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_out_tree'/>
-            <field name='act_window_id' ref='action_picking_tree'/>
+        <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_out_tree"/>
+            <field name="act_window_id" ref="action_picking_tree"/>
         </record>
-        <record id='action_picking_tree_out_view2_waiting' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_out_form'/>
-            <field name='act_window_id' ref='action_picking_tree'/>
+        <record id="action_picking_tree_out_view2_waiting" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_out_form"/>
+            <field name="act_window_id" ref="action_picking_tree"/>
         </record>
-        <menuitem sequence='19' action='action_picking_tree' id='menu_action_picking_tree' parent='menu_stock_root'/>
+        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>
         
-        <record id='action_picking_tree2' model='ir.actions.act_window'>
-            <field name='name'>Assigned Packings</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','assigned'),('type','=','out')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree2" model="ir.actions.act_window">
+            <field name="name">Assigned Packings</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','assigned'),('type','=','out')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <record id='action_picking_tree2_out_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_out_tree'/>
-            <field name='act_window_id' ref='action_picking_tree2'/>
+        <record id="action_picking_tree2_out_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_out_tree"/>
+            <field name="act_window_id" ref="action_picking_tree2"/>
         </record>
-        <record id='action_picking_tree2_out_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_out_form'/>
-            <field name='act_window_id' ref='action_picking_tree2'/>
+        <record id="action_picking_tree2_out_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_out_form"/>
+            <field name="act_window_id" ref="action_picking_tree2"/>
         </record>
-        <menuitem action='action_picking_tree2' id='menu_picking_waiting' parent='menu_action_picking_tree'/>
+        <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree"/>
         
-        <record id='action_picking_tree3' model='ir.actions.act_window'>
-            <field name='name'>Confirmed Packings Waiting Assignation</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','confirmed'),('type','=','out')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree3" model="ir.actions.act_window">
+            <field name="name">Confirmed Packings Waiting Assignation</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','confirmed'),('type','=','out')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <record id='action_picking_tree3_out_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_out_tree'/>
-            <field name='act_window_id' ref='action_picking_tree3'/>
+        <record id="action_picking_tree3_out_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_out_tree"/>
+            <field name="act_window_id" ref="action_picking_tree3"/>
         </record>
-        <record id='action_picking_tree3_out_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_out_form'/>
-            <field name='act_window_id' ref='action_picking_tree3'/>
+        <record id="action_picking_tree3_out_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_out_form"/>
+            <field name="act_window_id" ref="action_picking_tree3"/>
         </record>
-        <menuitem action='action_picking_tree3' id='menu_action_picking_tree3' parent='menu_action_picking_tree'/>
+        <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree"/>
         
         #
         # Reception of Goods
         #
-        <record id='view_picking_in_tree' model='ir.ui.view'>
-            <field name='name'>stock.picking.in.tree</field>
-            <field name='model'>stock.picking</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree color='red:state==&apos;cancel&apos;' string='Packing list'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='date' select='1'/>
-                    <field name='address_id' select='1'/>
-                    <field name='invoice_state' readonly='1'/>
-                    <field name='origin' select='1'/>
-                    <field name='state' readonly='1'/>
+        <record id="view_picking_in_tree" model="ir.ui.view">
+            <field name="name">stock.picking.in.tree</field>
+            <field name="model">stock.picking</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree color="red:state=='cancel'" string="Packing list">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="address_id" select="1"/>
+                    <field name="invoice_state" readonly="1"/>
+                    <field name="origin" select="1"/>
+                    <field name="state" readonly="1"/>
                 </tree>
             </field>
         </record>
-        <record id='view_picking_in_form' model='ir.ui.view'>
-            <field name='name'>stock.picking.in.form</field>
-            <field name='model'>stock.picking</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Input Packing List'>
+        <record id="view_picking_in_form" model="ir.ui.view">
+            <field name="name">stock.picking.in.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Input Packing List">
                     <notebook>
-                        <page string='General Information'>
-                            <field name='address_id' on_change='onchange_partner_in(address_id)' select='2'/>
-                            <field name='name' readonly='1' select='1'/>
-                            <field name='location_id'/>
-                            <field name='location_dest_id' domain='[(&apos;usage&apos;,&apos;=&apos;,&apos;internal&apos;)]'/>
-                            <field name='invoice_state' string='Supplier Invoice Control' select='2'/>
-                            <field name='origin' select='2'/>
+                        <page string="General Information">
+                            <field name="address_id" on_change="onchange_partner_in(address_id)" select="2"/>
+                            <field name="name" readonly="1" select="1"/>
+                            <field name="location_id"/>
+                            <field domain="[('usage','=','internal')]" name="location_dest_id"/>
+                            <field name="invoice_state" select="2" string="Supplier Invoice Control"/>
+                            <field name="origin" select="2"/>
                             
-                            <field name='move_lines' widget='one2many_list' nolabel='1' colspan='4'>
-                                <tree string='Stock Moves'>
-                                    <field name='product_id'/>
-                                    <field name='product_qty'/>
-                                    <field name='product_uom'/>
-                                    <field name='location_dest_id' select='1'/>
-                                    <field name='prodlot_id' context='product_id=product_id' select='1'/>
-                                    <field name='state' select='1'/>
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
+                                <tree string="Stock Moves">
+                                    <field name="product_id"/>
+                                    <field name="product_qty"/>
+                                    <field name="product_uom"/>
+                                    <field name="location_dest_id" select="1"/>
+                                    <field context="product_id=product_id" name="prodlot_id" select="1"/>
+                                    <field name="state" select="1"/>
                                 </tree>
-                                <form string='Stock Moves'>
-                                    <separator string='Move Information' colspan='4'/>
-                                    <field name='product_id' on_change='onchange_product_id(product_id, parent.location_id, parent.location_dest_id)' context='location=parent.location_id' colspan='4' select='1'/>
-                                    <field name='product_uom' select='1'/>
-                                    <field name='product_qty' select='1'/>
-                                    <field name='product_uos' groups='product.group_uos'/>
-                                    <field name='product_uos_qty' groups='product.group_uos'/>
-                                    <field name='name' invisible='1' select='1' colspan='4'/>
-                                    <field name='date' groups='base.group_extended'/>
-                                    <field name='date_planned' groups='base.group_extended'/>
+                                <form string="Stock Moves">
+                                    <separator colspan="4" string="Move Information"/>
+                                    <field colspan="4" context="location=parent.location_id" name="product_id" on_change="onchange_product_id(product_id, parent.location_id, parent.location_dest_id)" select="1"/>
+                                    <field name="product_uom" select="1"/>
+                                    <field name="product_qty" select="1"/>
+                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos_qty"/>
+                                    <field colspan="4" invisible="1" name="name" select="1"/>
+                                    <field groups="base.group_extended" name="date"/>
+                                    <field groups="base.group_extended" name="date_planned"/>
                                     <newline/>
-                                    <field name='location_id' select='1'/>
-                                    <field name='location_dest_id' domain='[(&apos;usage&apos;,&apos;=&apos;,&apos;internal&apos;)]' select='1'/>
+                                    <field name="location_id" select="1"/>
+                                    <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
                                     <newline/>
-                                    <field name='product_packaging' groups='base.group_extended'/>
+                                    <field groups="base.group_extended" name="product_packaging"/>
                                     <newline/>
-                                    <field name='prodlot_id' context='product_id=product_id' select='1'/>
-                                    <field name='tracking_id' groups='base.group_extended' select='1'/>
+                                    <field context="product_id=product_id" name="prodlot_id" select="1"/>
+                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
                                     <newline/>
                                     <label/>
-                                    <button name='%(track_line)d' groups='base.group_extended' type='action' string='Split in production lots'/>
+                                    <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action"/>
                                     
-                                    <separator string='Move State' colspan='4'/>
-                                    <field name='state' select='1'/>
+                                    <separator colspan="4" string="Move State"/>
+                                    <field name="state" select="1"/>
                                     <group>
-                                        <button name='force_assign' type='object' states='confirmed' string='Force assignation'/>
-                                        <button name='cancel_assign' type='object' states='assigned' string='Cancel assignation'/>
+                                        <button name="force_assign" states="confirmed" string="Force assignation" type="object"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel assignation" type="object"/>
                                     </group>
                                 </form>
                             </field>
-                            <group col='7' colspan='4'>
-                                <label colspan='5'/>
-                                <button name='llk' type='action' string='Fill From Unreceived Products'/>
-                                <button name='%(move_split)d' groups='base.group_extended' type='action' string='Split move lines in two'/>
+                            <group col="7" colspan="4">
+                                <label colspan="5"/>
+                                <button name="llk" string="Fill From Unreceived Products" type="action"/>
+                                <button groups="base.group_extended" name="%(move_split)d" string="Split move lines in two" type="action"/>
                             </group>
-                            <group col='8' colspan='4'>
-                                <field name='state' readonly='1'/>
-                                <button name='button_confirm' states='draft' string='Confirm'/>
-                                <button name='action_assign' type='object' states='confirmed' string='Assign'/>
-                                <button name='force_assign' type='object' states='confirmed' string='Force Assignation'/>
-                                <button name='cancel_assign' type='object' states='assigned' string='Cancel Assignation'/>
-                                <button name='%(partial_picking)d' type='action' states='assigned' string='Validate'/>
-                                <button name='button_cancel' states='assigned,confirmed,draft' string='Cancel'/>
+                            <group col="8" colspan="4">
+                                <field name="state" readonly="1"/>
+                                <button name="button_confirm" states="draft" string="Confirm"/>
+                                <button name="action_assign" states="confirmed" string="Assign" type="object"/>
+                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
+                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
                         </page>
-                        <page string='Notes'>
-                            <field name='note' nolabel='1' colspan='4'/>
+                        <page string="Notes">
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -918,121 +918,121 @@
         
         
         
-        <record id='action_picking_tree4' model='ir.actions.act_window'>
-            <field name='name'>Getting Goods</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('type','=','in')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree4" model="ir.actions.act_window">
+            <field name="name">Getting Goods</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','=','in')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <record id='action_invoice_tree5_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_in_tree'/>
-            <field name='act_window_id' ref='action_picking_tree4'/>
+        <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_in_tree"/>
+            <field name="act_window_id" ref="action_picking_tree4"/>
         </record>
-        <record id='action_invoice_tree5_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_in_form'/>
-            <field name='act_window_id' ref='action_picking_tree4'/>
+        <record id="action_invoice_tree5_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_in_form"/>
+            <field name="act_window_id" ref="action_picking_tree4"/>
         </record>
         
-        <menuitem sequence='17' action='action_picking_tree4' id='menu_action_picking_tree4' parent='menu_stock_root'/>
+        <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/>
         
-        <record id='action_picking_tree5' model='ir.actions.act_window'>
-            <field name='name'>Packings to Process</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','assigned'),('type','=','in')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree5" model="ir.actions.act_window">
+            <field name="name">Packings to Process</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','assigned'),('type','=','in')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <record id='action_invoice_tree6_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_in_tree'/>
-            <field name='act_window_id' ref='action_picking_tree5'/>
+        <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_in_tree"/>
+            <field name="act_window_id" ref="action_picking_tree5"/>
         </record>
-        <record id='action_invoice_tree6_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_in_form'/>
-            <field name='act_window_id' ref='action_picking_tree5'/>
+        <record id="action_invoice_tree6_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_in_form"/>
+            <field name="act_window_id" ref="action_picking_tree5"/>
         </record>
-        <menuitem action='action_picking_tree5' id='menu_action_picking_tree5' parent='menu_action_picking_tree4'/>
+        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4"/>
         
-        <record id='action_picking_form' model='ir.actions.act_window'>
-            <field name='name'>New Reception Packing</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_picking_in_form'/>
-            <field name='context'>{'contact_display': 'partner'}</field>
-            <field name='domain'>[('type','=','in')]</field>
+        <record id="action_picking_form" model="ir.actions.act_window">
+            <field name="name">New Reception Packing</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_picking_in_form"/>
+            <field name="context">{'contact_display': 'partner'}</field>
+            <field name="domain">[('type','=','in')]</field>
         </record>
-        <record id='action_picking_form_view1' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='1'/>
-            <field name='view_mode'>tree</field>
-            <field name='view_id' ref='view_picking_in_tree'/>
-            <field name='act_window_id' ref='action_picking_form'/>
+        <record id="action_picking_form_view1" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_in_tree"/>
+            <field name="act_window_id" ref="action_picking_form"/>
         </record>
-        <record id='action_picking_form_view2' model='ir.actions.act_window.view'>
-            <field name='sequence' eval='2'/>
-            <field name='view_mode'>form</field>
-            <field name='view_id' ref='view_picking_in_form'/>
-            <field name='act_window_id' ref='action_picking_form'/>
+        <record id="action_picking_form_view2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_in_form"/>
+            <field name="act_window_id" ref="action_picking_form"/>
         </record>
-        <menuitem action='action_picking_form' id='menu_action_picking_form' parent='menu_action_picking_tree4'/>
+        <menuitem action="action_picking_form" id="menu_action_picking_form" parent="menu_action_picking_tree4"/>
         
         
-        <record id='action_picking_tree6' model='ir.actions.act_window'>
-            <field name='name'>Internal Packings</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('type','=','internal')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree6" model="ir.actions.act_window">
+            <field name="name">Internal Packings</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','=','internal')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem sequence='18' action='action_picking_tree6' id='menu_action_picking_tree6' parent='menu_stock_root'/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/>
         
         
-        <record id='action_picking_tree7' model='ir.actions.act_window'>
-            <field name='name'>Assigned Packings</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','assigned'),('type','=','internal')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree7" model="ir.actions.act_window">
+            <field name="name">Assigned Packings</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','assigned'),('type','=','internal')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem action='action_picking_tree7' id='menu_action_picking_tree7' parent='menu_action_picking_tree6'/>
+        <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6"/>
         
-        <record id='action_picking_tree8' model='ir.actions.act_window'>
-            <field name='name'>Confirmed Packings Waiting Assignation</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','confirmed'),('type','=','internal')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree8" model="ir.actions.act_window">
+            <field name="name">Confirmed Packings Waiting Assignation</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','confirmed'),('type','=','internal')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem action='action_picking_tree8' id='menu_action_picking_tree8' parent='menu_action_picking_tree6'/>
+        <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6"/>
         
-        <record id='action_picking_tree9' model='ir.actions.act_window'>
-            <field name='name'>Draft Internal Packings</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='domain'>[('state','=','draft'),('type','=','internal')]</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_tree9" model="ir.actions.act_window">
+            <field name="name">Draft Internal Packings</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft'),('type','=','internal')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem action='action_picking_tree9' id='menu_action_picking_tree9' parent='menu_action_picking_tree6'/>
+        <menuitem action="action_picking_tree9" id="menu_action_picking_tree9" parent="menu_action_picking_tree6"/>
         
         =============================
         Move Tracking
@@ -1043,150 +1043,150 @@
         Move
         =============================
         
-        <record id='view_move_tree' model='ir.ui.view'>
-            <field name='name'>stock.move.tree</field>
-            <field name='model'>stock.move</field>
-            <field name='type'>tree</field>
-            <field name='priority' eval='6'/>
-            <field name='arch' type='xml'>
-                <tree color='grey:state==&apos;cancel&apos;' string='Moves'>
-                    <field name='product_id' select='1'/>
-                    <field name='product_qty' select='1'/>
-                    <field name='product_uom' select='1' string='UOM'/>
-                    <field name='prodlot_id' select='2'/>
-                    <field name='location_id' select='1'/>
-                    <field name='location_dest_id' select='1'/>
-                    <field name='date_planned' select='1'/>
-                    <field name='state'/>
+        <record id="view_move_tree" model="ir.ui.view">
+            <field name="name">stock.move.tree</field>
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field eval="6" name="priority"/>
+            <field name="arch" type="xml">
+                <tree color="grey:state=='cancel'" string="Moves">
+                    <field name="product_id" select="1"/>
+                    <field name="product_qty" select="1"/>
+                    <field name="product_uom" select="1" string="UOM"/>
+                    <field name="prodlot_id" select="2"/>
+                    <field name="location_id" select="1"/>
+                    <field name="location_dest_id" select="1"/>
+                    <field name="date_planned" select="1"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <menuitem name='Low Level' id='menu_traceability_low' parent='menu_traceability'/>
+        <menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/>
         
-        <record id='view_move_form' model='ir.ui.view'>
-            <field name='name'>stock.move.form</field>
-            <field name='model'>stock.move</field>
-            <field name='type'>form</field>
-            <field name='priority' eval='4'/>
-            <field name='arch' type='xml'>
-                <form string='Stock Moves'>
-                    <separator string='Move Information' colspan='4'/>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='date'/>
-                    <field name='date_planned'/>
-                    <field name='product_id' colspan='4' select='1'/>
-                    <field name='product_uom' select='1'/>
-                    <field name='product_qty' select='1'/>
-                    <field name='location_id' select='1'/>
-                    <field name='location_dest_id' select='1'/>
-                    <field name='priority'/>
-                    <field name='address_id' select='1'/>
+        <record id="view_move_form" model="ir.ui.view">
+            <field name="name">stock.move.form</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+                <form string="Stock Moves">
+                    <separator colspan="4" string="Move Information"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="date"/>
+                    <field name="date_planned"/>
+                    <field colspan="4" name="product_id" select="1"/>
+                    <field name="product_uom" select="1"/>
+                    <field name="product_qty" select="1"/>
+                    <field name="location_id" select="1"/>
+                    <field name="location_dest_id" select="1"/>
+                    <field name="priority"/>
+                    <field name="address_id" select="1"/>
                     <newline/>
-                    <field name='prodlot_id' context='product_id=product_id' select='1'/>
-                    <field name='tracking_id' select='1'/>
+                    <field context="product_id=product_id" name="prodlot_id" select="1"/>
+                    <field name="tracking_id" select="1"/>
                     <newline/>
                     <label/>
-                    <button name='%(track_line)d' type='action' string='Split in production lots'/>
-                    <separator string='Move State' colspan='4'/>
-                    <field name='state' select='1'/>
-                    <group col='4' colspan='2'>
-                        <button name='action_confirm' type='object' states='draft' string='Confirm'/>
-                        <button name='action_assign' type='object' states='confirmed' string='Assign'/>
-                        <button name='action_cancel' type='object' states='assigned' string='Cancel'/>
-                        <button name='action_done' type='object' states='assigned' string='Make Parcel'/>
+                    <button name="%(track_line)d" string="Split in production lots" type="action"/>
+                    <separator colspan="4" string="Move State"/>
+                    <field name="state" select="1"/>
+                    <group col="4" colspan="2">
+                        <button name="action_confirm" states="draft" string="Confirm" type="object"/>
+                        <button name="action_assign" states="confirmed" string="Assign" type="object"/>
+                        <button name="action_cancel" states="assigned" string="Cancel" type="object"/>
+                        <button name="action_done" states="assigned" string="Make Parcel" type="object"/>
                     </group>
                 </form>
             </field>
         </record>
-        <record id='action_move_form2' model='ir.actions.act_window'>
-            <field name='name'>Stock Moves</field>
-            <field name='res_model'>stock.move</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_move_tree'/>
+        <record id="action_move_form2" model="ir.actions.act_window">
+            <field name="name">Stock Moves</field>
+            <field name="res_model">stock.move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_move_tree"/>
         </record>
-        <menuitem action='action_move_form2' id='menu_action_move_form2' parent='menu_traceability_low'/>
+        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability_low"/>
         
-        <record id='action_move_form3' model='ir.actions.act_window'>
-            <field name='name'>Draft Moves</field>
-            <field name='res_model'>stock.move</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','draft')]</field>
-            <field name='view_id' ref='view_move_tree'/>
+        <record id="action_move_form3" model="ir.actions.act_window">
+            <field name="name">Draft Moves</field>
+            <field name="res_model">stock.move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','draft')]</field>
+            <field name="view_id" ref="view_move_tree"/>
         </record>
-        <menuitem action='action_move_form3' id='menu_action_move_form3' parent='menu_action_move_form2'/>
+        <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2"/>
         
-        <record id='action_move_form4' model='ir.actions.act_window'>
-            <field name='name'>Assigned Moves</field>
-            <field name='res_model'>stock.move</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='domain'>[('state','=','assigned')]</field>
-            <field name='view_id' ref='view_move_tree'/>
+        <record id="action_move_form4" model="ir.actions.act_window">
+            <field name="name">Assigned Moves</field>
+            <field name="res_model">stock.move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('state','=','assigned')]</field>
+            <field name="view_id" ref="view_move_tree"/>
         </record>
-        <menuitem action='action_move_form4' id='menu_action_move_form4' parent='menu_action_move_form2'/>
+        <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2"/>
         
-        <record id='action_picking_all' model='ir.actions.act_window'>
-            <field name='name'>All Packings</field>
-            <field name='res_model'>stock.picking</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
-            <field name='context'>{'contact_display': 'partner'}</field>
+        <record id="action_picking_all" model="ir.actions.act_window">
+            <field name="name">All Packings</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem action='action_picking_all' id='menu_action_picking_all' parent='menu_traceability_low'/>
+        <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_traceability_low"/>
         
         
         # -------------------------------------------------------------
         # Stock incoterms
         # -------------------------------------------------------------
-        <record id='view_incoterms_tree' model='ir.ui.view'>
-            <field name='name'>stock.incoterms.tree</field>
-            <field name='model'>stock.incoterms</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Incoterms'>
-                    <field name='code'/>
-                    <field name='name' select='1' colspan='4'/>
+        <record id="view_incoterms_tree" model="ir.ui.view">
+            <field name="name">stock.incoterms.tree</field>
+            <field name="model">stock.incoterms</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Incoterms">
+                    <field name="code"/>
+                    <field colspan="4" name="name" select="1"/>
                 </tree>
             </field>
         </record>
-        <record id='stock_incoterms_form' model='ir.ui.view'>
-            <field name='name'>stock.incoterms.form</field>
-            <field name='model'>stock.incoterms</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Incoterms'>
-                    <field name='name' select='1' colspan='4'/>
-                    <field name='code' select='1'/>
-                    <field name='active' select='1'/>
+        <record id="stock_incoterms_form" model="ir.ui.view">
+            <field name="name">stock.incoterms.form</field>
+            <field name="model">stock.incoterms</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Incoterms">
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="active" select="1"/>
                 </form>
             </field>
         </record>
-        <record id='action_incoterms_tree' model='ir.actions.act_window'>
-            <field name='name'>Incoterms</field>
-            <field name='res_model'>stock.incoterms</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_mode'>tree,form</field>
+        <record id="action_incoterms_tree" model="ir.actions.act_window">
+            <field name="name">Incoterms</field>
+            <field name="res_model">stock.incoterms</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action='action_incoterms_tree' id='menu_action_incoterms_tree' parent='menu_stock_configuration'/>
+        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>
         
-        <act_window name='Products' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;service&apos;)]' id='act_product_location_open' src_model='stock.location' context='{&apos;location&apos;: active_id}' res_model='product.product'/>
+        <act_window context="{'location': active_id}" domain="[('type','&lt;&gt;','service')]" id="act_product_location_open" name="Products" res_model="product.product" src_model="stock.location"/>
         
-        <act_window name='Stock Moves' domain='[(&apos;product_id&apos;,&apos;=&apos;,active_id)]' id='act_product_stock_move_open' src_model='product.product' context='{&apos;location&apos;: active_id}' res_model='stock.move'/>
+        <act_window context="{'location': active_id}" domain="[('product_id','=',active_id)]" id="act_product_stock_move_open" name="Stock Moves" res_model="stock.move" src_model="product.product"/>
         
-        <record id='ir_act_product_location_open' model='ir.values'>
-            <field name='key2'>tree_but_open</field>
-            <field name='model'>stock.location</field>
-            <field name='name'>Products</field>
-            <field name='value' eval='&apos;ir.actions.act_window,%d&apos;%act_product_location_open'/>
-            <field name='object' eval='True'/>
+        <record id="ir_act_product_location_open" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">stock.location</field>
+            <field name="name">Products</field>
+            <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
+            <field eval="True" name="object"/>
         </record>
         
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index cc875169fcd..5f80ea7437e 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
@@ -7,23 +7,17 @@
 		-->
         
         
-        <wizard string="Split move line" multi="True" model="stock.picking" name="stock.move.split" id="move_split" />
-        <wizard string="Partial packing" multi="True" model="stock.picking" name="stock.partial_picking" id="partial_picking" />
-        <wizard string="Track line" multi="True" model="stock.move" name="stock.move.track" id="track_line" />
-        <wizard string="Make packing" multi="True" model="stock.picking" name="stock.picking.make" id="make_picking"/>
+        <wizard id="move_split" model="stock.picking" multi="True" name="stock.move.split" string="Split move line"/>
+        <wizard id="partial_picking" model="stock.picking" multi="True" name="stock.partial_picking" string="Partial packing"/>
+        <wizard id="track_line" model="stock.move" multi="True" name="stock.move.track" string="Track line"/>
+        <wizard id="make_picking" model="stock.picking" multi="True" name="stock.picking.make" string="Make packing"/>
         <!--
 		<wizard string="Replace element" model="stock.tracking" name="stock.move.replace" id="move_replace" />
 		-->
-        <wizard string="Return packing" model="stock.picking" name="stock.return.picking" id="return_picking"/>
+        <wizard id="return_picking" model="stock.picking" name="stock.return.picking" string="Return packing"/>
         
-        <wizard
-		string="Create invoice"
-		model="stock.picking"
-		name="stock.invoice_onshipping"
-		keyword="client_action_multi"
-		id="wizard_invoice_onshipping"
-		/>
+        <wizard id="wizard_invoice_onshipping" keyword="client_action_multi" model="stock.picking" name="stock.invoice_onshipping" string="Create invoice"/>
         
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 3f8de0cac0b..588e8bd6566 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record model="workflow" id="wkf_picking">
+        <record id="wkf_picking" model="workflow">
             <field name="name">stock.picking.basic</field>
             <field name="osv">stock.picking</field>
             <field name="on_create">True</field>
         </record>
-        <record model="workflow.activity" id="act_draft">
+        <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
-        <record model="workflow.activity" id="act_confirmed">
+        <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
             <field name="name">confirmed</field>
             <field name="kind">function</field>
             <field name="action">action_confirm()</field>
         </record>
-        <record model="workflow.activity" id="act_assigned">
+        <record id="act_assigned" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
             <field name="name">assigned</field>
             <field name="kind">function</field>
             <field name="action">action_assign_wkf()</field>
         </record>
-        <record model="workflow.activity" id="act_move">
+        <record id="act_move" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
             <field name="name">move</field>
             <field name="kind">function</field>
             <field name="action">action_move()</field>
         </record>
-        <record model="workflow.activity" id="act_done">
+        <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
             <field name="name">done</field>
             <field name="kind">function</field>
             <field name="action">action_done()</field>
             <field name="flow_stop">True</field>
         </record>
-        <record model="workflow.activity" id="act_cancel">
+        <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
             <field name="name">cancel</field>
             <field name="flow_stop">True</field>
@@ -44,56 +44,56 @@
             <field name="action">action_cancel()</field>
         </record>
         
-        <record model="workflow.transition" id="trans_draft_confirmed">
+        <record id="trans_draft_confirmed" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirmed"/>
             <field name="signal">button_confirm</field>
         </record>
-        <record model="workflow.transition" id="trans_confirmed_assigned_back">
+        <record id="trans_confirmed_assigned_back" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>
             <field name="act_to" ref="act_confirmed"/>
             <field name="condition">not test_assigned()</field>
         </record>
-        <record model="workflow.transition" id="trans_confirmed_assigned">
+        <record id="trans_confirmed_assigned" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_assigned"/>
             <field name="condition">test_assigned()</field>
         </record>
-        <record model="workflow.transition" id="trans_assigned_move">
+        <record id="trans_assigned_move" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>
             <field name="act_to" ref="act_move"/>
             <field name="condition">auto_picking and test_auto_picking()</field>
         </record>
-        <record model="workflow.transition" id="trans_assigned_move2">
+        <record id="trans_assigned_move2" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>
             <field name="act_to" ref="act_move"/>
             <field name="signal">button_done</field>
         </record>
-        <record model="workflow.transition" id="trans_move_done">
+        <record id="trans_move_done" model="workflow.transition">
             <field name="act_from" ref="act_move"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">test_finnished()</field>
         </record>
-        <record model="workflow.transition" id="trans_move_confirmed">
+        <record id="trans_move_confirmed" model="workflow.transition">
             <field name="act_from" ref="act_move"/>
             <field name="act_to" ref="act_confirmed"/>
             <field name="condition">not test_finnished()</field>
         </record>
-        <record model="workflow.transition" id="trans_assigned_cancel">
+        <record id="trans_assigned_cancel" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_confirmed_cancel">
+        <record id="trans_confirmed_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        <record model="workflow.transition" id="trans_draft_cancel">
+        <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
         
     </data>
-</terp>
+</terp>
\ No newline at end of file
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 9e3e4aba382..b15d9e2673b 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,155 +1,155 @@
-<?xml version='1.0'?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
         
-        <menuitem name='Tools' icon='STOCK_PREFERENCES' id='menu_tools'/>
-        <menuitem name='Tools/Subscriptions/Configuration' groups='base.group_admin' id='menu_subscription_config'/>
+        <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>
+        <menuitem id="next_id_45" name="Subscriptions" parent="subscription.menu_tools"/><menuitem groups="base.group_admin" id="menu_subscription_config" name="Configuration" parent="next_id_45"/>
         <!--
 	=======================================================
 	Subscription Views
 	=======================================================
 	-->
-        <record id='view_subscription_form' model='ir.ui.view'>
-            <field name='name'>subscription.subscription.form</field>
-            <field name='model'>subscription.subscription</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Subscriptions'>
+        <record id="view_subscription_form" model="ir.ui.view">
+            <field name="name">subscription.subscription.form</field>
+            <field name="model">subscription.subscription</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscriptions">
                     <notebook>
-                        <page string='Subsription Data'>
-                            <field name='name' select='1'/>
-                            <field name='active' select='1'/>
-                            <field name='user_id' select='1'/>
-                            <field name='partner_id' select='1'/>
+                        <page string="Subsription Data">
+                            <field name="name" select="1"/>
+                            <field name="active" select="1"/>
+                            <field name="user_id" select="1"/>
+                            <field name="partner_id" select="1"/>
                             <newline/>
-                            <field name='interval_number'/>
-                            <field name='interval_type'/>
-                            <field name='exec_init'/>
-                            <field name='date_init'/>
-                            <field name='doc_source' widget='reference' colspan='4'/>
-                            <field name='notes' colspan='4'/>
-                            <separator colspan='4'/>
-                            <field name='cron_id' readonly='1' colspan='4'/>
-                            <field name='state' readonly='1'/>
-                            <group col='3' colspan='2'>
-                                <button name='set_process' type='object' states='draft' string='Process'/>
-                                <button name='set_done' type='object' states='running' string='Stop'/>
-                                <button name='set_draft' type='object' states='done' string='Set to Draft'/>
+                            <field name="interval_number"/>
+                            <field name="interval_type"/>
+                            <field name="exec_init"/>
+                            <field name="date_init"/>
+                            <field colspan="4" name="doc_source" widget="reference"/>
+                            <field colspan="4" name="notes"/>
+                            <separator colspan="4"/>
+                            <field colspan="4" name="cron_id" readonly="1"/>
+                            <field name="state" readonly="1"/>
+                            <group col="3" colspan="2">
+                                <button name="set_process" states="draft" string="Process" type="object"/>
+                                <button name="set_done" states="running" string="Stop" type="object"/>
+                                <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                             </group>
                         </page>
-                        <page string='Documents created'>
-                            <field name='doc_lines' nolabel='1' widget='one2many_list' colspan='4'/>
+                        <page string="Documents created">
+                            <field colspan="4" name="doc_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                     </notebook>
                 </form>
             </field>
         </record>
         
-        <record id='view_subscription_tree' model='ir.ui.view'>
-            <field name='name'>subscription.subscription.tree</field>
-            <field name='model'>subscription.subscription</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Subscriptions'>
-                    <field name='name'/>
-                    <field name='active'/>
-                    <field name='user_id'/>
-                    <field name='partner_id'/>
-                    <field name='state'/>
+        <record id="view_subscription_tree" model="ir.ui.view">
+            <field name="name">subscription.subscription.tree</field>
+            <field name="model">subscription.subscription</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Subscriptions">
+                    <field name="name"/>
+                    <field name="active"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_subscription_form' model='ir.actions.act_window'>
-            <field name='name'>All Subscriptions</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>subscription.subscription</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_subscription_tree'/>
+        <record id="action_subscription_form" model="ir.actions.act_window">
+            <field name="name">All Subscriptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">subscription.subscription</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_subscription_tree"/>
         </record>
-        <menuitem name='Tools/Subscriptions/All Subscriptions' action='action_subscription_form' id='menu_action_subscription_form'/>
+        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
         
-        <record id='subscription_subscription_history_tree' model='ir.ui.view'>
-            <field name='name'>subscription.subscription.history.tree</field>
-            <field name='model'>subscription.subscription.history</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Subscription History'>
-                    <field name='date'/>
+        <record id="subscription_subscription_history_tree" model="ir.ui.view">
+            <field name="name">subscription.subscription.history.tree</field>
+            <field name="model">subscription.subscription.history</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Subscription History">
+                    <field name="date"/>
                 </tree>
             </field>
         </record>
         
-        <record id='subscription_subscription_history_form' model='ir.ui.view'>
-            <field name='name'>subscription.subscription.history.form</field>
-            <field name='model'>subscription.subscription.history</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Subscription History'>
-                    <field name='date'/>
-                    <field name='document_id' colspan='4'/>
+        <record id="subscription_subscription_history_form" model="ir.ui.view">
+            <field name="name">subscription.subscription.history.form</field>
+            <field name="model">subscription.subscription.history</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscription History">
+                    <field name="date"/>
+                    <field colspan="4" name="document_id"/>
                 </form>
             </field>
         </record>
         
-        <record id='document_form' model='ir.ui.view'>
-            <field name='name'>subscription.document.form</field>
-            <field name='model'>subscription.document</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Subscription Document'>
-                    <field name='name' select='1'/>
-                    <field name='active' select='1'/>
-                    <field name='model' select='1'/>
-                    <field name='field_ids' nolabel='1' colspan='4'/>
+        <record id="document_form" model="ir.ui.view">
+            <field name="name">subscription.document.form</field>
+            <field name="model">subscription.document</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscription Document">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="model" select="1"/>
+                    <field colspan="4" name="field_ids" nolabel="1"/>
                 </form>
             </field>
         </record>
         
-        <record id='document_tree' model='ir.ui.view'>
-            <field name='name'>subscription.document.tree</field>
-            <field name='model'>subscription.document</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Subscription Document'>
-                    <field name='name'/>
-                    <field name='active'/>
-                    <field name='model'/>
+        <record id="document_tree" model="ir.ui.view">
+            <field name="name">subscription.document.tree</field>
+            <field name="model">subscription.document</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Subscription Document">
+                    <field name="name"/>
+                    <field name="active"/>
+                    <field name="model"/>
                 </tree>
             </field>
         </record>
         
-        <record id='document_fields_form' model='ir.ui.view'>
-            <field name='name'>subscription.document.fields.form</field>
-            <field name='model'>subscription.document.fields</field>
-            <field name='type'>form</field>
-            <field name='arch' type='xml'>
-                <form string='Subscription Document Fields'>
-                    <field name='field' select='1'/>
-                    <field name='value'/>
+        <record id="document_fields_form" model="ir.ui.view">
+            <field name="name">subscription.document.fields.form</field>
+            <field name="model">subscription.document.fields</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscription Document Fields">
+                    <field name="field" select="1"/>
+                    <field name="value"/>
                 </form>
             </field>
         </record>
         
-        <record id='document_fields_tree' model='ir.ui.view'>
-            <field name='name'>subscription.document.fields.tree</field>
-            <field name='model'>subscription.document.fields</field>
-            <field name='type'>tree</field>
-            <field name='arch' type='xml'>
-                <tree string='Subscription Document Fields'>
-                    <field name='field'/>
-                    <field name='value'/>
+        <record id="document_fields_tree" model="ir.ui.view">
+            <field name="name">subscription.document.fields.tree</field>
+            <field name="model">subscription.document.fields</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Subscription Document Fields">
+                    <field name="field"/>
+                    <field name="value"/>
                 </tree>
             </field>
         </record>
         
-        <record id='action_document_form' model='ir.actions.act_window'>
-            <field name='name'>Document Types</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='res_model'>subscription.document</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='document_tree'/>
+        <record id="action_document_form" model="ir.actions.act_window">
+            <field name="name">Document Types</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">subscription.document</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="document_tree"/>
         </record>
-        <menuitem name='Tools/Subscriptions/Configuration/Document Types' action='action_document_form' id='menu_action_document_form'/>
+        <menuitem action="action_document_form" id="menu_action_document_form" parent="subscription.menu_subscription_config"/>
     </data>
-</terp>
+</terp>
\ No newline at end of file