From d26f77ca1d49d2c9a624adc25565bcda5a23c4c5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 9 Dec 2011 16:18:47 +0100
Subject: [PATCH] [IMP] account: set report_type field of account_account_type
 as fields.function + set the main account types as data (instead of demo
 data) (and did the same for financial reports BS & PL)

bzr revid: qdp-launchpad@openerp.com-20111209151847-u63ur1o7wt017885
---
 addons/account/__openerp__.py                 |   1 +
 addons/account/account.py                     |  60 ++++--
 addons/account/configurable_account_chart.xml | 179 ++----------------
 addons/account/data/data_account_type.xml     |   4 +
 addons/account/demo/account_minimal.xml       | 174 ++++-------------
 5 files changed, 102 insertions(+), 316 deletions(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 12df75b98c7..ea6142b0c89 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -104,6 +104,7 @@ module named account_voucher.
         'account_invoice_view.xml',
         'partner_view.xml',
         'data/account_data.xml',
+        'data/data_financial_report.xml',
         'data/data_account_type.xml',
         'account_invoice_workflow.xml',
         'project/project_view.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 8e9bdbc4866..d32fb5879ab 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -130,20 +130,43 @@ account_payment_term_line()
 class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account Type"
-    
-    def _get_report_type(self, cr, uid, context=None):
-        report_obj = self.pool.get('account.financial.report')
-        report_ids = report_obj.search(cr, uid, [], context=context)
-        report_type = [('none','/')]
-        for report in report_obj.browse(cr, uid, report_ids, context=context):
-            type = report.account_type_ids and report.account_type_ids[0] or False
-            if type:
-                if type.code in ('income', 'expense'):
-                    report_name = 'Profit & Loss ('+type.code+' accounts)'
-                elif type.code in ('asset','liability'):
-                    report_name = 'Balance Sheet ('+type.code+' accounts)'
-                report_type.append((type.code, report_name))
-        return report_type
+
+    def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
+        obj_data = self.pool.get('ir.model.data')
+        obj_financial_report = self.pool.get('account.financial.report') 
+        res = {}
+        financial_report_ref = {
+            'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
+            'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
+            'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
+            'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
+        }
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = 'none'
+            for key, financial_report in financial_report_ref.items():
+                list_ids = [x.id for x in financial_report.account_type_ids]
+                if record.id in list_ids:
+                    res[record.id] = key
+        return res
+
+    def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
+        import pdb;pdb.set_trace()
+        obj_data = self.pool.get('ir.model.data')
+        obj_financial_report = self.pool.get('account.financial.report') 
+        #unlink if it exists somewhere in the financial reports related to BS or PL
+        financial_report_ref = {
+            'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
+            'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
+            'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
+            'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
+        }
+        for key, financial_report in financial_report_ref.items():
+            list_ids = [x.id for x in financial_report.account_type_ids]
+            if account_type_id in list_ids:
+                obj_financial_report.write(cr, uid, [financial_report.id], {'account_type_ids': [(3, account_type_id)]})
+        #write it in the good place
+        if field_value != 'none':
+            return obj_financial_report.write(cr, uid, [financial_report_ref[field_value].id], {'account_type_ids': [(4, account_type_id)]})
 
     _columns = {
         'name': fields.char('Account Type', size=64, required=True, translate=True),
@@ -154,7 +177,12 @@ class account_account_type(osv.osv):
  'Balance' will generally be used for cash accounts.
  'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
  'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
-        'report_type': fields.selection(_get_report_type, 'P&L / BS Category', help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
+        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category', 
+            selection= [('none','/'),
+                        ('income', _('Profit & Loss (Income account)')),
+                        ('expense', _('Profit & Loss (Expense account)')),
+                        ('asset', _('Balance Sheet (Asset account)')),
+                        ('liability', _('Balance Sheet (Liability account)'))], help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
         'note': fields.text('Description'),
     }
     _defaults = {
@@ -2975,7 +3003,7 @@ class account_financial_report(osv.osv):
             ], 'Display details'),
         'account_report_id':  fields.many2one('account.financial.report', 'Report Value'),
         'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'),
