diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index ce9a09def08..3940c1e5357 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -313,8 +313,8 @@
             <field name="code">TSAJ</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
+            <field name="default_credit_account_id" ref="a_sale"/>
+            <field name="default_debit_account_id" ref="a_sale"/>
             <field name="analytic_journal_id" ref="cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -323,8 +323,8 @@
             <field name="code">TSCNJ</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
+            <field name="default_credit_account_id" ref="a_sale"/>
+            <field name="default_debit_account_id" ref="a_sale"/>
             <field name="analytic_journal_id" ref="cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -334,8 +334,8 @@
             <field name="code">TEXJ</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
+            <field name="default_debit_account_id" ref="a_expense"/>
+            <field name="default_credit_account_id" ref="a_expense"/>
             <field name="analytic_journal_id" ref="exp"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -344,8 +344,8 @@
             <field name="code">TECNJ</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
+            <field name="default_debit_account_id" ref="a_expense"/>
+            <field name="default_credit_account_id" ref="a_expense"/>
             <field name="analytic_journal_id" ref="exp"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -355,8 +355,8 @@
             <field name="code">TBNK</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="bnk"/>
-            <field model="account.account" name="default_credit_account_id" ref="bnk"/>
+            <field name="default_debit_account_id" ref="bnk"/>
+            <field name="default_credit_account_id" ref="bnk"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -365,8 +365,8 @@
             <field name="code">TCHK</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field name="default_debit_account_id" ref="cash"/>
+            <field name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -374,9 +374,9 @@
             <field name="name">Cash Journal - (test)</field>
             <field name="code">TCSH</field>
             <field name="type">cash</field>
-            <field name="profit_account_id" model="account.account" ref="rsa" />
-            <field name="loss_account_id" model="account.account" ref="rsa" />
-            <field name="internal_account_id" model="account.account" ref="rsa" />
+            <field name="profit_account_id" ref="rsa" />
+            <field name="loss_account_id" ref="rsa" />
+            <field name="internal_account_id" ref="rsa" />
             <field name="with_last_closing_balance" eval="True" />
             <!--
                  Usually, cash payment methods requires a control at opening and closing.
@@ -385,8 +385,8 @@
             -->
             <field name="cash_control" eval="False"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field name="default_debit_account_id" ref="cash"/>
+            <field name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -403,8 +403,8 @@
             <field name="code">TOEJ</field>
             <field name="type">situation</field>
             <field name="sequence_id" ref="sequence_opening_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="o_income"/>
-            <field model="account.account" name="default_credit_account_id" ref="o_expense"/>
+            <field name="default_debit_account_id" ref="o_income"/>
+            <field name="default_credit_account_id" ref="o_expense"/>
             <field eval="True" name="centralisation"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -413,8 +413,8 @@
             <field name="name">USD Bank Journal - (test)</field>
             <field name="code">TUBK</field>
             <field name="type">bank</field>
-            <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/>
-            <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/>
+            <field name="default_debit_account_id" ref="usd_bnk"/>
+            <field name="default_credit_account_id" ref="usd_bnk"/>
             <field name="currency" ref="base.USD"/>
         </record>
         <!--
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index b6773dbbdd6..2abea3ada67 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -34,7 +34,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-60.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -47,7 +47,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -60,7 +60,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-90.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -73,7 +73,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -86,7 +86,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 088aa35e915..c772a8fd67d 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -192,8 +192,8 @@
             <field name="code">SAJ-OpenERP IN</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -204,8 +204,8 @@
             <field name="code">SCNJ-OpenERP IN</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -216,8 +216,8 @@
             <field name="code">EXJ-OpenERP IN</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -228,8 +228,8 @@
             <field name="code">ECNJ-OpenERP IN</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -240,8 +240,8 @@
             <field name="code">BNK-OpenERP IN</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -252,8 +252,8 @@
             <field name="code">CHK-OpenERP IN</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -264,8 +264,8 @@
             <field name="code">CSH-OpenERP IN</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -277,8 +277,8 @@
             <field name="code">SAJ-OpenERP US</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -289,8 +289,8 @@
             <field name="code">SCNJ-OpenERP US</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -301,8 +301,8 @@
             <field name="code">EXJ-OpenERP US</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -313,8 +313,8 @@
             <field name="code">ECNJ-OpenERP US</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -325,8 +325,8 @@
             <field name="code">BNK-OpenERP US</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -337,8 +337,8 @@
             <field name="code">CHK-OpenERP US</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -349,8 +349,8 @@
             <field name="code">CSH-OpenERP US</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -363,8 +363,8 @@
             <field name="code">SAJ-OpenERP BE</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -375,8 +375,8 @@
             <field name="code">SCNJ-OpenERP BE</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -387,8 +387,8 @@
             <field name="code">EXJ-OpenERP BE</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -399,8 +399,8 @@
             <field name="code">ECNJ-OpenERP BE</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -411,8 +411,8 @@
             <field name="code">BNK-OpenERP BE</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -423,8 +423,8 @@
             <field name="code">CHK-OpenERP BE</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -435,8 +435,8 @@
             <field name="code">CSH-OpenERP BE</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>