-        'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for  accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'),
+        'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'),
     }
 
     _defaults = {
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 8486e2fb008..fa0aa3459dd 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -1,181 +1,44 @@
 <openerp>
     <data>
         <!-- Types -->
-        <record model="account.account.type" id="conf_account_type_receivable">
-          <field name="name">Receivable</field>
-          <field name="code">receivable</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_payable">
-          <field name="name">Payable</field>
-          <field name="code">payable</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_view">
-          <field name="name">View</field>
-          <field name="code">view</field>
-          <field name="close_method">none</field>
-        </record>
-
         <record model="account.account.type" id="account_type_income_view1">
             <field name="name">Income View</field>
             <field name="code">view</field>
+            <field name="report_type">income</field>
         </record>
         <record model="account.account.type" id="account_type_expense_view1">
             <field name="name">Expense View</field>
             <field name="code">expense</field>
+            <field name="report_type">expense</field>
         </record>
         <record model="account.account.type" id="account_type_asset_view1">
             <field name="name">Asset View</field>
             <field name="code">asset</field>
+            <field name="report_type">asset</field>
         </record>
         <record model="account.account.type" id="account_type_liability_view1">
             <field name="name">Liability View</field>
             <field name="code">liability</field>
+            <field name="report_type">liability</field>
         </record>
-
-        <record model="account.account.type" id="conf_account_type_income">
-          <field name="name">Income</field>
-          <field name="code">income</field>
-          <field name="close_method">none</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_expense">
-          <field name="name">Expense</field>
-          <field name="code">expense</field>
-          <field name="close_method">none</field>
-        </record>
-
         <record model="account.account.type" id="conf_account_type_tax">
           <field name="name">Tax</field>
           <field name="code">tax</field>
           <field name="close_method">unreconciled</field>
+          <field name="report_type">expense</field>
         </record>
-
-        <record model="account.account.type" id="conf_account_type_cash">
-          <field name="name">Cash</field>
-          <field name="code">cash</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_liability">
-            <field name="name">Liability</field>
-            <field name="code">liability</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_asset">
-          <field name="name">Asset</field>
-          <field name="code">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
         <record model="account.account.type" id="conf_account_type_equity">
           <field name="name">Equity</field>
           <field name="code">equity</field>
           <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="conf_account_type_bnk">
-          <field name="name">Bank</field>
-          <field name="code">bank</field>
-          <field name="close_method">balance</field>
+          <field name="report_type">liability</field>
         </record>
         <record model="account.account.type" id="conf_account_type_chk">
           <field name="name">Check</field>
           <field name="code">check</field>
           <field name="close_method">balance</field>
-        </record>
-
-        <!-- Financial Reports -->
-        <record id="conf_account_financial_report_balancesheet0" model="account.financial.report">
-            <field name="name">Balance Sheet</field>
-            <field name="type">sum</field>
-        </record>
-        <record id="conf_account_financial_report_assets0" model="account.financial.report">
-            <field name="name">Assets</field>
-            <field name="parent_id" ref="conf_account_financial_report_balancesheet0"/>
-            <field name="account_type_ids" eval="[(6,0,[ref('account.conf_account_type_asset')])]"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-        <record id="conf_account_financial_report_liability0" model="account.financial.report">
-            <field name="name">Liability</field>
-            <field name="parent_id" ref="conf_account_financial_report_balancesheet0"/>
-            <field name="account_type_ids" eval="[(6,0,[ref('account.conf_account_type_liability')])]"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-
-        <record id="conf_account_financial_report_profitandloss0" model="account.financial.report">
-            <field name="name">Profit and Loss</field>
-            <field name="type">sum</field>
-        </record>
-        <record id="account_financial_report_income0" model="account.financial.report">
-            <field name="name">Income</field>
-            <field name="parent_id" ref="conf_account_financial_report_profitandloss0"/>
-            <field name="account_type_ids" eval="[(6,0,[ref('account.conf_account_type_income')])]"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-        <record id="conf_account_financial_report_expense0" model="account.financial.report">
-            <field name="name">Expense</field>
-            <field name="parent_id" ref="conf_account_financial_report_profitandloss0"/>
-            <field name="account_type_ids" eval="[(6,0,[ref('account.conf_account_type_expense')])]"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-
-        <!-- Update Account Type -->
-
-        <record id="account.conf_account_type_asset" model="account.account.type">
-            <field name="report_type">asset</field>
-        </record>
-        <record id="account.conf_account_type_liability" model="account.account.type">
-            <field name="report_type">liability</field>
-        </record>
-        <record id="account.conf_account_type_income" model="account.account.type">
-            <field name="report_type">income</field>
-        </record>
-        <record id="account.conf_account_type_expense" model="account.account.type">
-            <field name="report_type">expense</field>
-        </record>
-        <record id="account.conf_account_type_receivable" model="account.account.type">
-            <field name="report_type">asset</field>
-        </record>
-        <record id="account.conf_account_type_payable" model="account.account.type">
-            <field name="report_type">liability</field>
-        </record>
-        <record id="account.conf_account_type_equity" model="account.account.type">
-            <field name="report_type">liability</field>
-        </record>
-        <record id="account.conf_account_type_cash" model="account.account.type">
-            <field name="report_type">asset</field>
-        </record>
-        <record model="account.account.type" id="account_type_income_view1">
-            <field name="report_type">income</field>
-        </record>
-        <record model="account.account.type" id="account_type_expense_view1">
-            <field name="report_type">expense</field>
-        </record>
-        <record model="account.account.type" id="account_type_asset_view1">
-            <field name="report_type">asset</field>
-        </record>
-        <record model="account.account.type" id="account_type_liability_view1">
-            <field name="report_type">liability</field>
-        </record>
-        <record model="account.account.type" id="conf_account_type_tax">
-          <field name="report_type">expense</field>
-        </record>
-        <record model="account.account.type" id="conf_account_type_bnk">
           <field name="report_type">asset</field>
         </record>
-         <record model="account.account.type" id="conf_account_type_chk">
-          <field name="report_type">asset</field>
-        </record>
-
 
         <!-- Account Templates-->
         <record id="conf_chart0" model="account.account.template">
@@ -183,7 +46,7 @@
             <field name="name">Configurable Account Chart</field>
             <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
            <!-- Balance Sheet -->
@@ -193,7 +56,7 @@
             <field name="name">Balance Sheet</field>
             <field ref="conf_chart0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
             <record id="conf_fas" model="account.account.template">
@@ -233,7 +96,7 @@
                         <field name="name">Purchased Stocks</field>
                         <field ref="conf_cas" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_asset"/>
+                        <field name="user_type" ref="data_account_type_asset"/>
                     </record>
 
                     <record id="conf_a_recv" model="account.account.template">
@@ -242,7 +105,7 @@
                         <field ref="conf_cas" name="parent_id"/>
                         <field name="type">receivable</field>
                         <field eval="True" name="reconcile"/>
-                        <field name="user_type" ref="conf_account_type_receivable"/>
+                        <field name="user_type" ref="data_account_type_receivable"/>
                     </record>
 
                     <record id="conf_ova" model="account.account.template">
@@ -250,7 +113,7 @@
                         <field name="name">Tax Paid</field>
                         <field ref="conf_cas" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_asset"/>
+                        <field name="user_type" ref="data_account_type_asset"/>
                     </record>
 
                     <record id="conf_bnk" model="account.account.template">
@@ -266,7 +129,7 @@
                         <field name="name">Opening Income Account</field>
                         <field ref="conf_cas" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_income"/>
+                        <field name="user_type" ref="data_account_type_income"/>
                     </record>
 
                 <record id="conf_cli" model="account.account.template">
@@ -283,7 +146,7 @@
                         <field ref="conf_cli" name="parent_id"/>
                         <field name="type">payable</field>
                         <field eval="True" name="reconcile"/>
-                        <field name="user_type" ref="conf_account_type_payable"/>
+                        <field name="user_type" ref="data_account_type_payable"/>
                     </record>
 
                     <record id="conf_iva" model="account.account.template">
@@ -291,7 +154,7 @@
                         <field name="name">Tax Received</field>
                         <field ref="conf_cli" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_liability"/>
+                        <field name="user_type" ref="data_account_type_liability"/>
                     </record>
 
                     <record id="conf_a_reserve_and_surplus" model="account.account.template">
@@ -300,7 +163,7 @@
                         <field ref="conf_cli" name="parent_id"/>
                         <field name="type">other</field>
                         <field eval="True" name="reconcile"/>
-                        <field name="user_type" ref="conf_account_type_liability"/>
+                        <field name="user_type" ref="data_account_type_liability"/>
                     </record>
 
                     <record id="conf_o_expense" model="account.account.template">
@@ -308,7 +171,7 @@
                         <field name="name">Opening Expense Account</field>
                         <field ref="conf_cli" name="parent_id"/>
                         <field name="type">other</field>
-                        <field name="user_type" ref="conf_account_type_expense"/>
+                        <field name="user_type" ref="data_account_type_expense"/>
                     </record>
 
         <!-- Profit and Loss -->
@@ -318,7 +181,7 @@
             <field name="name">Profit and Loss</field>
             <field ref="conf_chart0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="conf_account_type_view"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
             <record id="conf_rev" model="account.account.template">
@@ -334,7 +197,7 @@
                     <field name="name">Product Sales</field>
                     <field ref="conf_rev" name="parent_id"/>
                     <field name="type">other</field>
-                    <field name="user_type" ref="conf_account_type_income"/>
+                    <field name="user_type" ref="data_account_type_income"/>
                 </record>
 
             <record id="conf_cos" model="account.account.template">
@@ -350,7 +213,7 @@
                     <field name="name">Cost of Goods Sold</field>
                     <field ref="conf_cos" name="parent_id"/>
                     <field name="type">other</field>
-                    <field name="user_type" ref="conf_account_type_expense"/>
+                    <field name="user_type" ref="data_account_type_expense"/>
                 </record>
 
             <record id="conf_ovr" model="account.account.template">
@@ -366,7 +229,7 @@
                     <field name="name">Expenses</field>
                     <field ref="conf_ovr" name="parent_id"/>
                     <field name="type">other</field>
-                    <field name="user_type" ref="conf_account_type_expense"/>
+                    <field name="user_type" ref="data_account_type_expense"/>
                 </record>
 
                 <record id="conf_a_salary_expense" model="account.account.template">
@@ -374,7 +237,7 @@
                     <field name="name">Salary Expenses</field>
                     <field ref="conf_ovr" name="parent_id"/>
                     <field name="type">other</field>
-                    <field name="user_type" ref="conf_account_type_expense"/>
+                    <field name="user_type" ref="data_account_type_expense"/>
                 </record>
 
         <!-- Taxes -->
diff --git a/addons/account/data/data_account_type.xml b/addons/account/data/data_account_type.xml
index ebed0ebb5de..590357ef080 100644
--- a/addons/account/data/data_account_type.xml
+++ b/addons/account/data/data_account_type.xml
@@ -30,21 +30,25 @@
           <field name="name">Asset</field>
           <field name="code">asset</field>
           <field name="close_method">balance</field>
+          <field name="report_type">asset</field>
         </record>
         <record model="account.account.type" id="data_account_type_liability">
             <field name="name">Liability</field>
             <field name="code">liability</field>
             <field name="close_method">balance</field>
+          <field name="report_type">liability</field>
         </record>
         <record model="account.account.type" id="data_account_type_income">
           <field name="name">Income</field>
           <field name="code">income</field>
           <field name="close_method">none</field>
+          <field name="report_type">income</field>
         </record>
         <record model="account.account.type" id="data_account_type_expense">
           <field name="name">Expense</field>
           <field name="code">expense</field>
           <field name="close_method">none</field>
+          <field name="report_type">expense</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index f11a72ce7b4..baa94450f02 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -5,50 +5,11 @@
         Account Type
         -->
 
-        <record id="account_type_root" model="account.account.type">
-            <field name="name">View</field>
-            <field name="code">view</field>
-            <field name="close_method">none</field>
-        </record>
-        <record id="account_type_asset" model="account.account.type">
-            <field name="name">Asset</field>
-            <field name="code">asset</field>
-            <field name="close_method">balance</field>
-        </record>
-        <record id="account_type_receivable" model="account.account.type">
-            <field name="name">Receivable</field>
-            <field name="code">receivable</field>
-            <field name="close_method">unreconciled</field>
-        </record>
-        <record id="account_type_liability" model="account.account.type">
-            <field name="name">Liability</field>
-            <field name="code">liability</field>
-            <field name="close_method">balance</field>
-        </record>
-        <record id="account_type_payable" model="account.account.type">
-            <field name="name">Payable</field>
-            <field name="code">payable</field>
-            <field name="close_method">unreconciled</field>
-        </record>
-        <record id="account_type_income" model="account.account.type">
-            <field name="name">Income</field>
-            <field name="code">income</field>
-            <field name="close_method">none</field>
-        </record>
-        <record id="account_type_expense" model="account.account.type">
-            <field name="name">Expense</field>
-            <field name="code">expense</field>
-            <field name="close_method">none</field>
-        </record>
         <record id="account_type_cash_equity" model="account.account.type">
             <field name="name">Equity</field>
             <field name="code">equity</field>
             <field name="close_method">balance</field>
-        </record>
-        <record id="account_type_cash_moves" model="account.account.type">
-            <field name="name">Cash</field>
-            <field name="code">cash</field>
-            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
         </record>
 
         <!--
@@ -60,7 +21,7 @@
             <field name="name">Chart For Automated Tests</field>
             <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_root"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
         <!-- Balance Sheet -->
@@ -70,14 +31,14 @@
             <field name="name">Balance Sheet - (test)</field>
             <field ref="chart0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_root"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
         <record model="account.account" id="assets_view">
             <field name="name">Assets - (test)</field>
             <field name="code">X10</field>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="bal"/>
         </record>
@@ -87,7 +48,7 @@
             <field name="name">Fixed Assets - (test)</field>
             <field ref="assets_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="xfa" model="account.account">
@@ -95,7 +56,7 @@
             <field name="name">Fixed Asset Account - (test)</field>
             <field ref="fas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="nca" model="account.account">
@@ -103,7 +64,7 @@
             <field name="name">Net Current Assets - (test)</field>
             <field ref="assets_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="cas" model="account.account">
@@ -111,7 +72,7 @@
             <field name="name">Current Assets - (test)</field>
             <field ref="nca" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="stk" model="account.account">
@@ -119,7 +80,7 @@
             <field name="name">Purchased Stocks - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="a_recv" model="account.account">
@@ -128,7 +89,7 @@
             <field ref="cas" name="parent_id"/>
             <field name="type">receivable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
+            <field name="user_type" ref="data_account_type_receivable"/>
         </record>
 
         <record id="ova" model="account.account">
@@ -136,7 +97,7 @@
             <field name="name">Output VAT - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="bnk" model="account.account">
@@ -144,7 +105,7 @@
             <field name="name">Bank Current Account - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">liquidity</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="cash" model="account.account">
@@ -152,7 +113,7 @@
             <field name="name">Cash - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">liquidity</field>
-            <field name="user_type" ref="account_type_asset"/>
+            <field name="user_type" ref="data_account_type_asset"/>
         </record>
 
         <record id="o_income" model="account.account">
@@ -160,14 +121,14 @@
             <field name="name">Opening Income - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
         </record>
 
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
             <field name="code">X11</field>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_liability"/>
+            <field name="user_type" ref="data_account_type_liability"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="bal"/>
         </record>
@@ -177,7 +138,7 @@
             <field name="name">Current Liabilities - (test)</field>
             <field ref="liabilities_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_liability"/>
+            <field name="user_type" ref="data_account_type_liability"/>
         </record>
 
         <record id="a_pay" model="account.account">
@@ -186,7 +147,7 @@
             <field ref="cli" name="parent_id"/>
             <field name="type">payable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
+            <field name="user_type" ref="data_account_type_payable"/>
         </record>
 
         <record id="iva" model="account.account">
@@ -194,7 +155,7 @@
             <field name="name">Input VAT - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_liability"/>
+            <field name="user_type" ref="data_account_type_liability"/>
         </record>
 
         <record id="rsa" model="account.account">
@@ -202,7 +163,7 @@
             <field name="name">Reserve and Profit/Loss - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_liability"/>
+            <field name="user_type" ref="data_account_type_liability"/>
         </record>
 
         <record id="o_expense" model="account.account">
@@ -210,7 +171,7 @@
             <field name="name">Opening Expense - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <!-- Profit and Loss -->
@@ -220,14 +181,14 @@
             <field name="name">Profit and Loss - (test)</field>
             <field ref="chart0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_root"/>
+            <field name="user_type" ref="data_account_type_view"/>
         </record>
 
         <record model="account.account" id="income_view">
             <field name="name">Income - (test)</field>
             <field name="code">X20</field>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="gpf"/>
         </record>
@@ -236,7 +197,7 @@
             <field name="name">Foreign Exchange Gain - (test)</field>
             <field name="code">X201</field>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="income_view"/>
         </record>
@@ -246,7 +207,7 @@
             <field name="name">Revenue - (test)</field>
             <field ref="income_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
         </record>
 
         <record id="a_sale" model="account.account">
@@ -254,14 +215,14 @@
             <field name="name">Product Sales - (test)</field>
             <field ref="rev" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_income"/>
+            <field name="user_type" ref="data_account_type_income"/>
         </record>
 
         <record model="account.account" id="expense_view">
             <field name="name">Expense - (test)</field>
             <field name="code">X21</field>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="gpf"/>
         </record>
@@ -272,7 +233,7 @@
             <field name="name">Cost of Sales - (test)</field>
             <field ref="expense_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <record id="cog" model="account.account">
@@ -280,7 +241,7 @@
             <field name="name">Cost of Goods Sold - (test)</field>
             <field ref="cos" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <record id="ovr" model="account.account">
@@ -288,7 +249,7 @@
             <field name="name">Overheads - (test)</field>
             <field ref="expense_view" name="parent_id"/>
             <field name="type">view</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <record id="a_expense" model="account.account">
@@ -296,14 +257,14 @@
             <field name="name">Expenses - (test)</field>
             <field ref="ovr" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <record model="account.account" id="income_fx_expense">
             <field name="name">Foreign Exchange Loss - (test)</field>
             <field name="code">X2111</field>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="ovr"/>
         </record>
@@ -313,7 +274,7 @@
             <field name="name">Salary Expenses - (test)</field>
             <field ref="ovr" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account_type_expense"/>
+            <field name="user_type" ref="data_account_type_expense"/>
         </record>
 
         <!-- Properties -->
@@ -463,76 +424,5 @@
             <field eval="'account.account,'+str(ref('account.a_sale'))" model="account.account" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-
-        <!-- 
-            Financial Reports
-        -->
-        <record id="account_financial_report_balancesheet0" model="account.financial.report">
-            <field name="name">Balance Sheet</field>
-            <field name="type">sum</field>
-        </record>
-        <record id="account_financial_report_assets0" model="account.financial.report">
-            <field name="name">Assets</field>
-            <field name="parent_id" ref="account_financial_report_balancesheet0"/>
-            <field name="account_type_ids" eval="[(6,0,[ref('account.account_type_asset')])]"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-        <record id="account_financial_report_liability0" model="account.financial.report">
-            <field name="name">Liability</field>
-            <field name="parent_id" ref="account_financial_report_balancesheet0"/>
-            <field name="account_type_ids" eval="[(6,0,[ref('account.account_type_liability')])]"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-
-        <record id="account_financial_report_profitandloss0" model="account.financial.report">
-            <field name="name">Profit and Loss</field>
-            <field name="type">sum</field>
-        </record>
-        <record id="account_financial_report_income0" model="account.financial.report">
-            <field name="name">Income</field>
-            <field name="parent_id" ref="account_financial_report_profitandloss0"/>
-            <field name="account_type_ids" eval="[(6,0,[ref('account.account_type_income')])]"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-        <record id="account_financial_report_expense0" model="account.financial.report">
-            <field name="name">Expense</field>
-            <field name="parent_id" ref="account_financial_report_profitandloss0"/>
-            <field name="account_type_ids" eval="[(6,0,[ref('account.account_type_expense')])]"/>
-            <field name="display_detail">detail_with_hierarchy</field>
-            <field name="type">account_type</field>
-        </record>
-
-        <!--
-            Update Account Type
-        -->
-
-        <record id="account.account_type_asset" model="account.account.type">
-            <field name="report_type">asset</field>
-        </record>
-        <record id="account.account_type_liability" model="account.account.type">
-            <field name="report_type">liability</field>
-        </record>
-        <record id="account.account_type_income" model="account.account.type">
-            <field name="report_type">income</field>
-        </record>
-        <record id="account.account_type_expense" model="account.account.type">
-            <field name="report_type">expense</field>
-        </record>
-        <record id="account.account_type_receivable" model="account.account.type">
-            <field name="report_type">asset</field>
-        </record>
-        <record id="account.account_type_payable" model="account.account.type">
-            <field name="report_type">liability</field>
-        </record>
-        <record id="account.account_type_cash_equity" model="account.account.type">
-            <field name="report_type">liability</field>
-        </record>
-        <record id="account.account_type_cash_moves" model="account.account.type">
-            <field name="report_type">asset</field>
-        </record>
-
     </data>
 </openerp>