diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 7045f5c069c..e01dbc70f07 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',
@@ -122,8 +123,6 @@ module named account_voucher.
         'ir_sequence_view.xml',
         'company_view.xml',
         'board_account_view.xml',
-        "wizard/account_report_profit_loss_view.xml",
-        "wizard/account_report_balance_sheet_view.xml",
         "edi/invoice_action_data.xml",
         "account_bank_view.xml",
         "account_pre_install.yml"
diff --git a/addons/account/account.py b/addons/account/account.py
index fd8a0506d01..e923080f9ad 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -130,6 +130,43 @@ account_payment_term_line()
 class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account 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):
+        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),
         'code': fields.char('Code', size=32, required=True),
@@ -139,19 +176,16 @@ 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."""),
-        '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.'),
-        'report_type':fields.selection([
-            ('none','/'),
-            ('income','Profit & Loss (Income Accounts)'),
-            ('expense','Profit & Loss (Expense Accounts)'),
-            ('asset','Balance Sheet (Asset Accounts)'),
-            ('liability','Balance Sheet (Liability Accounts)')
-        ],'P&L / BS Category', select=True, readonly=False, 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 = {
         'close_method': 'none',
-        'sign': 1,
         'report_type': 'none',
     }
     _order = "code"
@@ -2912,6 +2946,7 @@ class account_financial_report(osv.osv):
         return res
 
     def _get_balance(self, cr, uid, ids, name, args, context=None):
+        account_obj = self.pool.get('account.account')
         res = {}
         res_all = {}
         for report in self.browse(cr, uid, ids, context=context):
@@ -2922,6 +2957,12 @@ class account_financial_report(osv.osv):
                 # it's the sum of balance of the linked accounts
                 for a in report.account_ids:
                     balance += a.balance
+            elif report.type == 'account_type':
+                # it's the sum of balance of the leaf accounts with such an account type
+                report_types = [x.id for x in report.account_type_ids]
+                account_ids = account_obj.search(cr, uid, [('user_type','in', report_types), ('type','!=','view')], context=context)
+                for a in account_obj.browse(cr, uid, account_ids, context=context):
+                    balance += a.balance
             elif report.type == 'account_report' and report.account_report_id:
                 # it's the amount of the linked report
                 res2 = self._get_balance(cr, uid, [report.account_report_id.id], 'balance', False, context=context)
@@ -2944,7 +2985,6 @@ class account_financial_report(osv.osv):
         'parent_id': fields.many2one('account.financial.report', 'Parent'),
         'children_ids':  fields.one2many('account.financial.report', 'parent_id', 'Account Report'),
         'sequence': fields.integer('Sequence'),
-        'note': fields.text('Notes'),
         'balance': fields.function(_get_balance, 'Balance'),
         'level': fields.function(_get_level, string='Level', store=True, type='integer'),
         'type': fields.selection([
@@ -2954,13 +2994,20 @@ class account_financial_report(osv.osv):
             ('account_report','Report Value'),
             ],'Type'),
         'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'),
-        'display_detail': fields.boolean('Display details', help='Display every account with its balance instead of the sum.'),
+        'display_detail': fields.selection([
+            ('no_detail','No detail'),
+            ('detail_flat','Display children flat'),
+            ('detail_with_hierarchy','Display children with hierarchy')
+            ], '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.'),
     }
 
     _defaults = {
         'type': 'sum',
+        'display_detail': 'detail_flat',
+        'sign': 1,
     }
 
 account_financial_report()
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index cbdb665e157..430d65e0bf9 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -25,7 +25,7 @@
                 </xpath>
                 <group colspan="8" position="inside">
                     <group colspan="4" width="600">
-                        <field name="charts"/>
+                            <field name="charts"/>
                             <group colspan="4" groups="account.group_account_user">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                                 <field name="has_default_company" invisible="1" />
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 39cc471c2f6..bef6e68221a 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -610,15 +610,15 @@ class account_invoice(osv.osv):
             res[r[0]].append( r[1] )
         return res
 
-    def copy(self, cr, uid, id, default={}, context=None):
-        if context is None:
-            context = {}
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
         default.update({
             'state':'draft',
             'number':False,
             'move_id':False,
             'move_name':False,
             'internal_number': False,
+            'period_id': False,
         })
         if 'date_invoice' not in default:
             default.update({
@@ -1642,12 +1642,7 @@ class res_partner(osv.osv):
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-
-        if context is None:
-            context = {}
-
+        default = default or {}
         default.update({'invoice_ids' : []})
         return super(res_partner, self).copy(cr, uid, id, default, context)
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 36a87cc6459..6afdf857b96 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -787,7 +787,6 @@
                     <group col="2" colspan="2">
                         <separator string="Reporting Configuration" colspan="4"/>
                         <field name="report_type" select="2"/>
-                        <field name="sign" />                        
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Closing Method" colspan="4"/>
@@ -2487,6 +2486,9 @@
             <field eval="5" name="sequence"/>
             <field name="code">
 act_window_ids = pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context)
+ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_account_configuration_installer')
+if ref:
+    act_window_ids += [ref[1]]
 todo_ids = pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context)
 pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context)
 action = pool.get('res.config').next(cr, uid, [], context)
@@ -2778,10 +2780,14 @@ action = pool.get('res.config').next(cr, uid, [], context)
                         <field name="parent_id"/>
                         <field name="sequence"/>
                         <field name="type"/>
+                        <field name="sign"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Report" attrs="{'invisible': [('state','!=','confirm')]}">
-                            <field name="display_detail" attrs="{'invisible': [('type','!=','accounts')]}"/>
+                    <notebook colspan="6">
+                        <page string="Report">
+                            <group colspan="4" col="4">
+                                <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"  colspan="2"/>
+                                <label string="" colspan="2"/>
+                            </group>
                             <newline/>
                             <field name="account_ids" nolabel="1" colspan="6" attrs="{'invisible': [('type', '!=', 'accounts')]}"/>
                             <newline/>
@@ -2790,9 +2796,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="account_type_ids" nolabel="1" attrs="{'invisible': [('type', '!=', 'account_type')]}"/>
                             <newline/>
                         </page>
-                        <page string="Notes" attrs="{'invisible': [('state','!=','confirm')]}">
-                            <field name="note" nolabel="1" colspan="4"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 0ac7a51405d..fa0aa3459dd 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -1,26 +1,6 @@
 <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="report_type">income</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="report_type">expense</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>
@@ -41,78 +21,32 @@
             <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="report_type">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="report_type">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="report_type">expense</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="report_type">asset</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="report_type">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="report_type">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>
           <field name="report_type">liability</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="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-         <record model="account.account.type" id="conf_account_type_chk">
+        <record model="account.account.type" id="conf_account_type_chk">
           <field name="name">Check</field>
           <field name="code">check</field>
-          <field name="report_type">asset</field>
           <field name="close_method">balance</field>
+          <field name="report_type">asset</field>
         </record>
 
-
-
         <!-- Account Templates-->
         <record id="conf_chart0" model="account.account.template">
             <field name="code">0</field>
             <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 -->
@@ -122,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">
@@ -162,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">
@@ -171,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">
@@ -179,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">
@@ -195,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">
@@ -212,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">
@@ -220,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">
@@ -229,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">
@@ -237,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 -->
@@ -247,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">
@@ -263,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">
@@ -279,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">
@@ -295,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">
@@ -303,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/data/data_financial_report.xml b/addons/account/data/data_financial_report.xml
new file mode 100644
index 00000000000..18624f94749
--- /dev/null
+++ b/addons/account/data/data_financial_report.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- 
+            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="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="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="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="display_detail">detail_with_hierarchy</field>
+            <field name="type">account_type</field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 50b597c8e49..baa94450f02 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -5,58 +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="report_type">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="report_type">asset</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="report_type">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="report_type">liability</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="report_type">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="report_type">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>
             <field name="report_type">liability</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="report_type">asset</field>
-            <field name="close_method">balance</field>
         </record>
 
         <!--
@@ -68,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 -->
@@ -78,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>
@@ -95,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">
@@ -103,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">
@@ -111,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">
@@ -119,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">
@@ -127,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">
@@ -136,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">
@@ -144,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">
@@ -152,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">
@@ -160,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">
@@ -168,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>
@@ -185,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">
@@ -194,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">
@@ -202,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">
@@ -210,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">
@@ -218,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 -->
@@ -228,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>
@@ -244,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>
@@ -254,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">
@@ -262,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>
@@ -280,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">
@@ -288,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">
@@ -296,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">
@@ -304,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>
@@ -321,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 -->
diff --git a/addons/account/installer.py b/addons/account/installer.py
index cfd434833ae..d1b19ef4319 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -24,6 +24,7 @@ import time
 import datetime
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
+from os.path import join as opj
 
 from tools.translate import _
 from osv import fields, osv
@@ -111,6 +112,11 @@ class account_installer(osv.osv_memory):
             context = {}
         fy_obj = self.pool.get('account.fiscalyear')
         for res in self.read(cr, uid, ids, context=context):
+            if 'charts' in res and res['charts'] == 'configurable':
+                #load generic chart of account
+                fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
+                tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
+                fp.close()
             if 'date_start' in res and 'date_stop' in res:
                 f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context)
                 if not f_ids:
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 90254c53bda..70ceb4b8f83 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -33,13 +33,10 @@ import account_print_overdue
 import account_aged_partner_balance
 #import tax_report
 import account_tax_report
-import account_balance_landscape
 import account_invoice_report
 import account_report
 import account_entries_report
 import account_analytic_entries_report
-import account_balance_sheet
-import account_profit_loss
 import account_treasury_report
 import account_financial_report
 
diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py
deleted file mode 100644
index 4e62a9777c9..00000000000
--- a/addons/account/report/account_balance_landscape.py
+++ /dev/null
@@ -1,393 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import locale
-from report import report_sxw
-
-parents = {
-    'tr':1,
-    'li':1,
-    'story': 0,
-    'section': 0
-}
-
-class account_balance_landscape(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_balance_landscape, self).__init__(cr, uid, name, context=context)
-        self.flag=1
-        self.dr_total= 0.00
-        self.cr_total= 0.00
-        self.parent_bal=0
-        self.status=0
-        self.done_total=0
-        self.baldiv={}
-        self.empty_parent=0
-        self.result_total = {}
-        self.total_for_perc=[]
-        self.localcontext.update({
-            'time': time,
-            'lines': self.lines,
-            'get_lines':self.get_lines,
-            'linesForTotal': self.linesForTotal,
-            'linesForYear': self.linesForYear,
-            'get_years':self.get_years,
-            'cal_total':self.cal_total,
-            'total_dr':self.total_dr,
-            'total_cr':self.total_cr
-            })
-        self.context = context
-
-    def linesForYear(self,form):
-        temp=0
-        years={}
-
-        global pattern
-        global show
-        global perc
-        global bal_zero
-        global ref_bal
-
-        pattern=form['compare_pattern']
-
-        if form['show_columns']!=1:
-            show=0
-        else:
-            show=form['show_columns']
-
-        if form['format_perc']!=1:
-            perc=0
-        else:
-            perc=form['format_perc']
-
-        if form['account_choice']=='bal_zero':
-            bal_zero=0
-        else:
-            bal_zero=1
-
-        ctx = self.context.copy()
-
-        if perc==1:
-            if form['select_account']!=False:
-                ref_ac=self.pool.get('account.account').browse(self.cr, self.uid, form['select_account'], ctx.copy())
-                if ref_ac.balance<>0.00:
-                    ref_bal=ref_ac.balance
-                else:
-                    ref_bal=1.00
-            else:
-                ref_bal='nothing'
-        else:
-            ref_bal='nothing'
-
-
-        self.done_total=1
-        self.total_for_perc=self.linesForTotal(form, ids={}, doneAccount={}, level=1)
-        self.done_total=0
-
-        for t1 in range(0,len(form['fiscalyear'])):
-            locale.setlocale(locale.LC_ALL, '')
-            self.result_total["sum_credit" + str(t1)]=locale.format("%.2f", self.result_total["sum_credit" + str(t1)], grouping=True)
-            self.result_total["sum_debit" + str(t1)]=locale.format("%.2f", self.result_total["sum_debit" + str(t1)], grouping=True)
-
-        for temp in range(0,len(form['fiscalyear'])):
-            fy=self.pool.get('account.fiscalyear').name_get(self.cr, self.uid, form['fiscalyear'][temp])
-            years["year"+str(temp)]=fy[0][1][12:16]
-
-        return [years]
-
-
-    def linesForTotal(self, form, ids={}, doneAccount={}, level=1):
-        if not self.done_total==1:
-            return [self.result_total]
-        accounts=[]
-        if not ids:
-            ids = self.ids
-        if not ids:
-            return []
-
-        ctx = self.context.copy()
-
-        for id in form['fiscalyear']:
-            tmp=[]
-
-            ctx['fiscalyear'] = id
-            ctx['periods'] = form['periods']
-            ctx['period_manner'] = form['period_manner']
-            ctx['state'] = form['context'].get('state','all')
-            tmp = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
-
-            if tmp:
-                accounts.append(tmp)
-
-        merged_accounts=zip(*accounts)
-        # used to check for the frst record so all sum_credit and sum_debit r set to 0.00
-        if level==1:
-            doneAccount={}
-        for entry in merged_accounts:
-
-            if entry[0].id in doneAccount:
-                continue
-            doneAccount[entry[0].id] = 1
-
-            for k in range(0,len(entry)):
-                temp_credit=0.00
-                temp_debit=0.00
-                if entry[0].type <> 'view':
-                    temp_credit+=entry[k].credit
-                    temp_debit+=entry[k].debit
-
-                if self.flag==1:
-                    self.result_total["sum_credit" + str(k)]=0.00
-                    self.result_total["sum_debit" + str(k)]=0.00
-
-                if form['account_choice']=='bal_zero':
-                    if temp_credit<>temp_debit:
-                        self.result_total["sum_credit" + str(k)]+=temp_credit
-                        self.result_total["sum_debit" + str(k)]+=temp_debit
-                else:
-                    self.result_total["sum_credit" + str(k)]+=temp_credit
-                    self.result_total["sum_debit" + str(k)]+=temp_debit
-
-            self.flag=2
-
-            if entry[0].child_id:
-                ids2 = [(x.code,x.id) for x in entry[0].child_id]
-                ids2.sort()
-
-                result_total_parent = self.linesForTotal(form, [x[1] for x in ids2], doneAccount, level+1)
-
-        return [self.result_total]
-
-    def lines(self, form, ids={}, done={}, level=1):
-        accounts=[]
-        if not ids:
-            ids = self.ids
-        if not ids:
-            return []
-        result = []
-        ctx = self.context.copy()
-        tmp1=[]
-        for id in form['fiscalyear']:
-
-            ctx['fiscalyear'] = id
-            ctx['periods'] = form['periods']
-            ctx['period_manner']=form['period_manner']
-            ctx['state'] = form['context'].get('state','all')
-            tmp1 = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
-
-            if tmp1:
-                accounts.append(tmp1)
-
-        if level==1:   #if parent is called,done is not empty when called again.
-            done={}
-
-        def cmp_code(x, y):
-            return cmp(x.code, y.code)
-        for n in range(0,len(accounts)):
-            accounts[n].sort(cmp_code)
-        merged_accounts=zip(*accounts)
-
-        for entry in merged_accounts:
-            j=0
-            checked=1
-
-            if form['account_choice']!='all':    #  if checked,include empty a/c;not otherwise
-                checked=0
-
-            if entry[0].id in done:
-                continue
-            done[entry[0].id] = 1
-
-            if entry[0].child_id:  # this is for parent account,dont check 0 for it
-                checked=4
-                self.status=1 # for displaying it Bold
-            else:
-                self.status=0
-            if checked==0:
-                i=0
-                for i in range(0,len(entry)):
-                    if bal_zero==0:
-                        if entry[i].balance<>0.0:
-                            checked=4
-                            break
-                        else:
-                            checked=3
-                            i=i+1
-                    else:
-                        if entry[i].credit <> 0.0 or entry[i].debit <> 0.0:
-                            checked=4
-                            break
-                        else:
-                            checked=3
-                            i=i+1
-
-            if checked==3:
-                # this is the point where we skip those accounts which are encountered as empty ones
-                continue
-                self.empty_parent=0
-            else:
-                self.empty_parent=1
-                res = {
-                    'code': entry[0].code,
-                    'name': entry[0].name,
-                    'level': level,
-                    'status': self.status,
-                    }
-
-                for j in range(0,len(entry)):
-
-                    locale.setlocale(locale.LC_ALL, '')
-                    res["debit"+str(j)]=locale.format("%.2f", entry[j].debit, grouping=True)
-                    res["credit"+str(j)]=locale.format("%.2f", entry[j].credit, grouping=True)
-                    res["balance"+str(j)]=locale.format("%.2f", entry[j].balance, grouping=True)
-
-
-                    if j==0:
-                        res["bal_cash"+str(j)]="0.00"
-                        res["bal_perc"+str(j)]="0.00%"
-                    else:
-                        temp_cash=entry[j].balance - entry[j-1].balance
-                        res["bal_cash"+str(j)]=locale.format("%.2f", temp_cash, grouping=True)
-                        if entry[j-1].balance<>0.00:
-                            temp_perc=(entry[j].balance - entry[j-1].balance )*100/entry[j-1].balance
-                        else:
-                            temp_perc=(entry[j].balance) *100
-
-                        res["bal_perc"+str(j)]=locale.format("%.2f", temp_perc) + "%"
-
-
-                    if ref_bal=='nothing':
-                        if level==1:
-                            self.parent_bal=1
-                        else:
-                            self.parent_bal=0
-
-                        if self.parent_bal==1:
-                            res["balance_perc"+str(j)]="/"
-                        else:
-                            if entry[j].balance==0.00:
-                                if self.baldiv["baldiv"+str(level-1)+str(j)]<>0.00:
-                                    res["balance_perc"+str(j)]="0.00%"
-                                else:
-                                    res["balance_perc"+str(j)]="/"
-                            else:
-                                if self.baldiv["baldiv"+str(level-1)+str(j)]<>0.00:
-                                    temp=self.baldiv["baldiv"+str(level-1)+str(j)]
-                                    temp1=(entry[j].balance * 100 )/ float(temp)
-                                    temp1=round(temp1,2)
-                                    res["balance_perc" + str(j)]=str(temp1)+"%"
-                                else:
-                                    res["balance_perc"+str(j)]="/"
-                    else:
-                        res["balance_perc"+str(j)]=str( (entry[j].balance * 100 )/ float(ref_bal)) + "%"
-
-            result.append(res)
-
-            if entry[0].child_id:
-
-                for q in range(0,len(form['fiscalyear'])):
-                    self.baldiv["baldiv"+str(level)+str(q)]=entry[q].balance
-
-                ids2 = [(x.code,x.id) for x in entry[0].child_id]
-                ids2.sort()
-                dir=[]
-                dir += self.lines(form, [x[1] for x in ids2], done, level+1)
-                if dir==[]:
-                    for w in range(0,len(form['fiscalyear'])):
-                        if entry[w].credit <> 0.0 or entry[w].debit <> 0.0 or entry[w].balance<>0.00:
-                            dont_pop=1
-                            break
-                        else:
-                            dont_pop=0
-                    if dont_pop==1:
-                        result +=dir
-                    else:
-                        result.pop(-1)   # here we pop up the parent having its children as emprty accounts
-                else:
-                    result +=dir
-
-        return result
-
-    def get_years(self, form):
-        result =[]
-        res={}
-        for temp in range(0, len(form['fiscalyear'])):
-            res={}
-            fy=self.pool.get('account.fiscalyear').name_get(self.cr, self.uid, form['fiscalyear'][temp])
-            res['year']=fy[0][1]
-            res['last_str']=temp
-
-            result.append(res)
-        self.linesForYear(form)
-        return result
-
-    def get_lines(self, year_dict, form):
-        final_result = []
-        res = {}
-        line_l = self.lines(form)
-        self.cal_total(year_dict)
-        if line_l:
-            for l in line_l:
-                res = {}
-                res['code'] = l['code']
-                res['name'] = l['name']
-                res['level'] = l['level']
-                for k,v in l.items():
-                    if k.startswith('debit'+str(year_dict['last_str'])):
-                        res['debit'] = v
-                    if k.startswith('credit'+str(year_dict['last_str'])):
-                        res['credit'] = v
-                    if k.startswith('balance'+str(year_dict['last_str'])) and not k.startswith('balance_perc'+str(year_dict['last_str'])):
-                        res['balance'] =v
-                    if k.startswith('balance_perc'+str(year_dict['last_str'])) and not k.startswith('balance'+str(year_dict['last_str'])):
-                        res['balance_perc'] = v
-                    if form['compare_pattern'] == 'bal_perc':
-                        if k.startswith('bal_perc'+str(year_dict['last_str'])):
-                            res['pattern'] = v
-                    elif form['compare_pattern'] == 'bal_cash':
-                        if k.startswith('bal_cash'+str(year_dict['last_str'])):
-                            res['pattern'] = v
-                    else:
-                        res['pattern'] = ''
-                final_result.append(res)
-        return final_result
-
-    def cal_total(self, year_dict):
-        total_l = self.result_total
-        if total_l:
-            for k,v in total_l.items():
-                if k.startswith('sum_debit'+str(year_dict['last_str'])):
-                    self.dr_total = v
-                elif k.startswith('sum_credit'+str(year_dict['last_str'])):
-                    self.cr_total = v
-                else:
-                    continue
-        return True
-
-    def total_dr(self):
-        return self.dr_total
-
-    def total_cr(self):
-        return self.cr_total
-
-report_sxw.report_sxw('report.account.account.balance.landscape', 'account.account', 'addons/account/report/account_balance_landscape.rml', parser=account_balance_landscape, header="internal landscape")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/report/account_balance_landscape.rml b/addons/account/report/account_balance_landscape.rml
deleted file mode 100644
index d8e4881bbbe..00000000000
--- a/addons/account/report/account_balance_landscape.rml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Account Balance.pdf">
-  <template pageSize="(842.0,595.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Tiltle">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_header_account">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#b3b3b3" start="4,0" stop="4,-1"/>
-      <blockBackground colorName="#b3b3b3" start="5,0" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <blockBackground colorName="#b3b3b3" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#b3b3b3" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#b3b3b3" start="3,0" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <blockBackground colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <blockBackground colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <blockBackground colorName="#cccccc" start="4,0" stop="4,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(get_years(data['form']), 'y') ]]</para>
-    <blockTable colWidths="785.0" style="Table_Tiltle">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Account Balance - [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">Year : [[ y['year'] ]]</para>
-    <blockTable colWidths="56.0,198.0,95.0,110.0,105.0,164.0" style="Table_header_account">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and 'Code' or removeParentNode('blockTable') ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account Name </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('font') ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Balance</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="56.0,198.0,206.0,268.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and removeParentNode('blockTable') or 'Code' ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Account Name </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details"><font>[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('font') ]]</font></para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Balance</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(get_lines(y,data['form']), 'a') ]]</para>
-      <blockTable colWidths="56.0,197.0,94.0,110.0,106.0,162.0" style="Table4">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ a['pattern'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2"/>
-      <blockTable colWidths="56.0,197.0,94.0,110.0,107.0,85.0,77.0" style="Table2">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font>[[ a['name'] ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ a['pattern'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['debit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['credit'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="55.0,197.0,94.0,380.0" style="Table6">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font><font> [[ a['name'] ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ a['pattern'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="54.0,197.0,94.0,275.0,106.0" style="Table5">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] [[ a['code'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9"><font color="white">[['.....'*(a['level']-1) ]]</font> <font> [[ a['name'] ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ a['pattern'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['balance_perc'] ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2"/>
-    </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="52.0,291.0,112.0,107.0,164.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ not data['form']['show_columns'] and removeParentNode('blockTable') ]] </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Total :</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ total_dr() ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ total_cr() ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and "C.S.Y.T.(C./P) : Compare Selected Years In Terms of Cash/Perc" or removeParentNode('font') ]]</para>
-  </story>
-</document>
\ No newline at end of file
diff --git a/addons/account/report/account_balance_landscape_old_backup.rml b/addons/account/report/account_balance_landscape_old_backup.rml
deleted file mode 100644
index 6790082f8dd..00000000000
--- a/addons/account/report/account_balance_landscape_old_backup.rml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Account Balance.pdf">
-  <template pageSize="(1120.0,770.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" >
-    <pageTemplate id="first">
-      <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table61">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="red"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-  </stylesheet>
-  <story>
-    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P1">Account Balance</para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="Table Contents">[[ company.name ]]</para>
-        </td>
-        <td>
-          <para style="P4">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P5">Currency: [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
-     <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
-      <blockTable colWidths="180.0" style="Table6">
-		 <tr>
-          <td>
-            <para style="P1">Account Information</para>
-          </td>
-         </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
-      <blockTable colWidths="30.0,150.0" style="Table6">
-        <tr>
-          <td>
-            <para style="P1">Code</para>
-          </td>
-          <td>
-            <para style="P1">Account Name</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
-      <blockTable colWidths="180.0" style="Table5">
-        <tr>
-          <td>
-            <para style="P4"></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
-      <blockTable colWidths="0.0,28.0,152.0" style="Table5">
-        <tr>
-        <td>
-            <para style="P3"> </para>
-          </td>
-          <td>
-            <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['code'] ]]</para>
-          </td>
-          <td>
-          <para style="P2"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
-      <blockTable colWidths="180.0" style="Table6">
-        <tr>
-          <td>
-            <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/report/account_balance_old_backup.rml b/addons/account/report/account_balance_old_backup.rml
deleted file mode 100644
index cf67cb6bc3d..00000000000
--- a/addons/account/report/account_balance_old_backup.rml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Account Balance.pdf">
-  <template pageSize="(635.0,842.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="15.0" y1="15.0" width="615" height="772"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-
-    </blockTableStyle>
-    <blockTableStyle id="Table61">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="red"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="18" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="RIGHT" />
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="12" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="1.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-  </stylesheet>
-  <story>
-    <blockTable colWidths="143.0,226.0,156.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-        <para style="Table Contents"><font color="white"> </font></para>
-        </td>
-        <td>
-        <para style="P1">Account balance</para>
-        </td>
-        <td>
-        <para style="P3"><font color="white"> </font></para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        <para style="Table Contents">[[ company.name ]]</para>
-        </td>
-        <td>
-        <para style="P4"><font color="white"> </font></para>
-        </td>
-        <td>
-        <para style="P5">Currency: [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="P8">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
-     <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13"> [[repeatIn(linesForYear(data['form']),'year_header',td=len(data['form']['fiscalyear'][0][2]),width=[126],value=['year'],type=['string']) ]]</para>
-      <blockTable colWidths="190.0" style="Table6">
-		 <tr>
-          <td>
-          <para style="P1">Account Information</para>
-          </td>
-         </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['Debit','Credit','Balance'],type=['lable','lable','lable']) ]]</para>
-      <blockTable colWidths="30.0,160.0" style="Table6">
-        <tr>
-          <td>
-          <para style="P1">Code</para>
-          </td>
-          <td>
-          <para style="P1">Account Name</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <section>
-      <para style="P13">[[ repeatIn([],'title',td=len(data['form']['fiscalyear'][0][2]),width=[84,42],value=['Cash','%'],type=['lable','lable']) ]]</para>
-      <blockTable colWidths="190.0" style="Table5">
-        <tr>
-          <td>
-          <para style="P4"><font color="white"> </font></para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="P13">[[ repeatIn(lines(data['form']),'a',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['debit','credit','balance'],type=['string','string','string']) ]]</para>
-      <condPageBreak height="2cm"/>
-      <blockTable colWidths="0.0,28.0,162.0" style="Table5">
-        <tr>
-        <td>
-        <para style="P3">
-        <font color="white"> </font>
-        </para>
-        </td>
-        <td>
-        <para style="P7">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['code'] ]]</para>
-        </td>
-        <td>
-        <para style="P2"><font color="white">[['.....'*(a['level']-1) ]]</font><font>[[ a['status']==1 and ( setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
-        </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <section>
-     <para style="P13">[[ repeatIn(linesForTotal(data['form']),'total',td=len(data['form']['fiscalyear'][0][2]),width=[42,42,42],value=['sum_debit','sum_credit',''],type=['string','string','lable'] ) ]]</para>
-      <blockTable colWidths="190.0" style="Table6">
-        <tr>
-          <td>
-          	 <para style="P3">Total:[[ data['form']['show_columns']==0 and removeParentNode('section')]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
deleted file mode 100644
index ce9e3c51f06..00000000000
--- a/addons/account/report/account_balance_sheet.py
+++ /dev/null
@@ -1,224 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-import pooler
-from report import report_sxw
-from account.report import account_profit_loss
-from common_report_header import common_report_header
-from tools.translate import _
-
-class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header):
-    def __init__(self, cr, uid, name, context=None):
-        super(report_balancesheet_horizontal, self).__init__(cr, uid, name, context=context)
-        self.obj_pl = account_profit_loss.report_pl_account_horizontal(cr, uid, name, context=context)
-        self.result_sum_dr = 0.0
-        self.result_sum_cr = 0.0
-        self.result = {}
-        self.res_bl = {}
-        self.result_temp = []
-        self.localcontext.update({
-            'time': time,
-            'get_lines': self.get_lines,
-            'get_lines_another': self.get_lines_another,
-            'get_company': self._get_company,
-            'get_currency': self._get_currency,
-            'sum_dr': self.sum_dr,
-            'sum_cr': self.sum_cr,
-            'get_data':self.get_data,
-            'get_pl_balance':self.get_pl_balance,
-            'get_fiscalyear': self._get_fiscalyear,
-            'get_account': self._get_account,
-            'get_start_period': self.get_start_period,
-            'get_end_period': self.get_end_period,
-            'get_sortby': self._get_sortby,
-            'get_filter': self._get_filter,
-            'get_journal': self._get_journal,
-            'get_start_date':self._get_start_date,
-            'get_end_date':self._get_end_date,
-            'get_company':self._get_company,
-            'get_target_move': self._get_target_move,
-        })
-        self.context = context
-
-    def set_context(self, objects, data, ids, report_type=None):
-        new_ids = ids
-        if (data['model'] == 'ir.ui.menu'):
-            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
-            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-        return super(report_balancesheet_horizontal, self).set_context(objects, data, new_ids, report_type=report_type)
-
-    def sum_dr(self):
-        if self.res_bl['type'] == _('Net Profit'):
-            self.result_sum_dr += self.res_bl['balance']*-1
-        return self.result_sum_dr
-
-    def sum_cr(self):
-        if self.res_bl['type'] == _('Net Loss'):
-            self.result_sum_cr += self.res_bl['balance']
-        return self.result_sum_cr
-
-    def get_pl_balance(self):
-        return self.res_bl
-
-    def get_data(self,data):
-        cr, uid = self.cr, self.uid
-        db_pool = pooler.get_pool(self.cr.dbname)
-
-        #Getting Profit or Loss Balance from profit and Loss report
-        self.obj_pl.get_data(data)
-        self.res_bl = self.obj_pl.final_result()
-
-        account_pool = db_pool.get('account.account')
-        currency_pool = db_pool.get('res.currency')
-
-        types = [
-            'liability',
-            'asset'
-        ]
-
-        ctx = self.context.copy()
-        ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
-
-        if data['form']['filter'] == 'filter_period':
-            ctx['period_from'] = data['form'].get('period_from', False)
-            ctx['period_to'] =  data['form'].get('period_to', False)
-        elif data['form']['filter'] == 'filter_date':
-            ctx['date_from'] = data['form'].get('date_from', False)
-            ctx['date_to'] =  data['form'].get('date_to', False)
-        ctx['state'] = data['form'].get('target_move', 'all')
-        cal_list = {}
-        pl_dict = {}
-        account_dict = {}
-        account_id = data['form'].get('chart_account_id', False)
-        account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
-        accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
-
-        if not self.res_bl:
-            self.res_bl['type'] = _('Net Profit')
-            self.res_bl['balance'] = 0.0
-
-        if self.res_bl['type'] == _('Net Profit'):
-            self.res_bl['type'] = _('Net Profit')
-        else:
-            self.res_bl['type'] = _('Net Loss')
-        pl_dict  = {
-            'code': self.res_bl['type'],
-            'name': self.res_bl['type'],
-            'level': False,
-            'balance':self.res_bl['balance'],
-        }
-        for typ in types:
-            accounts_temp = []
-            for account in accounts:
-                if (account.user_type.report_type) and (account.user_type.report_type == typ):
-                    account_dict = {
-                        'id': account.id,
-                        'code': account.code,
-                        'name': account.name,
-                        'level': account.level,
-                        'balance': account.balance != 0 and account.balance * account.user_type.sign or account.balance,
-                        'type': account.type,
-                    }
-                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
-                    if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_dr += account.balance
-                    if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_cr += account.balance
-                    if data['form']['display_account'] == 'movement':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
-                            accounts_temp.append(account_dict)
-                    elif data['form']['display_account'] == 'not_zero':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
-                            accounts_temp.append(account_dict)
-                    else:
-                        accounts_temp.append(account_dict)
-                    if account.id == data['form']['reserve_account_id']:
-                        pl_dict['level'] = account['level'] + 1
-                        accounts_temp.append(pl_dict)
-
-            self.result[typ] = accounts_temp
-            cal_list[typ]=self.result[typ]
-
-        if cal_list:
-            temp = {}
-            for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
-                if i < len(cal_list['liability']) and i < len(cal_list['asset']):
-                    temp={
-                          'type': cal_list['liability'][i]['type'],
-                          'code': cal_list['liability'][i]['code'],
-                          'name': cal_list['liability'][i]['name'],
-                          'level': cal_list['liability'][i]['level'],
-                          'balance':cal_list['liability'][i]['balance'],
-                          'type1': cal_list['asset'][i]['type'],
-                          'code1': cal_list['asset'][i]['code'],
-                          'name1': cal_list['asset'][i]['name'],
-                          'level1': cal_list['asset'][i]['level'],
-                          'balance1':cal_list['asset'][i]['balance'],
-                          }
-                    self.result_temp.append(temp)
-                else:
-                    if i < len(cal_list['asset']):
-                        temp={
-                              'type': '',
-                              'code': '',
-                              'name': '',
-                              'level': False,
-                              'balance':False,
-                              'type1': cal_list['asset'][i]['type'],
-                              'code1': cal_list['asset'][i]['code'],
-                              'name1': cal_list['asset'][i]['name'],
-                              'level1': cal_list['asset'][i]['level'],
-                              'balance1':cal_list['asset'][i]['balance'],
-                          }
-                        self.result_temp.append(temp)
-                    if  i < len(cal_list['liability']):
-                        temp={
-                              'type': cal_list['liability'][i]['type'],
-                              'code': cal_list['liability'][i]['code'],
-                              'name': cal_list['liability'][i]['name'],
-                              'level': cal_list['liability'][i]['level'],
-                              'balance':cal_list['liability'][i]['balance'],
-                              'type1': '',
-                              'code1': '',
-                              'name1': '',
-                              'level1': False,
-                              'balance1':False,
-                          }
-                        self.result_temp.append(temp)
-        return None
-
-    def get_lines(self):
-        return self.result_temp
-
-    def get_lines_another(self, group):
-        return self.result.get(group, [])
-
-report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
-    'addons/account/report/account_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
-    header='internal landscape')
-
-report_sxw.report_sxw('report.account.balancesheet', 'account.account',
-    'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal,
-    header='internal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
deleted file mode 100644
index 620ec05b16a..00000000000
--- a/addons/account/report/account_balance_sheet.rml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Balance Sheet.pdf">
-  <template pageSize="(595.0,842.0)" title="Balance Sheet" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Heading">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Date_from_To">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Net_Profit_Loss">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,1" stop="-1,-1"/>
-    </blockTableStyle>
-   <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Left" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <paraStyle name="terp_level_1_code" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_code" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_code" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_code_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name" fontName="Helvetica" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <blockTableStyle id="Table1">
-      <blockTopPadding start="0,0" stop="-1,0" length="15"/>
-      <blockFont name="Helvetica-Bold" size="10.0" />
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,1" thickness="1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockTopPadding start="0,0" stop="-1,0" length="10"/>
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#666666" start="1,1" stop="1,1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Balance Sheet</para>
-        </td>
-      </tr>
-    </blockTable>
-        <para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
-        <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-      <blockTable colWidths="120.0,100.0,140.0,90.0,90.0" style="Table2_header" >
-      <tr>
-        <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
-    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-  <tr>
-     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
-        <tr>
-                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-            </tr>
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
-        <tr>
-              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-            </tr>
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-            </tr>
-           </blockTable>
-          </td>
-    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-    <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
-  </tr>
-  </blockTable>
-      <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Left">Assets</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-      <tr style="Table3">
-          [[ repeatIn(get_lines_another('asset'),'a' ) ]]
-          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
-        <td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
-        <td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
-        <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</para></td>
-        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</u></para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj = company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-    <condPageBreak height="20cm"/>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Left">Liabilities</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-      <tr style="Table3">
-          [[ repeatIn(get_lines_another('liability'),'a' ) ]]
-          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
-        <td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
-        <td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
-        <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</para></td>
-        <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</u></para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj = company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
deleted file mode 100644
index b2d54e33466..00000000000
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Balance Sheet.pdf">
-  <template pageSize="(842.0,595.0)" title="Balance Sheet" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Heading">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Date_from_To">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,1" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Main_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Liability_side">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Asset_Side_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Net_Profit_Loss">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-   <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-        <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-     <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>
-
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" rightIndent="0.0" leftIndent="1.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" rightIndent="121.0" leftIndent="-1.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_header_Centre">Balance Sheet</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  <para style="terp_default_8">[[ get_data(data) or removeParentNode('para') ]]</para>
-
-      <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header" >
-      <tr>
-        <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By  [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
-    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-  <tr>
-     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
-        <tr>
-                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
-            </tr>
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
-        <tr>
-              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
-              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
-            </tr>
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-            </tr>
-           </blockTable>
-          </td>
-    <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-    <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
-  </tr>
-  </blockTable>
-      <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Assets</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Liabilities</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font>[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code1'] ]]<font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">
-          <font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['balance1'], currency_obj=company.currency_id) ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            [[ a['code'] ]]<font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white">[[ '. '*(a['level']-1) ]]</font>
-            <font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">
-            <font>[[ ( a['level']&lt;4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
-            <font>[[(a['code'] and a['name']) and formatLang(a['balance'], currency_obj=company.currency_id) or removeParentNode('font')]]</font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Balance:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Balance:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-  </story>
-</document>
-
diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py
index e9da0a1cd7b..c3b1f5e2e1a 100644
--- a/addons/account/report/account_financial_report.py
+++ b/addons/account/report/account_financial_report.py
@@ -64,29 +64,30 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
                 vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance
             lines.append(vals)
             account_ids = []
-            if report.type == 'accounts' and report.display_detail and report.account_ids:
+            if report.type == 'accounts' and report.account_ids:
                 account_ids = account_obj._get_children_and_consol(self.cr, self.uid, [x.id for x in report.account_ids])
             elif report.type == 'account_type' and report.account_type_ids:
                 account_ids = account_obj.search(self.cr, self.uid, [('user_type','in', [x.id for x in report.account_type_ids])])
             if account_ids:
                 for account in account_obj.browse(self.cr, self.uid, account_ids, context=data['form']['used_context']):
-                    if account.type != 'view':
-                        flag = False
-                        vals = {
-                            'name': account.code + ' ' + account.name,
-                            'balance':  account.balance != 0 and account.balance * account.user_type.sign or account.balance,
-                            'type': 'account',
-                            'level': 6,
-                            'account_type': account.type,
-                        }
-                        if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']):
+                    if report.display_detail == 'detail_flat' and account.type == 'view':
+                        continue
+                    flag = False
+                    vals = {
+                        'name': account.code + ' ' + account.name,
+                        'balance':  account.balance != 0 and account.balance * report.sign or account.balance,
+                        'type': 'account',
+                        'level': report.display_detail == 'detail_with_hierarchy' and min(account.level,6) or 6,
+                        'account_type': account.type,
+                    }
+                    if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']):
+                        flag = True
+                    if data['form']['enable_filter']:
+                        vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance
+                        if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance_cmp']):
                             flag = True
-                        if data['form']['enable_filter']:
-                            vals['balance_cmp'] = account_obj.browse(self.cr, self.uid, account.id, context=data['form']['comparison_context']).balance
-                            if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance_cmp']):
-                                flag = True
-                        if flag:
-                            lines.append(vals)
+                    if flag:
+                        lines.append(vals)
         return lines
 
 report_sxw.report_sxw('report.account.financial.report', 'account.financial.report',
diff --git a/addons/account/report/account_financial_report.rml b/addons/account/report/account_financial_report.rml
index 6a94f02c719..e3b5f3663f9 100644
--- a/addons/account/report/account_financial_report.rml
+++ b/addons/account/report/account_financial_report.rml
@@ -130,15 +130,13 @@
     <paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_name" fontName="Helvetica" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_3_balance_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_5_name" fontName="Helvetica" fontSize="8.0" leftIndent="40.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_5_balance" fontName="Helvetica-Oblique" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_6_name" fontName="Helvetica" fontSize="8.0" leftIndent="50.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_6_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_level_4_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
 
     <blockTableStyle id="Table1">
       <blockTopPadding start="0,0" stop="-1,0" length="15"/>
@@ -229,13 +227,13 @@
           <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
-      <tr style="Table1">
+      <tr style="Table3">
           [[ repeatIn(get_lines(data), 'a') ]]
           [[ (a.get('level') &lt;&gt; 0) or removeParentNode('tr') ]]
           [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) ]]
-          <td><para style="terp_level_1_name">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_name'}) ]] [[ a.get('name') ]]</para></td>
-          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</u></para></td>
-          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</para></td>
+          <td><para style="terp_level_3_name">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.get('level')))+'_name'}) ]][[ a.get('name') ]]</para></td>
+          <td>[[ (a.get('level') &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]]</para></td>
+          <td>[[ a.get('level') == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]]</u></para></td>
       </tr>
     </blockTable>
     <para style="Standard">
@@ -258,11 +256,11 @@
           [[ repeatIn(get_lines(data), 'a') ]]
           [[ (a.get('level') &lt;&gt; 0) or removeParentNode('tr') ]]
           [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) ]]
-          <td><para style="terp_level_1_name">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_name'}) ]] [[ a.get('name') ]]</para></td>
-          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</u></para></td>
-          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance'))]] [[company.currency_id.symbol]]</para></td>
-          <td>[[ a.get('level') == 4 or removeParentNode('td') ]]<para style="terp_level_1_balance"><u>[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'))]] [[company.currency_id.symbol]]</u></para></td>
-          <td>[[ a.get('level') &lt;&gt; 4 or removeParentNode('td') ]]<para style="terp_level_1_balance">[[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a['level']))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'))]] [[company.currency_id.symbol]]</para></td>
+          <td><para style="terp_level_3_name">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.get('level')))+'_name'}) ]][[ a.get('name') ]]</para></td>
+          <td>[[ (a.get('level') &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]]</para></td>
+          <td>[[ a.get('level') == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]]</u></para></td>
+          <td>[[ (a.get('level') &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.get('account_type') =='view' and a.get('level') &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'), currency_obj = company.currency_id) ]]</para></td>
+          <td>[[ a.get('level') == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.get('balance_cmp'), currency_obj = company.currency_id) ]]</u></para></td>
       </tr>
     </blockTable>
     <para style="Standard">
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
deleted file mode 100644
index 0918dcb2699..00000000000
--- a/addons/account/report/account_profit_horizontal.rml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Profit and Loss.pdf">
-  <template pageSize="(842.0,595.0)" title="Profit And Loss" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="57.0" width="772" height="481"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Heading">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Date_from_To">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_debit_credit">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,1" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Main_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Expense_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Income_Content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Net_Profit_Loss">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Final_Result">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-   <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Profit And Loss</para>
-        </td>
-      </tr>
-    </blockTable>
-        <para style="Standard">
-      <font color="white"> </font>
-    </para>
- 		<para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
-      <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header">
-      <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
-		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
-	</tr>
-	</blockTable>
-        <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Expenses</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Income</para>
-        </td>
-        <td>
-          <para style="P1">Balance</para>
-        </td>
-      </tr>
-        <tr>
-          <td>
-            <para style="terp_default_9">
-
-              <font>[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]][[ a['name'] ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance']), currency_obj=company.currency_id) ]]</font></para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              [[ a['code1'] ]]<font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(abs(a['balance1']), currency_obj=company.currency_id) or removeParentNode('font') ]]</font></para>
-          </td>
-        </tr>
-      </blockTable>
-    <blockTable colWidths="80.0,210.16,100.32,80.0,210.16,100.32" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9"></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance']), currency_obj=company.currency_id) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9"></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance']), currency_obj=company.currency_id) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-
-    <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr()), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr()), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-  </story>
-</document>
-
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
deleted file mode 100644
index 27182cdbd21..00000000000
--- a/addons/account/report/account_profit_loss.py
+++ /dev/null
@@ -1,198 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import pooler
-from report import report_sxw
-from common_report_header import common_report_header
-from tools.translate import _
-
-class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
-
-    def __init__(self, cr, uid, name, context=None):
-        super(report_pl_account_horizontal, self).__init__(cr, uid, name, context=context)
-        self.result_sum_dr = 0.0
-        self.result_sum_cr = 0.0
-        self.res_pl = {}
-        self.result = {}
-        self.result_temp = []
-        self.localcontext.update( {
-            'time': time,
-            'get_lines': self.get_lines,
-            'get_lines_another': self.get_lines_another,
-            'get_currency': self._get_currency,
-            'get_data': self.get_data,
-            'sum_dr': self.sum_dr,
-            'sum_cr': self.sum_cr,
-            'final_result': self.final_result,
-            'get_fiscalyear': self._get_fiscalyear,
-            'get_account': self._get_account,
-            'get_start_period': self.get_start_period,
-            'get_end_period': self.get_end_period,
-            'get_sortby': self._get_sortby,
-            'get_filter': self._get_filter,
-            'get_journal': self._get_journal,
-            'get_start_date':self._get_start_date,
-            'get_end_date':self._get_end_date,
-            'get_company':self._get_company,
-            'get_target_move': self._get_target_move,
-        })
-        self.context = context
-
-    def set_context(self, objects, data, ids, report_type=None):
-        new_ids = ids
-        if (data['model'] == 'ir.ui.menu'):
-            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
-            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-        return super(report_pl_account_horizontal, self).set_context(objects, data, new_ids, report_type=report_type)
-
-
-    def final_result(self):
-        return self.res_pl
-
-    def sum_dr(self):
-        if self.res_pl['type'] == _('Net Profit'):
-            self.result_sum_dr += self.res_pl['balance']
-        return self.result_sum_dr
-
-    def sum_cr(self):
-        if self.res_pl['type'] == _('Net Loss'):
-            self.result_sum_cr += self.res_pl['balance']
-        return self.result_sum_cr
-
-    def get_data(self, data):
-        cr, uid = self.cr, self.uid
-        db_pool = pooler.get_pool(self.cr.dbname)
-
-        account_pool = db_pool.get('account.account')
-        currency_pool = db_pool.get('res.currency')
-
-        types = [
-            'expense',
-            'income'
-                ]
-
-        ctx = self.context.copy()
-        ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
-
-        if data['form']['filter'] == 'filter_period':
-            ctx['period_from'] = data['form'].get('period_from', False)
-            ctx['period_to'] =  data['form'].get('period_to', False)
-        elif data['form']['filter'] == 'filter_date':
-            ctx['date_from'] = data['form'].get('date_from', False)
-            ctx['date_to'] =  data['form'].get('date_to', False)
-
-        cal_list = {}
-        account_id = data['form'].get('chart_account_id', False)
-        company_currency = account_pool.browse(self.cr, self.uid, account_id).company_id.currency_id
-        account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
-        accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
-
-        for typ in types:
-            accounts_temp = []
-            for account in accounts:
-                if (account.user_type.report_type) and (account.user_type.report_type == typ):
-                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
-                    if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_dr += account.debit - account.credit
-                    if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_cr += account.credit - account.debit
-                    if data['form']['display_account'] == 'movement':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
-                            accounts_temp.append(account)
-                    elif data['form']['display_account'] == 'not_zero':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
-                            accounts_temp.append(account)
-                    else:
-                        accounts_temp.append(account)
-            if currency_pool.is_zero(self.cr, self.uid, company_currency, (self.result_sum_dr-self.result_sum_cr)):
-                self.res_pl['type'] = None
-                self.res_pl['balance'] = 0.0
-            elif self.result_sum_dr > self.result_sum_cr:
-                self.res_pl['type'] = _('Net Loss')
-                self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr)
-            else:
-                self.res_pl['type'] = _('Net Profit')
-                self.res_pl['balance'] = (self.result_sum_cr - self.result_sum_dr)
-            self.result[typ] = accounts_temp
-            cal_list[typ] = self.result[typ]
-        if cal_list:
-            temp = {}
-            for i in range(0,max(len(cal_list['expense']),len(cal_list['income']))):
-                if i < len(cal_list['expense']) and i < len(cal_list['income']):
-                    temp={
-                          'code': cal_list['expense'][i].code,
-                          'name': cal_list['expense'][i].name,
-                          'level': cal_list['expense'][i].level,
-                          'balance': cal_list['expense'][i].balance != 0 and \
-                                    cal_list['expense'][i].balance * cal_list['expense'][i].user_type.sign or \
-                                    cal_list['expense'][i].balance,
-                          'code1': cal_list['income'][i].code,
-                          'name1': cal_list['income'][i].name,
-                          'level1': cal_list['income'][i].level,
-                          'balance1': cal_list['income'][i].balance != 0 and \
-                                        cal_list['income'][i].balance * cal_list['income'][i].user_type.sign or \
-                                        cal_list['income'][i].balance,
-                          }
-                    self.result_temp.append(temp)
-                else:
-                    if i < len(cal_list['income']):
-                        temp={
-                              'code': '',
-                              'name': '',
-                              'level': False,
-                              'balance':False,
-                              'code1': cal_list['income'][i].code,
-                              'name1': cal_list['income'][i].name,
-                              'level1': cal_list['income'][i].level,
-                              'balance1': cal_list['income'][i].balance != 0 and \
-                                            cal_list['income'][i].balance * cal_list['income'][i].user_type.sign \
-                                            or cal_list['income'][i].balance,
-                              }
-                        self.result_temp.append(temp)
-                    if  i < len(cal_list['expense']):
-                        temp={
-                              'code': cal_list['expense'][i].code,
-                              'name': cal_list['expense'][i].name,
-                              'level': cal_list['expense'][i].level,
-                              'balance': cal_list['expense'][i].balance != 0 and \
-                                            cal_list['expense'][i].balance * cal_list['expense'][i].user_type.sign \
-                                            or cal_list['expense'][i].balance,
-                              'code1': '',
-                              'name1': '',
-                              'level1': False,
-                              'balance1':False,
-                              }
-                        self.result_temp.append(temp)
-        return None
-
-    def get_lines(self):
-        return self.result_temp
-
-    def get_lines_another(self, group):
-        return self.result.get(group, [])
-
-report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
-    'addons/account/report/account_profit_horizontal.rml',parser=report_pl_account_horizontal, header='internal landscape')
-
-report_sxw.report_sxw('report.pl.account', 'account.account',
-    'addons/account/report/account_profit_loss.rml',parser=report_pl_account_horizontal, header='internal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
deleted file mode 100644
index 28fe167aef5..00000000000
--- a/addons/account/report/account_profit_loss.rml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Profit and Loss.pdf">
-  <template pageSize="(595.0,842.0)" title="Profit and Loss" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Heading">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Company_Name">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Date_from_To">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Account_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="MIDDLE"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Net_Profit_Loss">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Final_Result">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-   <blockTableStyle id="Table2_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <paraStyle name="terp_level_1_code" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_code" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_code" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_code_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name" fontName="Helvetica" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_3_balance_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_level_4_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-
-    <blockTableStyle id="Table1">
-      <blockTopPadding start="0,0" stop="-1,0" length="15"/>
-      <blockFont name="Helvetica-Bold" size="10.0" />
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,1" thickness="1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockTopPadding start="0,0" stop="-1,0" length="10"/>
-      <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#666666" start="1,1" stop="1,1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-
-
-</stylesheet>
-  <images/>
-  <story>
-    <blockTable colWidths="539.0" style="Table_Company_Name">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Profit And Loss</para>
-        </td>
-      </tr>
-    </blockTable>
-
-    <para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
-        <para style="Standard">
-      <font color="white"> </font>
-    </para>
-      <blockTable colWidths="125.0,100.0,140.0,80.0,90.0" style="Table2_header">
-      <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
-        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
-        <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
-      </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
-		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
-	</tr>
-	</blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">Expenses</para>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Account</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
-        </td>
-      </tr>
-      <tr style="Table3">
-          [[ repeatIn(get_lines_another('expense'),'a' ) ]]
-          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
-        <td><para style="terp_level_3_code">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
-        <td><para style="terp_level_3_name">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
-        <td>[[ (a.level &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</para></td>
-        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</u></para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9"></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(final_result()['balance'], currency_obj=company.currency_id) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-     <condPageBreak height="20cm"/>
-    <para style="terp_default_Right_9_Bold">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header">Incomes</para>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Code</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">Account</para>
-        </td>
-        <td>
-          <para style="P1">Balance</para>
-        </td>
-      </tr>
-      <tr style="Table3">
-          [[ repeatIn(get_lines_another('income'),'a' ) ]]
-          [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
-        <td><para style="terp_level_3_code">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
-        <td><para style="terp_level_3_name">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
-        <td>[[ (a.level &lt;&gt;2) or removeParentNode('td')  ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</para></td>
-        <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</u></para></td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="100.0,326.0,113.0" style="Table4">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9"></para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(final_result()['balance'], currency_obj=company.currency_id) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table4">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Total:</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Right_9_Bold">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index c928ff3c8fe..64498127dc5 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -2,14 +2,17 @@
 <openerp><data>
 
     <record id="group_account_invoice" model="res.groups">
-        <field name="name">Accounting / Invoicing &amp; Payments</field>
+        <field name="name">Invoicing &amp; Payments</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
     </record>
     <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Accounting / Accountant</field>
+        <field name="name">Accountant</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
     <record id="group_account_manager" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Accounting / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 40ba7ea7127..c2797f274e7 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -37,24 +37,15 @@
     data_dict = {'chart_account_id':ref('account.chart0')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
--
-  Print the Account Balance Sheet in Horizontal mode
--
-  !python {model: account.account}: |
-    ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
-    from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Account Balance Sheet in Normal mode
 -
   !python {model: account.account}: |
     ctx={}
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False, 'account_report_id': ref('account_financial_report_balancesheet0')}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Account Balance Report in Normal mode through the wizard - From Account Chart
 -
@@ -147,18 +138,9 @@
   !python {model: account.account}: |
     ctx={}
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False,'target_move': 'all'}
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False,'target_move': 'all', 'account_report_id': ref('account_financial_report_balancesheet0')}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
--
-  Print the Profit-Loss Report in Horizontal Mode
--
-  !python {model: account.account}: |
-    ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
-    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True,'target_move': 'all'}
-    from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
+    test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
  Print the Analytic Balance Report through the wizard
 -
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index d82eff62142..a78cf12050b 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -64,8 +64,6 @@ import account_report_account_balance
 
 import account_change_currency
 
-import account_report_balance_sheet
-import account_report_profit_loss
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index de9cae3a00c..92c623a9524 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -38,9 +38,19 @@ class accounting_report(osv.osv_memory):
         'date_to_cmp': fields.date("End Date"),
     }
 
+    def _get_account_report(self, cr, uid, context=None):
+        menu_obj = self.pool.get('ir.ui.menu')
+        report_obj = self.pool.get('account.financial.report')
+        report_ids = []
+        if context.get('active_id'):
+            menu = menu_obj.browse(cr, uid, context.get('active_id')).name
+            report_ids = report_obj.search(cr, uid, [('name','ilike',menu)])
+        return report_ids and report_ids[0] or False
+
     _defaults = {
             'filter_cmp': 'filter_no',
             'target_move': 'posted',
+            'account_report_id': _get_account_report,
     }
 
     def _build_comparison_context(self, cr, uid, ids, data, context=None):
diff --git a/addons/account/wizard/account_financial_report_view.xml b/addons/account/wizard/account_financial_report_view.xml
index 1472da4ba87..4be6fb5e95c 100644
--- a/addons/account/wizard/account_financial_report_view.xml
+++ b/addons/account/wizard/account_financial_report_view.xml
@@ -40,6 +40,24 @@
              <field name="target">new</field>
        </record>
 
+      <menuitem
+            parent="account.menu_finance_legal_statement"
+            id="final_accounting_reports"
+            name="Accounting Reports"/>
+
+      <menuitem icon="STOCK_PRINT"
+                name="Profit And Loss"
+                action="account.action_account_report"
+                id="menu_account_pl_report"
+                parent="final_accounting_reports"/>
+
+      <menuitem icon="STOCK_PRINT"
+            name="Balance Sheet"
+            action="account.action_account_report"
+            groups="group_account_user,group_account_manager"
+            id="menu_account_bs_report"
+            parent="final_accounting_reports"/>
+
        <menuitem icon="STOCK_PRINT"
             name="Financial Report"
             action="action_account_report"
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
deleted file mode 100644
index 01a89168a43..00000000000
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-
-class account_bs_report(osv.osv_memory):
-    """
-    This wizard will provide the account balance sheet report by periods, between any two dates.
-    """
-    _name = 'account.bs.report'
-    _inherit = "account.common.account.report"
-    _description = 'Account Balance Sheet Report'
-
-    def _get_def_reserve_account(self, cr, uid, context=None):
-        chart_id = self._get_account(cr, uid, context=context)
-        res = self.onchange_chart_id(cr, uid, [], chart_id, context=context)
-        if not res:
-            return False
-        return res['value']['reserve_account_id']
-
-    _columns = {
-        'display_type': fields.boolean("Landscape Mode"),
-        'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',
-                                      help='This account is used for transferring Profit/Loss (If It is Profit: Amount will be added, Loss : Amount will be deducted.), as calculated in Profit & Loss Report',
-                                      domain = [('type','=','other')]),
-        'journal_ids': fields.many2many('account.journal', 'account_bs_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
-    }
-
-    _defaults={
-        'display_type': False,
-        'journal_ids': [],
-        'reserve_account_id': _get_def_reserve_account,
-    }
-
-    def onchange_chart_id(self, cr, uid, ids, chart_id, context=None):
-        if not chart_id:
-            return {}
-        account = self.pool.get('account.account').browse(cr, uid, chart_id , context=context)
-        if not account.company_id.property_reserve_and_surplus_account:
-            return {'value': {'reserve_account_id': False}}
-        return {'value': {'reserve_account_id': account.company_id.property_reserve_and_surplus_account.id}}
-
-
-    def _print_report(self, cr, uid, ids, data, context=None):
-        if context is None:
-            context = {}
-        data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
-        if not data['form']['reserve_account_id']:
-            raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
-        data = self.pre_print_report(cr, uid, ids, data, context=context)
-        if data['form']['display_type']:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'account.balancesheet.horizontal',
-                'datas': data,
-            }
-        else:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'account.balancesheet',
-                'datas': data,
-            }
-
-account_bs_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
deleted file mode 100644
index faac52388a1..00000000000
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-     <data>
-
-        <record id="account_bs_report_view" model="ir.ui.view">
-            <field name="name">Account Balance Sheet</field>
-            <field name="model">account.bs.report</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.account_common_report_view" />
-            <field name="arch" type="xml">
-            <data>
-            <xpath expr="//field[@name='chart_account_id']" position="replace">
-                <field name="chart_account_id" widget="selection" on_change="onchange_chart_id(chart_account_id)"/>
-            </xpath>
-            <xpath expr="//field[@name='journal_ids']" position="replace">
-                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
-            </xpath>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Balance Sheet" colspan="4"/>
-                <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
-            </xpath>
-            <xpath expr="//field[@name='target_move']" position="after">
-                <field name="display_account"/>
-                <field name="reserve_account_id"/>
-                <field name="display_type"/>
-                <newline/>
-            </xpath>
-            </data>
-            </field>
-        </record>
-
-        <record id="action_account_bs_report" model="ir.actions.act_window">
-             <field name="name">Balance Sheet</field>
-             <field name="res_model">account.bs.report</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">form</field>
-             <field name="view_id" ref="account_bs_report_view"/>
-             <field name="target">new</field>
-       </record>
-
-       <menuitem icon="STOCK_PRINT"
-            name="Balance Sheet"
-            action="action_account_bs_report"
-            groups="group_account_user,group_account_manager"
-            id="menu_account_bs_report"
-            parent="final_accounting_reports"/>
-
-    </data>
-</openerp>
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
deleted file mode 100644
index f4c2897bfe0..00000000000
--- a/addons/account/wizard/account_report_profit_loss.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-
-class account_pl_report(osv.osv_memory):
-    """
-    This wizard will provide the account profit and loss report by periods, between any two dates.
-    """
-    _inherit = "account.common.account.report"
-    _name = "account.pl.report"
-    _description = "Account Profit And Loss Report"
-
-    _columns = {
-        'display_type': fields.boolean("Landscape Mode"),
-        'journal_ids': fields.many2many('account.journal', 'account_pl_report_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
-    }
-
-    _defaults = {
-        'display_type': False,
-        'journal_ids': [],
-    }
-
-    def _print_report(self, cr, uid, ids, data, context=None):
-        if context is None:
-            context = {}
-        data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
-        if data['form']['display_type']:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'pl.account.horizontal',
-                'datas': data,
-            }
-        else:
-            return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'pl.account',
-                'datas': data,
-            }
-
-account_pl_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
deleted file mode 100644
index 75b6766ff87..00000000000
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-     <data>
-
-        <record id="account_pl_report_view" model="ir.ui.view">
-            <field name="name">Profit and Loss</field>
-            <field name="model">account.pl.report</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.account_common_report_view" />
-            <field name="arch" type="xml">
-            <data>
-            <xpath expr="//field[@name='journal_ids']" position="replace">
-                <field name="journal_ids" required="0" colspan="4" nolabel="1" readonly="1"/>
-            </xpath>
-            <xpath expr="/form/label[@string='']" position="replace">
-                <separator string="Profit And Loss" colspan="4"/>
-                <label nolabel="1" colspan="4" string="The Profit and Loss report gives you an overview of your company profit and loss in a single document"/>
-            </xpath>
-            <xpath expr="//field[@name='fiscalyear_id']" position="after">
-                   <field name="display_account"/>
-                   <field name="display_type"/>
-            </xpath>
-            </data>
-            </field>
-        </record>
-
-         <record id="action_account_pl_report" model="ir.actions.act_window">
-             <field name="name">Account Profit And Loss</field>
-             <field name="res_model">account.pl.report</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">form</field>
-             <field name="view_id" ref="account_pl_report_view"/>
-             <field name="target">new</field>
-       </record>
-
-       <menuitem
-            parent="account.menu_finance_legal_statement"
-            id="final_accounting_reports"
-            name="Accounting Reports"/>
-
-        <menuitem icon="STOCK_PRINT"
-                name="Profit And Loss"
-                action="action_account_pl_report"
-                id="menu_account_pl_report"
-                parent="final_accounting_reports"/>
-
-    </data>
-</openerp>
diff --git a/addons/account_accountant/static/src/img/icon.png b/addons/account_accountant/static/src/img/icon.png
index 611053684cc..1e25fc1efaf 100644
Binary files a/addons/account_accountant/static/src/img/icon.png and b/addons/account_accountant/static/src/img/icon.png differ
diff --git a/addons/account_asset/static/src/img/icon.png b/addons/account_asset/static/src/img/icon.png
new file mode 100644
index 00000000000..c7ffdceadaa
Binary files /dev/null and b/addons/account_asset/static/src/img/icon.png differ
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index c2a842cfd4c..420ca92b289 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -68,7 +68,7 @@ class account_followup_stat(osv.osv):
         cr.execute("""
             create or replace view account_followup_stat as (
                 SELECT
-                    l.id as id,
+                    l.partner_id AS id,
                     l.partner_id AS partner_id,
                     min(l.date) AS date_move,
                     max(l.date) AS date_move_last,
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index ea1083f26ff..014fa2bb326 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -93,7 +93,7 @@ class account_followup_stat_by_partner(osv.osv):
         cr.execute("""
             create or replace view account_followup_stat_by_partner as (
                 SELECT
-                    l.partner_id * 10000 + l.company_id as id,
+                    l.partner_id AS id,
                     l.partner_id AS partner_id,
                     min(l.date) AS date_move,
                     max(l.date) AS date_move_last,
diff --git a/addons/account_payment/i18n/sr@latin.po b/addons/account_payment/i18n/sr@latin.po
index 6efe331146d..13925099baf 100644
--- a/addons/account_payment/i18n/sr@latin.po
+++ b/addons/account_payment/i18n/sr@latin.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 15:17+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-13 15:21+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-14 04:45+0000\n"
+"X-Generator: Launchpad (build 14487)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
-msgstr "Zakazani datum ako je fiskno"
+msgstr "Zakazani datum ako je fiksiran"
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -30,7 +30,7 @@ msgstr "Valuta partnera"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr "Postavi za obradu"
+msgstr "Postavi kao pripremu"
 
 #. module: account_payment
 #: help:payment.order,mode:0
@@ -41,7 +41,7 @@ msgstr "Odaberite način plaćanja koji će biti primenjen."
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr "Grupirano po"
+msgstr "Grupiši po..."
 
 #. module: account_payment
 #: model:ir.module.module,description:account_payment.module_meta_information
@@ -52,6 +52,11 @@ msgid ""
 "* a basic mechanism to easily plug various automated payment.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul omogućava:\n"
+"*efikasniji način za upravljanje isplaćivanja faktura\n"
+"*osnovni mehanizam za lako obrađivanje automatizovanih načina isplate\n"
+"    "
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -98,7 +103,7 @@ msgstr "Zeljeni Datum"
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr "slobodno"
+msgstr "Slobodno"
 
 #. module: account_payment
 #: field:payment.order.create,entries:0
@@ -108,18 +113,18 @@ msgstr "Stavke"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr "Koristeni Nalog"
+msgstr "Korišteni nalog"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
 #: field:payment.order.create,duedate:0
 msgid "Due Date"
-msgstr "Datum dospeća"
+msgstr "Krajnji rok"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Ne možete da napravite poteznu liniju na zatvorenim računima."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -135,7 +140,7 @@ msgstr "_Dodaj u nalog za plaćanje"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr "Ispuna sadrzaja fakture"
+msgstr "Ispunjavanje sadržaja fakture"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -146,12 +151,12 @@ msgstr "Iznos"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Pogrešna vrednost kredita ili debita u ulazu računa !"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr "Ukupno u valuti preduzeca"
+msgstr "Ukupno u valuti preduzeća"
 
 #. module: account_payment
 #: selection:payment.order,state:0
@@ -172,7 +177,7 @@ msgstr "Referenca"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Red plaćanja mora biti jedinstven!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -212,7 +217,7 @@ msgstr "Efektivni datum fakture"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr "Tip Izuzetka"
+msgstr "Tip Izvršavanja"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -229,7 +234,7 @@ msgstr "Stanje"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Transaction Information"
-msgstr "Informacije Transakcije"
+msgstr "Informacije o transakciji"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
@@ -257,8 +262,8 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
-"Odaberite opciju za nalog za plaćanje: \"Fiksno\" znači datum naveden od "
-"vaše strane. \"Direktno\" znači direktno izvršenje. \"Datum odgode\" znači "
+"Odaberite opciju za nalog za plaćanje: \"Fiksirano\" znači datum naveden s "
+"Vaše strane. \"Direktno\" znači direktno izvršenje. \"Datum odgode\" znači "
 "zakazan datum izvršenja."
 
 #. module: account_payment
@@ -280,12 +285,12 @@ msgstr "Datum izvršenja"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Dnevnik banke ili keša za način plaćanja"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr "Fiksni datum"
+msgstr "Fiksirani datum"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
@@ -301,18 +306,19 @@ msgstr "Ciljni račun"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr "Pretrazi naloge za placanje"
+msgstr "Pretraži naloge za plaćanje"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Ne možete napraviti poteznu liniju na primaćem/platežnom računu bez partnera"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr "Kreirano"
+msgstr "Napravljeno"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -327,17 +333,17 @@ msgstr "Ukupni iznos valute"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr "Napravite plaćanja"
+msgstr "Izvršite plaćanja"
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr "Tip Komunikacije"
+msgstr "Tip komunikacije"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
 msgid "Payment Management"
-msgstr "Menadzment Plaćanja"
+msgstr "Upravljanje plaćanjem"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
@@ -347,7 +353,7 @@ msgstr "Red Izvoda iz Banke"
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr "Krajnji Rok"
+msgstr "Krajnji rok"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
@@ -391,7 +397,7 @@ msgstr "Način plaćanja"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr "Datum"
+msgstr "Datum valute"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -412,23 +418,23 @@ msgstr "Priprema"
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr "Nasljedna poruka komunikacije."
+msgstr "Naredna poruka komunikacije."
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr "Partner nije definisan"
+msgstr "Partner nije definisan na redu stavke"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
-msgstr "Adresa kupca naručitelja."
+msgstr "Adresa naručitelja."
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr "Popuni sadrzaj:"
+msgstr "Popuni sadržaj:"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -438,7 +444,7 @@ msgstr "Ukupno potražuje"
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr "Odaberite datum ako ste odabrali fiksni željeni datum"
+msgstr "Odaberite datum ako ste odabrali fiksirani željeni datum"
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -454,12 +460,12 @@ msgstr "Redovi plaćanja"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr "Sadrzaj Dnevnika"
+msgstr "Stavke dnevnika"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Preduzeće mora biti isto za sve vezane račune i periode."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -492,12 +498,12 @@ msgstr "Ukupno:"
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation date"
-msgstr "Datum kreiranja"
+msgstr "Datum pravljenja"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr "Dodaj"
+msgstr "DODAJ"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -517,22 +523,22 @@ msgstr "Iznos u valuti preduzeca"
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr "Kupac naručitelj"
+msgstr "Naručitelj"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr "Izvrsi placanje naloga"
+msgstr "Izvrši plaćanje naloga"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr "Referenca fakture"
+msgstr "Ref. fakture"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr "Vaše veze"
+msgstr "Vaš poziv na broj"
 
 #. module: account_payment
 #: field:payment.order,mode:0
@@ -578,7 +584,7 @@ msgstr "Otkaži"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Information"
-msgstr "Informacija"
+msgstr "Informacije"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -588,6 +594,10 @@ msgid ""
 "that should be done, keep track of all payment orders and mention the "
 "invoice reference and the partner the payment should be done for."
 msgstr ""
+"Nalog za plaćanje je zahtev za plaćanje od strane Vašeg preduzeća za isplatu "
+"faktura nabavke ili kupaca. Ovde možete snimiti sve naloge za plaćanje na "
+"čekanju, pratite sve naloge za plaćanje i pomenete poziv na broj za datu "
+"fakturu i kom partneru treba izvršiti isplatu."
 
 #. module: account_payment
 #: help:payment.line,amount:0
@@ -612,12 +622,12 @@ msgstr "Komunikacija 2"
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr "Destinacioni bankovni račun"
+msgstr "Ciljni bankovni račun"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr "Jeste li sigurni da zelite da izvrsite isplatu?"
+msgstr "Jeste li sigurni da želite da izvršite isplatu?"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -639,7 +649,7 @@ msgstr "Potvrdi plaćanja"
 #: field:payment.line,company_currency:0
 #: report:payment.order:0
 msgid "Company Currency"
-msgstr "Valuta preduzeca"
+msgstr "Valuta preduzeća"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main_payment
@@ -651,7 +661,7 @@ msgstr "Isplata"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr "Isplata  Faktura / Placanje"
+msgstr "Isplata  Faktura / Plaćanje"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -664,13 +674,13 @@ msgid ""
 "Used as the message between ordering customer and current company. Depicts "
 "'What do you want to say to the recipient about this order ?'"
 msgstr ""
-"Koristi se kao poruka izmedju narucioca i date kompanije. Objasnjava ' Sta "
-"ste to hteli reci kupcu o ovoj narudzbi?'"
+"Koristi se kao poruka između naručioca i date kompanije. Prikazuje ' Šta "
+"želite reći kupcu o ovoj narudžbini?'"
 
 #. module: account_payment
 #: field:payment.mode,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -681,7 +691,7 @@ msgstr "Bankovni račun"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr "Unos Informacije"
+msgstr "Informacije o unosu"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
@@ -702,7 +712,7 @@ msgstr "Ukupno"
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr "Izvrsi placanje"
+msgstr "Izvrši placanje"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -713,7 +723,7 @@ msgstr "Partner"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr "Popuni Placanje"
+msgstr "Popuni plaćanje"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
@@ -723,7 +733,7 @@ msgstr "Bankovni račun za način plaćanja"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Ne možete napraviti poteznu liniju na računu po viđenju"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 535f76b8d64..2b63157ef30 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -91,10 +91,10 @@ class account_voucher(osv.osv):
         return False
 
     def _get_payment_rate_currency(self, cr, uid, context=None):
-        '''
+        """
         Return the default value for field payment_rate_currency_id: the currency of the journal
         if there is one, otherwise the currency of the user's company
-        '''
+        """
         if context is None: context = {}
         journal_pool = self.pool.get('account.journal')
         journal_id = context.get('journal_id', False)
@@ -141,20 +141,22 @@ class account_voucher(osv.osv):
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         mod_obj = self.pool.get('ir.model.data')
         if context is None: context = {}
-        if not view_id and context.get('invoice_type', False):
-            if context.get('invoice_type', False) in ('out_invoice', 'out_refund'):
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
-            else:
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
-            result = result and result[1] or False
-            view_id = result
-        if not view_id and view_type == 'form' and context.get('line_type', False):
-            if context.get('line_type', False) == 'customer':
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
-            else:
-                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
-            result = result and result[1] or False
-            view_id = result
+
+        if view_type == 'form':
+            if not view_id and context.get('invoice_type'):
+                if context.get('invoice_type') in ('out_invoice', 'out_refund'):
+                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
+                else:
+                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
+                result = result and result[1] or False
+                view_id = result
+            if not view_id and context.get('line_type'):
+                if context.get('line_type') == 'customer':
+                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
+                else:
+                    result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
+                result = result and result[1] or False
+                view_id = result
 
         res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         doc = etree.XML(res['arch'])
diff --git a/addons/account_voucher/static/src/img/icon.png b/addons/account_voucher/static/src/img/icon.png
index afad1331e2e..b66773a109e 100644
Binary files a/addons/account_voucher/static/src/img/icon.png and b/addons/account_voucher/static/src/img/icon.png differ
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 3432d3cf27b..d75c386e259 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -51,7 +51,7 @@
     name: "cash account in usd"
     code: "Xcash usd"
     type: 'liquidity'
-    user_type: "account.account_type_cash_moves"
+    user_type: "account.data_account_type_cash"
 
 -
   I create a bank journal with USD as currency
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index f31a7393a8e..ff8db125682 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -46,7 +46,7 @@
     name: "cash account in chf"
     code: "Xcash chf"
     type: 'liquidity'
-    user_type: "account.account_type_cash_moves"
+    user_type: "account.data_account_type_cash"
 
 -
   I create a bank journal with CHF as currency
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5cf9b42be0b..01095d2f265 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -205,6 +205,7 @@
                             <group col="2" colspan="1">
                                 <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
+                                    <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                     <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
@@ -356,6 +357,7 @@
                             <group col="2" colspan="1">
                                 <group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <separator string="Currency Options" colspan="4"/>
+                                    <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" groups='base.group_extended' colspan="3"/>
                                     <field name="payment_rate_currency_id" groups='base.group_extended' colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" groups='base.group_extended' colspan="4" invisible="1"/>
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 165bb92f6b9..3f8ec1036be 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -16,6 +16,7 @@
     </record>
     
     <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Useability / Analytic Accounting</field>
+        <field name="name">Analytic Accounting</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 </data></openerp>
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index e93cc3ea04d..5566719a56d 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -21,7 +21,7 @@
         <field name="parent_id" eval="0">
             <value search="[('type','=','view')]" model="account.account"/>
         </field>
-        <field name="user_type" ref="account.account_type_root"/>
+        <field name="user_type" ref="account.data_account_type_view"/>
     </record>
 
     <record model="account.account" id="auction_expense_view">
@@ -32,13 +32,13 @@
         <field name="parent_id" eval="0">
             <value search="[('type','=','view')]" model="account.account"/>
         </field>
-        <field name="user_type" ref="account.account_type_expense"/>
+        <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
 
     <record model="account.account" id="auction_income">
         <field name="name">Auction Adjudications</field>
         <field name="code">A7x*</field>
-        <field name="user_type" ref="account.account_type_income"/> 
+        <field name="user_type" ref="account.data_account_type_income"/> 
         <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_income_view"/>
@@ -47,7 +47,7 @@
     <record model="account.account" id="auction_expense">
         <field name="name">Auction Adjudication Expenses</field>
         <field name="code">A6x*</field>
-        <field name="user_type" ref="account.account_type_expense"/>
+        <field name="user_type" ref="account.data_account_type_expense"/>
         <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_expense_view"/>
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 3caf93a2430..087151cb6ea 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -2,11 +2,19 @@
 <openerp>
 <data noupdate="0">
 
+    <record model="ir.module.category" id="module_category_auction">
+        <field name="name">Auction</field>
+        <field name="parent_id" ref="base.module_category_specific_industry_applications"/>
+        <field name="sequence">26</field>
+    </record>
+
     <record id="group_auction_user" model="res.groups">
-        <field name="name">Auction / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_auction"/>
     </record>
     <record id="group_auction_manager" model="res.groups">
-        <field name="name">Auction / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_auction"/>
         <field name="implied_ids" eval="[(4, ref('group_auction_user'))]"/>
     </record>
 
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 0f78103a187..27d06dc4e22 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -45,7 +45,6 @@ Pay attention that this module converts the existing addresses into "addresses +
     'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
-        'security/base_contact_security.xml',
         'security/ir.model.access.csv',
         'base_contact_view.xml',
         'base_contact_installer_view.xml',
diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
deleted file mode 100644
index 56a995c76a8..00000000000
--- a/addons/base_contact/security/base_contact_security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    
-</data>
-</openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 3ee9c9e242f..ed3d86bf9b8 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index c893ed6aad7..a3725b5a070 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -14,9 +14,9 @@ access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,
 access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
 access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
-access_crm_lead.all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0
+access_crm_lead_all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
-access_crm_phonecall.all,crm.phonecall.all,model_crm_phonecall,base.group_user,1,0,0,0
+access_crm_phonecall_all,crm.phonecall.all,model_crm_phonecall,base.group_user,1,0,0,0
 access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0
 access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
 access_crm_case_stage,crm.case.stage,model_crm_case_stage,base.group_user,1,0,0,0
diff --git a/addons/crm/static/src/img/icon.png b/addons/crm/static/src/img/icon.png
new file mode 100644
index 00000000000..b577375d54b
Binary files /dev/null and b/addons/crm/static/src/img/icon.png differ
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 19f5615ee78..fdc85ba3d4d 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -39,7 +39,7 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'website': 'http://www.openerp.com',
     'depends': ['base', 'crm'],
     'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'crm_profiling_view.xml'],
+    'update_xml': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
     'test': [
         #'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 59137966da0..587ddbe0b52 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -159,30 +159,6 @@ class questionnaire(osv.osv):
     _name="crm_profiling.questionnaire"
     _description= "Questionnaire"
 
-    def build_form(self, cr, uid, data, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param data: Get Data
-            @param context: A standard dictionary for contextual values """
-        
-        query = """
-        select name, id
-        from crm_profiling_question
-        where id in ( select question from profile_questionnaire_quest_rel where questionnaire = %s)"""
-        res = cr.execute(query, (data['form']['questionnaire_name'],))
-        result = cr.fetchall()
-        quest_fields={}
-        quest_form='''<?xml version="1.0"?>
-            <form string="%s">''' % _('Questionnaire')
-        for name, oid in result:
-            quest_form = quest_form + '<field name="quest_form%d"/><newline/>' % (oid,)
-            quest_fields['quest_form%d' % (oid,)] = {'string': name, 'type': 'many2one', \
-                        'relation': 'crm_profiling.answer', 'domain': [('question_id','=',oid)] }
-        quest_form = quest_form + '''</form>'''
-        return quest_form, quest_fields
-
     _columns = {
         'name': fields.char("Questionnaire",size=128, required=True),
         'description':fields.text("Description", required=True),
@@ -210,25 +186,19 @@ class partner(osv.osv):
                                 "partner","answer","Answers"),
         }
 
-    def _questionnaire_compute(self, cr, uid, data, context=None):
+    def _questionnaire_compute(self, cr, uid, answers, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param data: Get Data
             @param context: A standard dictionary for contextual values """
-
-        temp = []
-        for x in data['form']:
-            if x.startswith("quest_form") and data['form'][x] != 0 :
-                temp.append(data['form'][x])
-
+        partner_id = context.get('active_id')
         query = "select answer from partner_question_rel where partner=%s"
-        cr.execute(query, (data['id'],))
+        cr.execute(query, (partner_id,))
         for x in cr.fetchall():
-            temp.append(x[0])
-
-        self.write(cr, uid, [data['id']], {'answers_ids':[[6, 0, temp]]}, context=context)
+            answers.append(x[0])
+        self.write(cr, uid, [partner_id], {'answers_ids': [[6, 0, answers]]}, context=context)
         return {}
 
 
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 258de2e4e2d..a54d3d4b0a9 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -2,13 +2,6 @@
 <openerp>
     <data>
 
-        <wizard
-            string="Using a questionnaire"
-            model="crm_profiling.questionnaire"
-            name="open_questionnaire"
-            menu="False"
-            id="wizard_open_questionnaire"/>
-
         <record model="ir.actions.act_window" id="open_questionnaires">
           <field name="name">Questionnaires</field>
           <field name="res_model">crm_profiling.questionnaire</field>
@@ -140,7 +133,7 @@
             <notebook position="inside">
                 <page string="Profiling">
                   <button string="Use a questionnaire"
-                      name="%(wizard_open_questionnaire)d" type="action" colspan="1"
+                      name="%(action_open_questionnaire)d" type="action" colspan="1"
                       icon="gtk-justify-fill" />
                   <newline/>
                   <field name="answers_ids" colspan="4" nolabel="1"/>
diff --git a/addons/crm_profiling/crm_profiling_wizard.xml b/addons/crm_profiling/crm_profiling_wizard.xml
deleted file mode 100644
index 39d436a6bd9..00000000000
--- a/addons/crm_profiling/crm_profiling_wizard.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-	</data>
-</openerp>
diff --git a/addons/crm_profiling/test/process/profiling.yml b/addons/crm_profiling/test/process/profiling.yml
index 91c48410f8d..99fe2da1733 100644
--- a/addons/crm_profiling/test/process/profiling.yml
+++ b/addons/crm_profiling/test/process/profiling.yml
@@ -1,10 +1,69 @@
+- |
+  I check segmentation which allows users to perform segmentation within partners.
 -
-  I check segmentation which allows users to perform segmentation within partners
-  and set the category according to question, so first compute questions(answers) 
-  scenario with parther and check that category set according to questions. 
+  I create a crm profiling question record.
+-
+  !record {model: crm_profiling.question, id: crm_profiling_question_openerppartner0}:
+    answers_ids:
+      - name: 'no'
+    name: OpenERP partner?
+-
+  I create a crm profiling answer record.
+-
+  !record {model: crm_profiling.answer, id: crm_profiling_answer_openerppartner0}:
+    name: 'yes'
+    question_id: crm_profiling_question_openerppartner0
+-
+  I create Partner category Customers.
+-
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+- |
+  I'm creating new partner "John" with his email "info@mycustomer.com".
+-
+  !record {model: res.partner, id: res_partner_john0}:
+    address:
+      - city: Bruxelles
+        country_id: base.be
+        street: Rue des Palais 51, bte 33
+        type: default
+        zip: '1000'
+        email: 'info@mycustomer.com'
+    name: John
+    category_id:
+      - res_partner_category_customers0
+
+-
+  Define the answers and category to partner.
 -
   !python {model: res.partner}: |
-    data ={'form': {'quest_form3': ref("partner_quality3"), 'quest_form2': ref("nb_employees2"),'quest_form1': ref("sector1"),'questionnaire_name': ref('questionnaire1')}, 'ids': [ref('base.res_partner_ericdubois0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('base.res_partner_ericdubois0')}
-    data = self._questionnaire_compute(cr, uid, data, context)
-    partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
-    assert partner.category_id[0].id == ref("base.res_partner_category_17"), "Category not assign properly" 
+    data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
+    context['active_id'] = ref('res_partner_john0')
+    self._questionnaire_compute(cr, uid, [ref('crm_profiling_answer_openerppartner0')], context)
+- |
+  I start by creating new Questionnaire.
+-
+  !record {model: crm_profiling.questionnaire, id: crm_profiling_questionnaire_basequestionnaire0}:
+    description: First questionnaire.
+    name: Base questionnaire
+    questions_ids:
+      - crm_profiling.activity_sector
+      - crm_profiling.nb_employees
+      - crm_profiling.partner_level
+-
+  I create a segmentation record.
+-
+  !record {model: crm.segmentation, id: crm_segmentation_test1}:
+    answer_yes:
+      - crm_profiling_answer_openerppartner0
+    categ_id: res_partner_category_customers0
+    name: test
+    parent_id: crm_profiling.crm_segmentation0
+    profiling_active: true
+    som_interval: 0.0
+- |
+  I continue the process of segmentation.
+-
+  !python {model: crm.segmentation}: |
+    self.process_continue(cr, uid, [ref('crm_segmentation_test1')], start=False)
+
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index 91b82a02d1a..b13c67640fc 100644
--- a/addons/crm_profiling/wizard/open_questionnaire.py
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -18,50 +18,72 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import pooler
-import wizard
-from tools import UpdateableStr, UpdateableDict
 
-_QUEST_FORM = UpdateableStr()
-_QUEST_FIELDS=UpdateableDict()
+from osv import osv, fields
+from tools.translate import _
 
-class open_questionnaire(wizard.interface):
-
-    def _questionnaire_compute(self, cr, uid, data, context):
-        pooler.get_pool(cr.dbname).get(data['model'])._questionnaire_compute(cr, uid, data, context)
-        return {}
-
-
-    def build_form(self, cr, uid, data, context):
-        quest_form, quest_fields = pooler.get_pool(cr.dbname).get('crm_profiling.questionnaire').build_form(cr, uid, data, context)
-        _QUEST_FORM. __init__(quest_form)
-        _QUEST_FIELDS.__init__(quest_fields)
-        return{}
-
-    _questionnaire_choice_arch = '''<?xml version="1.0"?>
-    <form string="Questionnaire">
-        <field name="questionnaire_name"/>
-    </form>'''
-
-    _questionnaire_choice_fields = {
-            'questionnaire_name': {'string': 'Questionnaire name', 'type': 'many2one', 'relation': 'crm_profiling.questionnaire', 'required': True },
+class open_questionnaire_line(osv.osv_memory):
+    _name = 'open.questionnaire.line'
+    _rec_name = 'question_id'
+    _columns = {
+        'question_id': fields.many2one('crm_profiling.question','Question', required=True),
+        'answer_id': fields.many2one('crm_profiling.answer', 'Answer'),
+        'wizard_id': fields.many2one('open.questionnaire', 'Questionnaire'),
     }
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _questionnaire_choice_arch, 'fields': _questionnaire_choice_fields, 'state':[('end', 'Cancel','gtk-cancel'), ('open', 'Open Questionnaire','terp-camera_test')]}
-        },
-        'open': {
-            'actions': [build_form],
-            'result': {'type': 'form', 'arch':_QUEST_FORM, 'fields': _QUEST_FIELDS, 'state':[('end', 'Cancel','gtk-cancel'), ('compute', 'Save Data','terp-stock_format-scientific')]}
-        },
-        'compute': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _questionnaire_compute, 'state':'end'}
+open_questionnaire_line()
+
+class open_questionnaire(osv.osv_memory):
+    _name = 'open.questionnaire'
+    _columns = {
+        'questionnaire_id': fields.many2one('crm_profiling.questionnaire', 'Questionnaire name'),
+        'question_ans_ids': fields.one2many('open.questionnaire.line', 'wizard_id', 'Question / Answers'),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None: context = {}
+        res = super(open_questionnaire, self).default_get(cr, uid, fields, context=context)
+        questionnaire_id = context.get('questionnaire_id', False)
+        if questionnaire_id and 'question_ans_ids' in fields:
+            query = """
+                select question as question_id from profile_questionnaire_quest_rel where questionnaire = %s"""
+            cr.execute(query, (questionnaire_id,))
+            result = cr.dictfetchall()
+            res.update(question_ans_ids=result)
+        return res
+
+    def questionnaire_compute(self, cr, uid, ids, context=None):
+        """ Adds selected answers in partner form """
+        model = context.get('active_model')
+        answers = []
+        if model == 'res.partner':
+            data = self.browse(cr, uid, ids[0], context=context)
+            for d in data.question_ans_ids:
+                 if d.answer_id:
+                     answers.append(d.answer_id.id)
+            self.pool.get(model)._questionnaire_compute(cr, uid, answers, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+
+    def build_form(self, cr, uid, ids, context=None):
+        """ Dynamically generates form according to selected questionnaire """
+        models_data = self.pool.get('ir.model.data')
+        result = models_data._get_id(cr, uid, 'crm_profiling', 'open_questionnaire_form')
+        res_id = models_data.browse(cr, uid, result, context=context).res_id
+        datas = self.browse(cr, uid, ids[0], context=context)
+        context.update({'questionnaire_id': datas.questionnaire_id.id})
+
+        return {
+            'name': _('Questionnaire'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'open.questionnaire',
+            'type': 'ir.actions.act_window',
+            'views': [(res_id,'form')],
+            'target': 'new',
+            'context': context
         }
-    }
 
-open_questionnaire('open_questionnaire')
+open_questionnaire()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
new file mode 100644
index 00000000000..88955f43af4
--- /dev/null
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="view_open_questionnaire_form" model="ir.ui.view">
+            <field name="name">Open Questionnaires</field>
+            <field name="model">open.questionnaire</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Questionnaires">
+                    <field name="questionnaire_id" required="1"/>
+                    <newline/>
+                    <separator string="" colspan="4"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2"/>
+                        <button special="cancel" icon="gtk-cancel" string="Cancel"/>
+                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_open_questionnaire">
+            <field name="name">Open Questionnaire</field>
+            <field name="res_model">open.questionnaire</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_open_questionnaire_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <record id="open_questionnaire_form" model="ir.ui.view">
+            <field name="name">open.questionnaire.form</field>
+            <field name="model">open.questionnaire</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <separator colspan="4" string="Questionnaire"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+                    <group col="2" colspan="2">
+                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_open_questionnaire_line_tree" model="ir.ui.view">
+            <field name="name">open.questionnaire.line.list</field>
+            <field name="model">open.questionnaire.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Questionnaire">
+                    <field name="question_id"/>
+                    <field name="answer_id" domain="[('question_id', '=', question_id)]"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_open_questionnaire_line_form" model="ir.ui.view">
+            <field name="name">open.questionnaire.line.form</field>
+            <field name="model">open.questionnaire.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Questionnaire">
+                    <field name="question_id"/>
+                    <field name="answer_id" domain="[('question_id', '=', question_id)]"/>
+                </form>
+            </field>
+        </record>
+
+        <!-- Questionnaire form view -->
+        <!--<act_window
+            context="{}"
+            id="act_open_questionnaire"
+            name="Using a Questionnaire"
+            res_model="open.questionnaire"
+            src_model="crm_profiling.questionnaire"
+            view_id="view_open_questionnaire_form"
+            target="new"
+            view_mode="form"/>-->
+
+    </data>
+</openerp>
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index bc0281e388c..74f3426fc50 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -3,7 +3,8 @@
 <data noupdate="0">
 
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 465e01cdda3..599edd02111 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -42,7 +42,6 @@ Note that:
     'depends': ['crm', 'base_contact', 'account', 'marketing', 'mail'],
     'init_xml': [],
     'update_xml': [
-        'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_registration_view.xml',
         'wizard/event_confirm_view.xml',
@@ -54,7 +53,11 @@ Note that:
         'res_partner_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'test': ['test/test_event.yml'],
+    'test': ['test/process/event_confirm2done.yml',
+             'test/process/event_draft2cancel.yml',
+             'test/process/partner_register2invoice.yml',
+             'test/ui/duplicate_event.yml',
+             'test/ui/demo_data.yml'],
     'installable': True,
     'active': False,
     'certificate': '0083059161581',
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 8e8764ca1a7..4f86f620e6f 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -61,6 +61,8 @@
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
 		<field name="product_id" ref="event_product_0"/>
 		<field name="unit_price">68.00</field>
+		<field name="mail_auto_registr">True</field>
+		<field name="mail_auto_confirm">True</field>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="register_max">500</field>
 		<field name="type" ref="event_type_1"/>
@@ -74,9 +76,9 @@
 		<field name="unit_price">24.00</field>
 		<field name="type" ref="event_type_1"/>
 		<field name="user_id" ref="base.user_root"/>
+		<field name="register_min">50</field>
 		<field name="register_max">350</field>
 	</record>
-    <function model="event.event" name="button_confirm" eval="[ref('event_1')]"/>
 	<record id="event_2" model="event.event">
 		<field name="name">Conference on ERP Buisness</field>
         <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
@@ -92,7 +94,7 @@
 		<field name="mail_confirm">Thanks for registration. The conference will begin at 2 PM and will be given by Mr. Pinckaers.</field>
 	</record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-    <function model="event.event" name="button_done" eval="[ref('event_2')]"/>
+    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
 
 <!-- Demo data for Event Registration-->
 	<record id="reg_1_1" model="event.registration">
@@ -126,5 +128,16 @@
 
 	 <function model="event.registration" name="check_confirm" eval="[ref('reg_0_1')]"/> 
 
+    <record id="reg_0_2" model="event.registration">
+        <field name="event_id" ref="event_2"/>
+        <field name="partner_id" ref="base.res_partner_c2c"/>
+        <field name="partner_invoice_id" ref="base.res_partner_c2c"/>
+        <field name="nb_register">5</field>
+        <field name="event_product">Ticket for Conference</field>
+        <field name="unit_price">20</field>
+    </record>
+    
+    <function model="event.registration" name="check_confirm" eval="[ref('reg_0_2')]"/>
+    
 	</data>
 </openerp>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
deleted file mode 100644
index c3c70c94d93..00000000000
--- a/addons/event/security/event_security.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
-    </record>
-
-    <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-  </data>
-</openerp>
-
diff --git a/addons/event/test/process/event_confirm2done.yml b/addons/event/test/process/event_confirm2done.yml
new file mode 100644
index 00000000000..4d5542896f7
--- /dev/null
+++ b/addons/event/test/process/event_confirm2done.yml
@@ -0,0 +1,22 @@
+-
+  I want to organize one conference event on "OpenERP Business", Customer subscribe/join 
+  into "Conference on OpenERP Business" with 6 tickets, first I confim this event. 
+-
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_0")])
+-
+  I Check that Event is "confirmed", and Its automatically sending mail to registered 
+  partner which joined to this event.
+-
+  !assert {model: event.event, id: event_0}:
+    - state == 'confirm', "Event should be confirmed."
+-
+  After completed event, I close this event.
+-
+  !python {model: event.event}: |
+    self.button_done(cr, uid, [ref("event_0")])
+-
+  Check that conference is in "close" state. 
+-
+  !assert {model: event.event, id: event_0}:
+    - state == 'done', "Event should be Closed."
diff --git a/addons/event/test/process/event_draft2cancel.yml b/addons/event/test/process/event_draft2cancel.yml
new file mode 100644
index 00000000000..48cb102f3e8
--- /dev/null
+++ b/addons/event/test/process/event_draft2cancel.yml
@@ -0,0 +1,22 @@
+-
+  I want to organize event and its need Minimum 50 Registrations to confirm/start 
+  this Event, but Only 10 registration confirm for this event, I confirm this event. 
+-
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_1")])
+-
+  Now I cheked for event and It should not be confirm because registrations for 
+  this event is below limit.
+-
+  !assert {model: event.event, id: event_1}:
+    - state == 'confirm', "Event should be confirm."
+-
+  So I cancel this Event
+-
+  !python {model: event.event}: |
+    self.button_cancel(cr, uid, [ref("event_1")])
+-
+  I check event should be cancel.
+-
+  !assert {model: event.event, id: event_1}:
+    - state == 'cancel', "Event should be cancel"
diff --git a/addons/event/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml
new file mode 100644
index 00000000000..f8748afee2f
--- /dev/null
+++ b/addons/event/test/process/partner_register2invoice.yml
@@ -0,0 +1,62 @@
+-
+  I want to organize one conference event, First I registered partner for event 
+  with 5 tickets.
+-
+  !python {model: partner.event.registration}: |
+    context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_ericdubois0")], 'active_id': ref("base.res_partner_ericdubois0")})
+    register = self.create(cr, uid, {'event_id': ref('event_1'),'nb_register': 5}, context=context)
+    self.open_registration(cr, uid, [register], context=context)
+-
+  Now I check for registration created base on partner.
+-
+  !python {model: event.registration}: |
+    ids = self.search(cr, uid, [('partner_id','=',ref("base.res_partner_ericdubois0")), ('event_id', '=', ref('event_1'))])
+    assert ids, "Registration should be create here."
+-
+  I confirm registration process.
+-
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("reg_1_1")])
+-
+  I Check that Registration is confirm.
+- 
+  !assert {model: event.registration, id: reg_1_1}: 
+     - state == 'open', "Registration should be open here."
+-
+  After confirmation of partner, I create invoice base on costing of event. 
+-
+  !python {model: event.registration}: |
+    self.action_invoice_create(cr, uid, [ref("reg_1_1")])
+-
+  Now I Check for Invoice is created and Registration should be closed after invoice generated.
+- 
+  !python {model: event.registration}: |
+    record = self.browse(cr, uid, [ref("reg_1_1")])[0]
+    assert record.invoice_id, "Invoice should be generated"
+    assert record.invoice_id.state == "draft", "Invoice state should be draft"
+    assert record.invoice_id.partner_id == record.partner_id, "Customer is not correspond with registration"
+    assert record.invoice_id.type == 'out_invoice', "Invoice type is not correct"
+    assert record.invoice_id.origin == record.event_product, "Invoice origin is not correct"
+    assert record.invoice_id.amount_total == record.price_subtotal, "Invoice amount is not correct"
+    assert record.state == "done", "Registration should be closed after invoice generated"
+-
+  Now I check for same partner registration for two diffrent event and I create group invoices for same partner. 
+-
+  !python {model: event.make.invoice}: |
+    context.update({'active_model': 'event.make.invoice', 'active_ids': [ref("reg_0_1"), ref("reg_0_2")], 'active_id': ref("reg_0_1")})
+    invoice = self.create(cr, uid, {'grouped': True}, context=context)
+    self.make_invoice(cr, uid, [invoice], context=context)
+-
+  Now I Check for group Invoice is created with total amount of both registration
+  and Registration should be closed after invoice generated.
+- 
+  !python {model: event.registration}: |
+    reg_data_1 = self.browse(cr, uid, [ref("reg_0_1")])[0]
+    reg_data_2 = self.browse(cr, uid, [ref("reg_0_2")])[0]
+    assert reg_data_1.invoice_id, "Invoice should be generated"
+    assert reg_data_1.invoice_id.state == "draft", "Invoice state should be draft"
+    assert reg_data_1.invoice_id.partner_id == reg_data_1.partner_id, "Customer is not correspond with registration"
+    assert reg_data_1.invoice_id.type == 'out_invoice', "Invoice type is not correct"
+    assert reg_data_1.invoice_id.origin == reg_data_1.event_product, "Invoice origin is not correct"
+    assert reg_data_1.invoice_id.amount_total == (reg_data_1.price_subtotal + reg_data_2.price_subtotal), "Invoice total amount is not correct"
+    assert reg_data_1.state == "done", "Registration should be closed after invoice generated"
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
deleted file mode 100644
index 5e35d79cab2..00000000000
--- a/addons/event/test/test_event.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-- |
-  In order to test the "Event Organisation" in Association system.  
-- |
-  I want to organize one conference event on "OpenERP Business".
-- |
-  I'm creating new product "Conference Ticket" to specify registration Cost of conference.
-- 
-  !record {model: product.product, id: product_product_ticketforconcert0}:
-    categ_id: product.cat1
-    list_price: 68.0
-    name: Conference Ticket  
-- |
-  I'm creating Event type "Conference".
--   
-  !record {model: event.type, id: event_type_conference0}:
-     name: Conferences
-- |
-  I'm creating one Event "Conference on OpenERP Business" which will last from 1st of this month to 10th of this month.
--
-  !record {model: event.event, id: event_event_conference0}:
-    date_begin: !eval time.strftime('%Y-%m-01')
-    date_end: !eval time.strftime('%Y-%m-10')
-    name: Conference on OpenERP Business.
-    product_id: 'product_product_ticketforconcert0'
-    type: 'event_type_conference0'
-    reply_to: 'info@customer.com'
-- |
-  Check that the new conference event is "Draft" or not.
-- 
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'draft', "Event should be in draft by default when first time created"
-- |
-  Need Minimum 10 Registrations to confirm/start this Conference Event and does not allowed more than 100 Registrations.
-- |
-  So I set Minimum and Maximum Registrations limit.
--   
-  !python {model: event.event}: |
-    self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 100, 'register_min': 10})
-- |
-  I'm doing to confirm that conference event.
--  
-  !python {model: event.event}: |
-    self.button_confirm(cr, uid, [ref("event_event_conference0")])
-- |
-  But this conference event need minimum 10 Confirmed Registrations. so Check that Event is not "confirmed". 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state != 'confirm', "Event should not confirmed if minimum registrations does not reached"
-- |
-  "Mark Johnson" want to subscribe/join into "Conference on OpenERP Business" with 10 tickets.
-- | 
-  I'm creating new partner "Mark Johnson" with his email "info@mycustomer.com".
-- 
-  !record {model: res.partner, id: res_partner_markjohnson0}:
-    address:
-      - city: Bruxelles
-        country_id: base.be
-        job_ids:
-          - contact_id: base_contact.res_partner_contact_jacot0
-            function: CTO
-            name: base.res_partner_maxtor
-            sequence_partner: 0.0
-            state: current
-        street: Rue des Palais 51, bte 33
-        type: default
-        zip: '1000'
-        email: 'info@mycustomer.com'
-    name: Mark Johnson
-    
-- |
-  I'm creating Registration for "Mark Johnson" on "Conference on OpenERP Business" with 10 tickets. 
-- 
-  !record {model: event.registration, id: event_registration_registrationjacot0}:
-    contact_id: base_contact.res_partner_contact_jacot0
-    event_id: event.event_event_conference0
-    partner_id: event.res_partner_markjohnson0
-    partner_invoice_id: event.res_partner_markjohnson0
-    event_product: Conference Ticket
-    unit_price: 68.0
-    nb_register: 10
-- |
-  I'm going to Open that Registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")])
-- |
-  Check that Registration is in "Open" state or not.
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}: 
-     - state == 'open', "Registration should be open here."
-
-- |
-  I'm again trying to confirm that conference event.
--  
-  !python {model: event.event}: |
-    self.button_confirm(cr, uid, [ref("event_event_conference0")])
-    
-- |
-  Now Minimum requirement of Registration is fulfil. so Check that Event is "confirmed" or not. 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'confirm', "Event should be confirmed here."
-  
-- |
-  I'm creating invoice of Registration of "Mark Johnson" on "Conference on OpenERP Business".
--
-  !python {model: event.registration}: |
-    self.action_invoice_create(cr, uid, [ref("event_registration_registrationjacot0")])
-
-- |
-  Check Invoice of Registration of "Mark Johnson" is created or not.     
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}:
-     - invoice_id != False, "Invoice should be generated"
-
-- |
-  Check Registration of "Mark Johnson" is closed or not after invoice generated.     
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}:
-     - state != 'done',  "Registration should be closed after invoice generated"
-  
-- |
-  Now "Mark Johnson" want to another registration on "Conference on OpenERP Business" with 120 tickets.
-- |
-  I'm creating new registration for "Mark Johnson" with 100 tickets.
-- 
-  !record {model: event.registration, id: event_registration_registrationzen0}:
-    event_id: event.event_event_conference0
-    partner_id: event.res_partner_markjohnson0
-    partner_invoice_id: event.res_partner_markjohnson0
-    event_product: Conference Ticket
-    unit_price: 68.0
-    nb_register: 100
-    
-- |
-  I'm going to open "Mark Johnson" registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
-
-- |
-  But conference event does not allow more than 100 Registrations. so Check that registration is not in "open" state. 
--   
-  !assert {model: event.registration, id: event_registration_registrationzen0}:
-     - state == 'draft', "Registration should be in draft by default."
-- |
-  Now I'm modifying number of tickets of "Mark Johnson"'s registration with 90 tickets. 
-- 
-  !python {model: event.registration}: |
-    self.write(cr, uid, [ref("event_registration_registrationzen0")], {'nb_register': 90})
-- |
-  I'm again try to open "Mark Johnson" registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
-
-- |
-  Check that registration "open" or not. 
--   
-  !assert {model: event.registration, id: event_registration_registrationzen0}:
-     - state == 'open', "Registration should be open here."
-- |
-  I'm closing "Conference on OpenERP Business" Conference event
-- 
-  !python {model: event.event}: |
-    self.button_done(cr, uid, [ref("event_event_conference0")])
-- |
-  Check that conference is in "close" state or not. 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'done', "Registration should be Closed here."
-  
diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml
new file mode 100644
index 00000000000..2f48cf1a90b
--- /dev/null
+++ b/addons/event/test/ui/demo_data.yml
@@ -0,0 +1,32 @@
+-
+  I create event registation record to call event onchange and partner onchange.
+-
+  !record {model: event.registration, id: reg_0_1}:
+    event_id: event_0
+    partner_id: base.res_partner_asus
+    name: 'Ticket for Concert'
+-
+  I create event record to call product onchange and team onchange.
+-
+  !record {model: event.event, id: event_2}:
+    product_id: event_product_2
+    section_id: crm.section_sales_department
+    name: 'Conference on ERP Buisness'
+-
+  I call onchange event from event registration wizard. 
+-
+  !python {model: partner.event.registration}: |
+    context.update({'active_id': ref("base.res_partner_ericdubois0")})
+    self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context)
+-
+  I confirm event from wizard.
+-
+  !python {model: event.confirm}: |
+    context.update({'event_ids': [ref("event_2")]})
+    id = self.create(cr, uid , {})
+    self.confirm(cr, uid, [id], context=context)
+-
+  I call close registration process.
+-
+  !python {model: event.registration}: |
+    self.button_reg_close(cr, uid, [ref("reg_0_2")])
diff --git a/addons/event/test/ui/duplicate_event.yml b/addons/event/test/ui/duplicate_event.yml
new file mode 100644
index 00000000000..c1287353c67
--- /dev/null
+++ b/addons/event/test/ui/duplicate_event.yml
@@ -0,0 +1,16 @@
+-
+  Copy of event.
+-
+  !python {model: event.event}: |
+    try:
+      self.copy(cr, uid, ref("event_2"))
+    except:
+      pass
+-
+  Copy of event registarion.
+-
+  !python {model: event.registration}: |
+    try:
+      self.copy(cr, uid, ref("reg_1_1"))
+    except:
+      pass
\ No newline at end of file
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index b8521e404e2..45d56ddc41c 100644
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -34,8 +34,8 @@ class partner_event_registration(osv.osv_memory):
         'event_id': fields.many2one('event.event', 'Event'),
         'event_type': fields.many2one('event.type', 'Type', readonly=True),
         'unit_price': fields.float('Registration Cost', digits_compute=dp.get_precision('Sale Price')),
-        'start_date': fields.datetime('Start date', required=True, help="Beginning Date of Event", readonly=True),
-        'end_date': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True),
+        'start_date': fields.datetime('Start date', help="Beginning Date of Event", readonly=True),
+        'end_date': fields.datetime('Closing date', help="Closing Date of Event", readonly=True),
         'nb_register': fields.integer('Number of Registration'),
     }
     _defaults = {
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 8e77830184b..e8d1edd3712 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,11 +3,13 @@
     <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / HR Officer</field>
+        <field name="name">HR Officer</field>
+        <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">Human Resources / HR Manager</field>
+        <field name="name">HR Manager</field>
+        <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
     </record>
     <record id="hr_dept_comp_rule" model="ir.rule">
diff --git a/addons/hr_evaluation/static/src/img/icon.png b/addons/hr_evaluation/static/src/img/icon.png
new file mode 100644
index 00000000000..8b5e3cbfcfc
Binary files /dev/null and b/addons/hr_evaluation/static/src/img/icon.png differ
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index e0a8a002a6a..4e91155442b 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -62,8 +62,9 @@ re-invoice your customer's expenses if your work by project.
     'demo_xml': [
         'hr_expense_demo.xml',
         ],
-    'test': ['test/test_hr_expense.yml',
-             'test/hr_expense_report.yml',
+    'test': [
+             'test/expense_demo.yml',
+             'test/expense_process.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 478b8120935..572da086e8d 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -87,6 +87,7 @@ class hr_expense_expense(osv.osv):
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
     _defaults = {
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': 'draft',
         'employee_id': _employee_get,
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 9660dbb2543..0e940c74cc0 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -8,18 +8,6 @@
             <field name="parent_id" ref="product.cat0"/>
             <field name="name">Expenses</field>
         </record>
-        
-        <record id="product_product_expense_car" model="product.product">
-            <field name="list_price">0.32</field>
-            <field name="standard_price">0.32</field>
-            <field name="uom_id" ref="product.product_uom_km"/>
-            <field name="uom_po_id" ref="product.product_uom_km"/>
-            <field name="type">consu</field>
-            <field name="name">Travel Expenses</field>
-            <field name="default_code">TRA</field>
-            <field name="categ_id" ref="hr_expense.cat_expense"/>
-            <field name="hr_expense_ok" eval="True" />
-        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 80c9cd66694..8912dfb09de 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -2,95 +2,88 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="product_product_expense_air" model="product.product">
-            <field name="list_price">1.0</field>
-            <field name="standard_price">1.0</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <record id="hr.employee4" model="hr.employee">
+            <field name="address_home_id" ref="base.res_partner_address_1"/>
+        </record>
+
+        <record id="car_travel" model="product.product">
+            <field name="list_price">0.32</field>
+            <field name="type">service</field>
+            <field name="name">Car Travel Expenses</field>
+            <field name="default_code">CarTRA</field>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
+            <field name="hr_expense_ok" eval="True" />
+        </record>
+
+        <record id="air_ticket" model="product.product">
+            <field name="list_price">700.0</field>
             <field name="type">service</field>
             <field name="name">Air Ticket</field>
             <field name="default_code">AT</field>
-            <field name="categ_id" ref="product.cat2"/>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
 
-        <record id="product_product_expense_hotel" model="product.product">
-            <field name="list_price">1.0</field>
-            <field name="standard_price">1.0</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <record id="hotel_rent" model="product.product">
+            <field name="list_price">400.0</field>
             <field name="type">service</field>
             <field name="name">Hotel Accommodation</field>
             <field name="default_code">HA0</field>
-            <field name="categ_id" ref="product.cat2"/>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
-
-        <record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="employee_id" ref="hr.employee1"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="name">May Expenses</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="date" eval="time.strftime('%Y-%m-03')"/>
-            <field name="state">draft</field>
+        <record id="expenses0" model="hr.expense.expense">
+            <field name="name">Expenses</field>
+            <field name="date" eval="time.strftime('%Y-08-25')"/>
+        </record>
+        <record id="expenses_line0" model="hr.expense.line">
+            <field name="name">Travel Expenses</field>
+            <field name="date_value" eval="time.strftime('%Y-08-10')"/>
+            <field name="analytic_account" ref="account.analytic_consultancy"/>
+            <field name="expense_id" ref="expenses0"/>
+            <field eval="200.0" name="unit_amount"/>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field eval="1.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
+        <record id="sep_expenses" model="hr.expense.expense">
+            <field name="employee_id" ref="hr.employee4"/>
+            <field name="name">September Expenses</field>
+            <field name="date" eval="time.strftime('%Y-09-28')"/>
+        </record>
+
+        <record id="travel_by_air_sep" model="hr.expense.line">
             <field name="name">Travel by Air</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+            <field name="date_value" eval="time.strftime('%Y-09-03')"/>
             <field name="analytic_account" ref="account.analytic_consultancy"/>
-            <field name="product_id" ref="product_product_expense_air"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
+            <field name="product_id" ref="air_ticket"/>
+            <field name="expense_id" ref="sep_expenses"/>
             <field eval="700.0" name="unit_amount"/>
             <field name="uom_id" ref="product.product_uom_unit"/>
             <field eval="1.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
-            <field name="name">Basic PC - Server for Seagate</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
-            <field name="analytic_account" ref="account.analytic_seagate_p2"/>
-            <field name="product_id" ref="product.product_product_pc4"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
-            <field eval="1200.0" name="unit_amount"/>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field eval="1.0" name="unit_quantity"/>
-        </record>
-
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_expense_expense_septemberexpenses1" model="hr.expense.expense">
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="employee_id" ref="hr.employee1"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="name">Travel Expenses</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="date" eval="time.strftime('%Y-%m-20')"/>
-            <field name="state">draft</field>
-        </record>
-
-        <record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
+        <record id="hotel_bill_sep" model="hr.expense.line">
             <field name="name">Hotel Expenses - Thymbra</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+            <field name="date_value" eval="time.strftime('%Y-09-20')"/>
             <field name="analytic_account" ref="account.analytic_thymbra"/>
-            <field name="product_id" ref="product_product_expense_hotel"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+            <field name="product_id" ref="hotel_rent"/>
+            <field name="expense_id" ref="sep_expenses"/>
             <field eval="400.0" name="unit_amount"/>
             <field name="uom_id" ref="product.product_uom_unit"/>
             <field eval="5.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_car_travel" model="hr.expense.line">
+        <record id="car_travel_sep" model="hr.expense.line">
                 <field name="name">Bruxelles - Paris</field>
-                <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+                <field name="date_value" eval="time.strftime('%Y-09-15')"/>
                 <field name="analytic_account" ref="account.analytic_thymbra"/>
-                <field name="product_id" ref="product_product_expense_car"/>
-                <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+                <field name="product_id" ref="car_travel"/>
+                <field name="expense_id" ref="sep_expenses"/>
                 <field eval="0.30" name="unit_amount"/>
                 <field name="uom_id" ref="product.product_uom_km"/>
                 <field eval="622.0" name="unit_quantity"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/static/src/img/icon.png b/addons/hr_expense/static/src/img/icon.png
new file mode 100644
index 00000000000..9724b4d9473
Binary files /dev/null and b/addons/hr_expense/static/src/img/icon.png differ
diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
new file mode 100644
index 00000000000..5b3cb0893d0
--- /dev/null
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -0,0 +1,11 @@
+-
+  !record {model: hr.expense.expense, id: sep_expenses}:
+    employee_id: hr.employee4
+    name : 'John Smith'
+-
+  !record {model: product.product, id: car_travel}:
+    hr_expense_ok: 'True'
+-
+  !record {model: hr.expense.line, id: expense_line}:
+    product_id: car_travel
+    name: 'Car Travel Expenses'
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
new file mode 100644
index 00000000000..5c8a9d53f7c
--- /dev/null
+++ b/addons/hr_expense/test/expense_process.yml
@@ -0,0 +1,60 @@
+-
+  In order to test the process of "Employee Expenses" by processing the expenses, I confirm Expense Bill of an employee for September month. 
+-
+  !workflow {model: hr.expense.expense, action: confirm, ref: sep_expenses}
+-
+  I check that state is 'Confirm'.
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Confirm state}:
+    - state == 'confirm'
+-
+  I approve the September expenses.
+-
+  !workflow {model: hr.expense.expense, action: validate, ref: sep_expenses}
+-
+  I check that state is 'Approved'
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Approved state}:
+    - state == 'accepted'
+-
+  I make Invoice for the expense.
+-
+  !python {model: hr.expense.expense}: |
+    self.invoice(cr, uid, [ref('sep_expenses')])
+-
+  I check invoice details.
+-
+  !python {model: hr.expense.expense}: |
+    sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
+    assert sep_expenses.state == 'invoiced', "Expense should be in 'Invoiced' state."
+    assert sep_expenses.invoice_id, "Expense should have link of Invoice."
+    assert sep_expenses.invoice_id.currency_id == sep_expenses.currency_id,"Invoice currency is not correspond with supplier invoice currency"
+    assert sep_expenses.invoice_id.origin == sep_expenses.name,"Invoice origin is not correspond with supplier invoice"
+    assert sep_expenses.invoice_id.type == 'in_invoice', "Invoice type is not supplier invoice"
+    assert sep_expenses.invoice_id.amount_total == sep_expenses.amount,"Invoice total amount is not correspond with supplier invoice total"
+    assert len(sep_expenses.invoice_id.invoice_line) == len(sep_expenses.line_ids),"Lines of Invoice and supplier invoice Line are not correspond"
+    #TODO: check invoice line details with Expenses lines
+-
+  I pay the expenses.
+-
+  !python {model: hr.expense.expense}: |
+    self.expense_paid(cr, uid, [ref('sep_expenses')])
+-
+  I check that state of expenses is 'Paid'.
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Paid state}:
+    - state == 'paid'
+-
+  I duplicate the expenses and cancel duplicated.
+-
+  !python {model: hr.expense.expense}: |
+    duplicate_id = self.copy(cr, uid, ref('sep_expenses'), context=context)
+    self.expense_canceled(cr, uid, [duplicate_id])
+-
+  I print a report of the expenses.
+- 
+  !python {model: hr.expense.expense}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.hr.expense').create(cr, uid, [ref('hr_expense.sep_expenses')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)
diff --git a/addons/hr_expense/test/hr_expense_report.yml b/addons/hr_expense/test/hr_expense_report.yml
deleted file mode 100644
index 4c81ceb5976..00000000000
--- a/addons/hr_expense/test/hr_expense_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a HR Expense, we will print a HR Expense
-- 
-  !python {model: hr.expense.expense}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.hr.expense').create(cr, uid, [ref('hr_expense.hr_expense_expense_septemberexpenses0'),ref('hr_expense.hr_expense_expense_septemberexpenses1')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml
deleted file mode 100644
index bd13529d645..00000000000
--- a/addons/hr_expense/test/test_hr_expense.yml
+++ /dev/null
@@ -1,121 +0,0 @@
--
-  In order to test hr_expenses for OpenERP, I create expenses for employee and manage employee's expenses.
--
-  I create an unit of measure category "Working Time".
--
-  !record {model: product.uom.categ, id: product_uom_categ_workingtime0}:
-    name: Working Time.
-
--
-  I create a new employee.
--
-  !record {model: hr.employee, id: hr.employee}:
-    address_home_id: base.res_partner_address_1
-    address_id: base.main_address
--
-  I assign home address to employee.
--
-  !record {model: hr.employee, id: hr.employee1}:
-    address_home_id: base.res_partner_address_1
-    address_id: base.main_address
--
-  I create product unit of measure "Hour".
--
-  !record {model: product.uom, id: product_uom_hour0}:
-    category_id: 'product_uom_categ_workingtime0'
-    factor: 8.0
-    name: Hour
-    rounding: 0.01
--
-   I Create a product "travel".
--
-  !record {model: product.product, id: product_product_travel0}:
-    categ_id: product.product_category_services
-    cost_method: standard
-    list_price: 800.0
-    mes_type: fixed
-    name: Travel
-    procure_method: make_to_stock
-    standard_price: 700.0
-    supply_method: buy
-    type: product
-    uom_id: 'product_uom_hour0'
-    uom_po_id: 'product_uom_hour0'
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  I mark this product for expenses.
--
-  !python {model: product.product}: |
-    self.on_change_hr_expense_ok(cr, uid, [ref('product_product_travel0')], True)
--
-  I create an expense.
--
-  !record {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    company_id: base.main_company
-    date: !eval "'%s-05-05' %(datetime.now().year)"
-    name: September Expenses
-    line_ids:
-      - date_value: !eval "'%s-05-27' %(datetime.now().year)"
-        name: Travel
-        product_id: 'product_product_travel0'
-        sequence: 0.0
-        uom_id: product.product_uom_unit
-        unit_amount: 700.0
-    user_id: base.user_root
--
-  I check that expense is in "Draft" state.
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'draft'
--
-  I change the employee on expense form.
--
-  !python {model: hr.expense.expense}: |
-    res = self.onchange_employee_id(cr, uid, [ref('hr_expense_expense_september0')], ref('hr.employee1'), None)
-    values = dict([('employee_id', ref('hr.employee1'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_expense_expense_september0')], values, None)
--
-  Now I change the related product on expense line.
--
-  !python {model: hr.expense.expense}: |
-    exp_line_obj = self.pool.get('hr.expense.line')
-    exp_obj = self.browse(cr, uid, ref('hr_expense_expense_september0'), None)
-    line_ids = [line.id for line in exp_obj.line_ids]
-    res = exp_line_obj.onchange_product_id(cr, uid, line_ids, ref('product_product_expense_air'), False, ref('hr.employee1'), None)
-    values = dict([('product_id', ref('product_product_expense_air'))] + res['value'].items())
-    exp_line_obj.write(cr, uid, line_ids, values, None)
--
-  I confirm this expenses by click on "Confirm" button.
--
-  !workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_september0}
-
--
-  I check that state is "Waiting Confirmation".
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'confirm'
--
-  I accept this expense by click on "Accept" button.
--
-  !workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_september0}
-
--
-  I invoiced this expense by click on "Invoice" button.
--
-  !python {model: hr.expense.expense}: |
-    self.invoice(cr, uid, [ref('hr_expense_expense_september0')], None)
--
-  I check that state is "Invoiced".
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'invoiced'
--
-  I check that Invoice is created for the expense.
--
-  !python {model: hr.expense.expense}: |
-    exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0]
-    assert exp.invoice_id, "Invoice should be created"
-
diff --git a/addons/hr_holidays/static/src/img/icon.png b/addons/hr_holidays/static/src/img/icon.png
new file mode 100644
index 00000000000..d68f245b188
Binary files /dev/null and b/addons/hr_holidays/static/src/img/icon.png differ
diff --git a/addons/hr_payroll/static/src/img/icon.png b/addons/hr_payroll/static/src/img/icon.png
new file mode 100644
index 00000000000..33279078b37
Binary files /dev/null and b/addons/hr_payroll/static/src/img/icon.png differ
diff --git a/addons/hr_payroll_account/hr_payroll_account_demo.xml b/addons/hr_payroll_account/hr_payroll_account_demo.xml
index 6372dabc723..ed6371a6f4d 100644
--- a/addons/hr_payroll_account/hr_payroll_account_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_demo.xml
@@ -81,7 +81,7 @@
             <field name="name">Bank Current Account</field>
             <field ref="account.cas" name="parent_id"/>
             <field name="type">liquidity</field>
-            <field name="user_type" ref="account.account_type_asset"/>
+            <field name="user_type" ref="account.data_account_type_asset"/>
         </record>
 
         <record id="a_salary_expense" model="account.account">
@@ -89,7 +89,7 @@
             <field name="name">Salary Expenses</field>
             <field ref="account.ovr" name="parent_id"/>
             <field name="type">other</field>
-            <field name="user_type" ref="account.account_type_expense"/>
+            <field name="user_type" ref="account.data_account_type_expense"/>
         </record>
 
         <record id="a_creditors" model="account.account">
@@ -98,7 +98,7 @@
             <field ref="account.cli" name="parent_id"/>
             <field name="type">payable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.account_type_payable"/>
+            <field name="user_type" ref="account.data_account_type_payable"/>
         </record>
 
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 2854ddf95a5..c07ec8188b8 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -184,10 +184,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
     }
 
-    def _get_stage(self, cr, uid, context=None):
-        ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [], context=context)
-        return ids and ids[0] or False
-
     _defaults = {
         'active': lambda *a: 1,
         'user_id':  lambda self, cr, uid, context: uid,
diff --git a/addons/hr_recruitment/static/src/img/icon.png b/addons/hr_recruitment/static/src/img/icon.png
new file mode 100644
index 00000000000..288d35e3149
Binary files /dev/null and b/addons/hr_recruitment/static/src/img/icon.png differ
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 43575137a6e..c1ef5022209 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -19,27 +19,49 @@
     assert applicant.name == "Application for the post of Jr.application Programmer.", "Subject does not match"
     assert applicant.state == "draft"
     assert len(resume_ids), "Resume does not attached."
+-
+  I refuse applicant for the Recruitment.
+-
+  !python {model: hr.applicant}: |
+    self.case_close(cr, uid, [ref("hr_case_programmer")])
+-
+  I open applicant for the Recruitment. 
+-
+  !python {model: hr.applicant}: |
+    self.case_reset(cr, uid, [ref("hr_case_programmer")])
+    self.case_open(cr, uid, [ref("hr_case_programmer")])
 -
   I assign the Job position to the applicant
 -
   !python {model: hr.applicant}: |
     self.write(cr, uid, [ref('hr_case_programmer')], {'job_id':ref('hr.job_jr_appli')})
--
-  I open applicant for the Recruitment
--
-
-  !python {model: hr.applicant}: |
-    self.case_open(cr, uid, [ref("hr_case_programmer")])
 -
   I start communication with applicant, first schedule phonecall.
 -
   !python {model: hr.recruitment.job2phonecall}: |
-     self.make_phonecall(cr, uid, [ref('hr_case_programmer')])
+     context.update({'active_model': 'hr.applicant', 'active_id': ref("hr_case_programmer"), 'active_ids': [ref("hr_case_programmer")], 'survey_id': ref("survey_job_0")})
+     id = self.create(cr, uid, {}, context=context)
+     self.make_phonecall(cr, uid, [id], context=context)
 -
   I schedule meeting with applicant for interview.
 -
   !python {model: hr.applicant}: |
      self.action_makeMeeting(cr, uid, [ref('hr_case_programmer')])
+-
+  I check Initial Qualification of applicant.
+-
+  !python {model: hr.applicant}: |
+     self.stage_next(cr, uid, [ref('hr_case_programmer')])
+-
+  I schedule First Interview of applicant.
+-
+  !python {model: hr.applicant}: |
+     self.stage_next(cr, uid, [ref('hr_case_programmer')])
+-
+  On a successful First Interview of applicant, I schedule Second Interview.
+-
+  !python {model: hr.applicant}: |
+     self.stage_next(cr, uid, [ref('hr_case_programmer')])
 -
   Applicant fillup the answer of the interview quetion.
 -
@@ -56,7 +78,13 @@
   !python {model: hr.applicant}: |
     self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
 -
-  On a successful interview with the applicant, I hired employee.
+  On a successful Second Interview of applicant Contract is Proposed to applicant.
+-
+  !python {model: hr.applicant}: |
+     self.stage_next(cr, uid, [ref('hr_case_programmer')])
+     self.stage_previous(cr, uid, [ref('hr_case_programmer')])
+-
+  I Hired Applicant.
 -
   !python {model: hr.applicant}: |
      self.case_close_with_emp(cr, uid, [ref('hr_case_programmer')])
@@ -65,3 +93,28 @@
 -
   !assert {model: hr.applicant, id: hr_case_programmer}:
     - state == 'done'
+-
+  I do not give employment to the hired the applicant.
+-
+  !python {model: hired.employee}: |
+    context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
+    emp_id = self.create(cr, uid, {}, context=context)
+    self.case_close(cr, uid, [emp_id], context=context)
+-
+  Now I give employment to hired applicant .
+-
+  !python {model: hr.applicant}: |
+     hired_emp_obj = self.pool.get('hired.employee')
+     self.case_reset(cr, uid, [ref("hr_case_programmer")])
+     self.case_open(cr, uid, [ref("hr_case_programmer")])
+     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
+     emp_hr_id = hired_emp_obj.create(cr, uid, {}, context=context)
+     hired_emp_obj.case_close_with_emp(cr, uid, [emp_hr_id], context=context)
+-
+  Now hired employee want to be a partner of company.
+-
+  !record {model: hr.recruitment.partner.create, id: hr_recruitment_partner_id1 }:
+-
+  !python {model: hr.recruitment.partner.create}: |
+    context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
+    self.make_order(cr, uid, [ref("hr_recruitment_partner_id1")], context=context)
diff --git a/addons/hr_timesheet_sheet/static/src/img/icon.png b/addons/hr_timesheet_sheet/static/src/img/icon.png
new file mode 100644
index 00000000000..a87ec718557
Binary files /dev/null and b/addons/hr_timesheet_sheet/static/src/img/icon.png differ
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 344cbc64292..02a3cbdbdd8 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -3,10 +3,12 @@
 <data>
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
     </record>
 
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index b4c7bb99c1b..560fdce0506 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="0">
-            <record id="base.group_sale_manager" model="res.groups">
-                <field name="name">Sales / Manager</field>
-            </record>
 
-            <record id="base.group_document_user" model="res.groups">
-                <field name="name">Knowledge / User</field>
-            </record>
+    <record id="base.group_document_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/knowledge/static/src/img/icon.png b/addons/knowledge/static/src/img/icon.png
new file mode 100644
index 00000000000..cc38e1c0348
Binary files /dev/null and b/addons/knowledge/static/src/img/icon.png differ
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 4cc109f814a..cd96d4ee9dc 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "author" : "conexus.at",
     "website" : "http://www.conexus.at",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": "This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at. Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.",
     "demo_xml" : [],
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index e4bdeccbd75..c8f44493597 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {   'name': 'Belgium - Accounting',
     'version': '1.1',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Belgium in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 8b0c34f6b78..909d4f53600 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -20,7 +20,7 @@
 
 {
     'name': 'Brazilian - Accounting',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 Base module for the Brazilian localization
 ==========================================
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 430bc31c7c3..800ca7937eb 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -23,7 +23,7 @@
     "version" : "1.0",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the English and French - Canadian accounting chart in OpenERP.
 ===========================================================================================
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 4e1988e6c75..b2363ca051b 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -63,7 +63,7 @@ TODO :
 """,
     "version" : "6.1",
     "author" : "Camptocamp",
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     "website": "http://www.camptocamp.com",
 
     "depends" : [
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 1057eae7807..24823f96eb7 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name" : "中国会计科目表 - Accounting",
     "version" : "1.0",
-    "category": "Localization",
+    "category": "Localization/Account Charts",
     "author" : "openerp-china.org",
     "maintainer":"openerp-china.org",
     "website":"http://openerp-china.org",
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index 6eb78017547..6052115df3b 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -38,7 +38,7 @@
     'url': 'http://launchpad.net/openerp-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of accounts for Costa Rica.
 =================================
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 45bcc7dd210..232a1abb3ad 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -125,7 +125,7 @@
     "version" : "1.0",
     "author" : "openbig.org",
     "website" : "http://www.openbig.org",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
diff --git a/addons/l10n_de/account_chart_skr03.xml b/addons/l10n_de/account_chart_skr03.xml
index 7a7e1fb8ee0..74af8bb976d 100644
--- a/addons/l10n_de/account_chart_skr03.xml
+++ b/addons/l10n_de/account_chart_skr03.xml
@@ -964,7 +964,7 @@
 			<field name="code">8339</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_3724">
@@ -972,7 +972,7 @@
 			<field name="code">3724</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4300">
@@ -980,7 +980,7 @@
 			<field name="code">4300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0280">
@@ -988,7 +988,7 @@
 			<field name="code">0280</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_8300">
@@ -996,7 +996,7 @@
 			<field name="code">8300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4370">
@@ -1004,7 +1004,7 @@
 			<field name="code">4370</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_4520">
@@ -1012,7 +1012,7 @@
 			<field name="code">4520</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_3710">
@@ -1020,7 +1020,7 @@
 			<field name="code">3710</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4149">
@@ -1028,7 +1028,7 @@
 			<field name="code">4149</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0939">
@@ -1036,7 +1036,7 @@
 			<field name="code">0939</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_3551">
@@ -1044,7 +1044,7 @@
 			<field name="code">3551</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3550">
@@ -1052,7 +1052,7 @@
 			<field name="code">3550</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4145">
@@ -1060,7 +1060,7 @@
 			<field name="code">4145</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1940">
@@ -1068,7 +1068,7 @@
 			<field name="code">1940</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_0930">
@@ -1076,7 +1076,7 @@
 			<field name="code">0930</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_0931">
@@ -1084,7 +1084,7 @@
 			<field name="code">0931</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_0932">
@@ -1092,7 +1092,7 @@
 			<field name="code">0932</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_3558">
@@ -1100,7 +1100,7 @@
 			<field name="code">3558</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2171">
@@ -1108,7 +1108,7 @@
 			<field name="code">2171</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_3850">
@@ -1116,7 +1116,7 @@
 			<field name="code">3850</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8905">
@@ -1124,7 +1124,7 @@
 			<field name="code">8905</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8800">
@@ -1132,7 +1132,7 @@
 			<field name="code">8800</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8906">
@@ -1140,7 +1140,7 @@
 			<field name="code">8906</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_4306">
@@ -1148,7 +1148,7 @@
 			<field name="code">4306</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_8900">
@@ -1156,7 +1156,7 @@
 			<field name="code">8900</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8726">
@@ -1164,7 +1164,7 @@
 			<field name="code">8726</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4969">
@@ -1172,7 +1172,7 @@
 			<field name="code">4969</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4175">
@@ -1180,7 +1180,7 @@
 			<field name="code">4175</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1793">
@@ -1188,7 +1188,7 @@
 			<field name="code">1793</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1792">
@@ -1196,7 +1196,7 @@
 			<field name="code">1792</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1791">
@@ -1204,7 +1204,7 @@
 			<field name="code">1791</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1790">
@@ -1212,7 +1212,7 @@
 			<field name="code">1790</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1795">
@@ -1220,7 +1220,7 @@
 			<field name="code">1795</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_1490">
@@ -1228,7 +1228,7 @@
 			<field name="code">1490</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1491">
@@ -1236,7 +1236,7 @@
 			<field name="code">1491</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_7095">
@@ -1244,7 +1244,7 @@
 			<field name="code">7095</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1467"/>
 		</record>
 		<record model="account.account.template" id="account_1495">
@@ -1252,7 +1252,7 @@
 			<field name="code">1495</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_1498">
@@ -1260,7 +1260,7 @@
 			<field name="code">1498</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1499">
@@ -1268,7 +1268,7 @@
 			<field name="code">1499</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_0998">
@@ -1276,7 +1276,7 @@
 			<field name="code">0998</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1700">
@@ -1284,7 +1284,7 @@
 			<field name="code">1700</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0720">
@@ -1292,7 +1292,7 @@
 			<field name="code">0720</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2520"/>
 		</record>
 		<record model="account.account.template" id="account_1702">
@@ -1300,7 +1300,7 @@
 			<field name="code">1702</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 		<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1703">
@@ -1308,7 +1308,7 @@
 			<field name="code">1703</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0725">
@@ -1316,7 +1316,7 @@
 			<field name="code">0725</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2520"/>
 		</record>
 		<record model="account.account.template" id="account_1705">
@@ -1324,7 +1324,7 @@
 			<field name="code">1705</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1706">
@@ -1332,7 +1332,7 @@
 			<field name="code">1706</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1707">
@@ -1340,7 +1340,7 @@
 			<field name="code">1707</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1708">
@@ -1348,7 +1348,7 @@
 			<field name="code">1708</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1709">
@@ -1356,7 +1356,7 @@
 			<field name="code">1709</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0680">
@@ -1364,7 +1364,7 @@
 			<field name="code">0680</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_2315">
@@ -1372,7 +1372,7 @@
 			<field name="code">2315</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2312">
@@ -1380,7 +1380,7 @@
 			<field name="code">2312</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2313">
@@ -1388,7 +1388,7 @@
 			<field name="code">2313</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2310">
@@ -1396,7 +1396,7 @@
 			<field name="code">2310</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2311">
@@ -1404,7 +1404,7 @@
 			<field name="code">2311</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_4831">
@@ -1412,7 +1412,7 @@
 			<field name="code">4831</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4830">
@@ -1420,7 +1420,7 @@
 			<field name="code">4830</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4960">
@@ -1428,7 +1428,7 @@
 			<field name="code">4960</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1661">
@@ -1436,7 +1436,7 @@
 			<field name="code">1661</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2505"/>
 		</record>
 		<record model="account.account.template" id="account_1660">
@@ -1444,7 +1444,7 @@
 			<field name="code">1660</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2505"/>
 		</record>
 		<record model="account.account.template" id="account_0112">
@@ -1452,7 +1452,7 @@
 			<field name="code">0112</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0113">
@@ -1460,7 +1460,7 @@
 			<field name="code">0113</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0059">
@@ -1468,7 +1468,7 @@
 			<field name="code">0059</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0111">
@@ -1476,7 +1476,7 @@
 			<field name="code">0111</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0115">
@@ -1484,7 +1484,7 @@
 			<field name="code">0115</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1120">
@@ -1492,7 +1492,7 @@
 			<field name="code">1120</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4320">
@@ -1500,7 +1500,7 @@
 			<field name="code">4320</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_8600">
@@ -1508,7 +1508,7 @@
 			<field name="code">8600</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0050">
@@ -1516,7 +1516,7 @@
 			<field name="code">0050</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8605">
@@ -1524,7 +1524,7 @@
 			<field name="code">8605</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_3140">
@@ -1532,7 +1532,7 @@
 			<field name="code">3140</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4654">
@@ -1540,7 +1540,7 @@
 			<field name="code">4654</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4964">
@@ -1548,7 +1548,7 @@
 			<field name="code">4964</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4651">
@@ -1556,7 +1556,7 @@
 			<field name="code">4651</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3145">
@@ -1564,7 +1564,7 @@
 			<field name="code">3145</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4653">
@@ -1572,7 +1572,7 @@
 			<field name="code">4653</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4652">
@@ -1580,7 +1580,7 @@
 			<field name="code">4652</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4137">
@@ -1588,7 +1588,7 @@
 			<field name="code">4137</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4550">
@@ -1596,7 +1596,7 @@
 			<field name="code">4550</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_8660">
@@ -1604,7 +1604,7 @@
 			<field name="code">8660</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_8749">
@@ -1612,7 +1612,7 @@
 			<field name="code">8749</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0750">
@@ -1620,7 +1620,7 @@
 			<field name="code">0750</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1455">
@@ -1628,7 +1628,7 @@
 			<field name="code">1455</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_3749">
@@ -1636,7 +1636,7 @@
 			<field name="code">3749</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3610">
@@ -1644,7 +1644,7 @@
 			<field name="code">3610</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2381">
@@ -1652,7 +1652,7 @@
 			<field name="code">2381</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2380">
@@ -1660,7 +1660,7 @@
 			<field name="code">2380</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2383">
@@ -1668,7 +1668,7 @@
 			<field name="code">2383</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2382">
@@ -1676,7 +1676,7 @@
 			<field name="code">2382</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2385">
@@ -1684,7 +1684,7 @@
 			<field name="code">2385</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2384">
@@ -1692,7 +1692,7 @@
 			<field name="code">2384</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0200">
@@ -1700,7 +1700,7 @@
 			<field name="code">0200</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_2386">
@@ -1708,7 +1708,7 @@
 			<field name="code">2386</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0615">
@@ -1716,7 +1716,7 @@
 			<field name="code">0615</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2465"/>
 		</record>
 		<record model="account.account.template" id="account_2388">
@@ -1724,7 +1724,7 @@
 			<field name="code">2388</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1401">
@@ -1732,7 +1732,7 @@
 			<field name="code">1401</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1400">
@@ -1740,7 +1740,7 @@
 			<field name="code">1400</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1010">
@@ -1748,7 +1748,7 @@
 			<field name="code">1010</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_0610">
@@ -1756,7 +1756,7 @@
 			<field name="code">0610</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2460"/>
 		</record>
 		<record model="account.account.template" id="account_8730">
@@ -1764,7 +1764,7 @@
 			<field name="code">8730</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1518">
@@ -1772,7 +1772,7 @@
 			<field name="code">1518</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_4215">
@@ -1780,7 +1780,7 @@
 			<field name="code">4215</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_8514">
@@ -1788,7 +1788,7 @@
 			<field name="code">8514</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1130">
@@ -1796,7 +1796,7 @@
 			<field name="code">1130</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_1230">
@@ -1804,7 +1804,7 @@
 			<field name="code">1230</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4210">
@@ -1812,7 +1812,7 @@
 			<field name="code">4210</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4198">
@@ -1820,7 +1820,7 @@
 			<field name="code">4198</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1449">
@@ -1828,7 +1828,7 @@
 			<field name="code">1449</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_8750">
@@ -1836,7 +1836,7 @@
 			<field name="code">8750</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8828">
@@ -1844,7 +1844,7 @@
 			<field name="code">8828</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4219">
@@ -1852,7 +1852,7 @@
 			<field name="code">4219</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_1330">
@@ -1860,7 +1860,7 @@
 			<field name="code">1330</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4190">
@@ -1868,7 +1868,7 @@
 			<field name="code">4190</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0100">
@@ -1876,7 +1876,7 @@
 			<field name="code">0100</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0079">
@@ -1884,7 +1884,7 @@
 			<field name="code">0079</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0730">
@@ -1892,7 +1892,7 @@
 			<field name="code">0730</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_4355">
@@ -1900,7 +1900,7 @@
 			<field name="code">4355</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_8125">
@@ -1908,7 +1908,7 @@
 			<field name="code">8125</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4350">
@@ -1916,7 +1916,7 @@
 			<field name="code">4350</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_4260">
@@ -1924,7 +1924,7 @@
 			<field name="code">4260</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2387">
@@ -1932,7 +1932,7 @@
 			<field name="code">2387</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1516">
@@ -1940,7 +1940,7 @@
 			<field name="code">1516</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_1448">
@@ -1948,7 +1948,7 @@
 			<field name="code">1448</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_4815">
@@ -1956,7 +1956,7 @@
 			<field name="code">4815</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1511">
@@ -1964,7 +1964,7 @@
 			<field name="code">1511</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_1840">
@@ -1972,7 +1972,7 @@
 			<field name="code">1840</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_1510">
@@ -1980,7 +1980,7 @@
 			<field name="code">1510</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_1537">
@@ -1988,7 +1988,7 @@
 			<field name="code">1537</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_1240">
@@ -1996,7 +1996,7 @@
 			<field name="code">1240</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_3090">
@@ -2004,7 +2004,7 @@
 			<field name="code">3090</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1531">
@@ -2012,7 +2012,7 @@
 			<field name="code">1531</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1530">
@@ -2020,7 +2020,7 @@
 			<field name="code">1530</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4950">
@@ -2028,7 +2028,7 @@
 			<field name="code">4950</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2166">
@@ -2036,7 +2036,7 @@
 			<field name="code">2166</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4957">
@@ -2044,7 +2044,7 @@
 			<field name="code">4957</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1539">
@@ -2052,7 +2052,7 @@
 			<field name="code">1539</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_1538">
@@ -2060,7 +2060,7 @@
 			<field name="code">1538</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2617">
@@ -2068,7 +2068,7 @@
 			<field name="code">2617</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2616">
@@ -2076,7 +2076,7 @@
 			<field name="code">2616</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2615">
@@ -2084,7 +2084,7 @@
 			<field name="code">2615</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_4905">
@@ -2092,7 +2092,7 @@
 			<field name="code">4905</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_3800">
@@ -2100,7 +2100,7 @@
 			<field name="code">3800</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2619">
@@ -2108,7 +2108,7 @@
 			<field name="code">2619</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2618">
@@ -2116,7 +2116,7 @@
 			<field name="code">2618</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_0970">
@@ -2124,7 +2124,7 @@
 			<field name="code">0970</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0971">
@@ -2132,7 +2132,7 @@
 			<field name="code">0971</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0972">
@@ -2140,7 +2140,7 @@
 			<field name="code">0972</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0973">
@@ -2148,7 +2148,7 @@
 			<field name="code">0973</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0974">
@@ -2156,7 +2156,7 @@
 			<field name="code">0974</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_3559">
@@ -2164,7 +2164,7 @@
 			<field name="code">3559</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_0976">
@@ -2172,7 +2172,7 @@
 			<field name="code">0976</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0977">
@@ -2180,7 +2180,7 @@
 			<field name="code">0977</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0978">
@@ -2188,7 +2188,7 @@
 			<field name="code">0978</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0979">
@@ -2196,7 +2196,7 @@
 			<field name="code">0979</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_3125">
@@ -2204,7 +2204,7 @@
 			<field name="code">3125</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1900">
@@ -2212,7 +2212,7 @@
 			<field name="code">1900</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_8940">
@@ -2220,7 +2220,7 @@
 			<field name="code">8940</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8190">
@@ -2228,7 +2228,7 @@
 			<field name="code">8190</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8196">
@@ -2236,7 +2236,7 @@
 			<field name="code">8196</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8400">
@@ -2244,7 +2244,7 @@
 			<field name="code">8400</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8300">
@@ -2252,7 +2252,7 @@
 			<field name="code">8300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8947">
@@ -2260,7 +2260,7 @@
 			<field name="code">8947</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8195">
@@ -2268,7 +2268,7 @@
 			<field name="code">8195</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8949">
@@ -2276,7 +2276,7 @@
 			<field name="code">8949</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0500">
@@ -2284,7 +2284,7 @@
 			<field name="code">0500</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1280"/>
 		</record>
 		<record model="account.account.template" id="account_8741">
@@ -2292,7 +2292,7 @@
 			<field name="code">8741</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0505">
@@ -2300,7 +2300,7 @@
 			<field name="code">0505</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1290"/>
 		</record>
 		<record model="account.account.template" id="account_0504">
@@ -2308,7 +2308,7 @@
 			<field name="code">0504</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1280"/>
 		</record>
 		<record model="account.account.template" id="account_1731">
@@ -2316,7 +2316,7 @@
 			<field name="code">1731</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_2688">
@@ -2324,7 +2324,7 @@
 			<field name="code">2688</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2689">
@@ -2332,7 +2332,7 @@
 			<field name="code">2689</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2680">
@@ -2340,7 +2340,7 @@
 			<field name="code">2680</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_1000">
@@ -2348,7 +2348,7 @@
 			<field name="code">1000</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_8922">
@@ -2356,7 +2356,7 @@
 			<field name="code">8922</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8120">
@@ -2364,7 +2364,7 @@
 			<field name="code">8120</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0147">
@@ -2372,7 +2372,7 @@
 			<field name="code">0147</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0480">
@@ -2380,7 +2380,7 @@
 			<field name="code">0480</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_0630">
@@ -2388,7 +2388,7 @@
 			<field name="code">0630</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2475"/>
 		</record>
 		<record model="account.account.template" id="account_0485">
@@ -2396,7 +2396,7 @@
 			<field name="code">0485</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1465">
@@ -2404,7 +2404,7 @@
 			<field name="code">1465</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_8955">
@@ -2412,7 +2412,7 @@
 			<field name="code">8955</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8650">
@@ -2420,7 +2420,7 @@
 			<field name="code">8650</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_7000">
@@ -2428,7 +2428,7 @@
 			<field name="code">7000</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1460"/>
 		</record>
 		<record model="account.account.template" id="account_1990">
@@ -2436,7 +2436,7 @@
 			<field name="code">1990</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4170">
@@ -2444,7 +2444,7 @@
 			<field name="code">4170</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1626">
@@ -2452,7 +2452,7 @@
 			<field name="code">1626</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2490"/>
 		</record>
 		<record model="account.account.template" id="account_1625">
@@ -2460,7 +2460,7 @@
 			<field name="code">1625</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1624">
@@ -2468,7 +2468,7 @@
 			<field name="code">1624</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4946">
@@ -2476,7 +2476,7 @@
 			<field name="code">4946</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1628">
@@ -2484,7 +2484,7 @@
 			<field name="code">1628</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2490"/>
 		</record>
 		<record model="account.account.template" id="account_8935">
@@ -2492,7 +2492,7 @@
 			<field name="code">8935</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8839">
@@ -2500,7 +2500,7 @@
 			<field name="code">8839</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8838">
@@ -2508,7 +2508,7 @@
 			<field name="code">8838</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_3960">
@@ -2516,7 +2516,7 @@
 			<field name="code">3960</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8933">
@@ -2524,7 +2524,7 @@
 			<field name="code">8933</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8837">
@@ -2532,7 +2532,7 @@
 			<field name="code">8837</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4340">
@@ -2540,7 +2540,7 @@
 			<field name="code">4340</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_0570">
@@ -2548,7 +2548,7 @@
 			<field name="code">0570</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1328"/>
 		</record>
 		<record model="account.account.template" id="account_8939">
@@ -2556,7 +2556,7 @@
 			<field name="code">8939</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8851">
@@ -2564,7 +2564,7 @@
 			<field name="code">8851</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_7140">
@@ -2572,7 +2572,7 @@
 			<field name="code">7140</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1470"/>
 		</record>
 		<record model="account.account.template" id="account_8917">
@@ -2580,7 +2580,7 @@
 			<field name="code">8917</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0513">
@@ -2588,7 +2588,7 @@
 			<field name="code">0513</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_8400">
@@ -2596,7 +2596,7 @@
 			<field name="code">8400</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8850">
@@ -2604,7 +2604,7 @@
 			<field name="code">8850</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2345">
@@ -2612,7 +2612,7 @@
 			<field name="code">2345</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0650">
@@ -2620,7 +2620,7 @@
 			<field name="code">0650</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_2341">
@@ -2628,7 +2628,7 @@
 			<field name="code">2341</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2340">
@@ -2636,7 +2636,7 @@
 			<field name="code">2340</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2670">
@@ -2644,7 +2644,7 @@
 			<field name="code">2670</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_1190">
@@ -2652,7 +2652,7 @@
 			<field name="code">1190</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_2349">
@@ -2660,7 +2660,7 @@
 			<field name="code">2349</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2348">
@@ -2668,7 +2668,7 @@
 			<field name="code">2348</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_4880">
@@ -2676,7 +2676,7 @@
 			<field name="code">4880</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1690">
@@ -2684,7 +2684,7 @@
 			<field name="code">1690</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2500"/>
 		</record>
 		<record model="account.account.template" id="account_0890">
@@ -2692,7 +2692,7 @@
 			<field name="code">0890</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_0710">
@@ -2700,7 +2700,7 @@
 			<field name="code">0710</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2510"/>
 		</record>
 		<record model="account.account.template" id="account_1756">
@@ -2708,7 +2708,7 @@
 			<field name="code">1756</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1755">
@@ -2716,7 +2716,7 @@
 			<field name="code">1755</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1754">
@@ -2724,7 +2724,7 @@
 			<field name="code">1754</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1753">
@@ -2732,7 +2732,7 @@
 			<field name="code">1753</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_0715">
@@ -2740,7 +2740,7 @@
 			<field name="code">0715</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2525"/>
 		</record>
 		<record model="account.account.template" id="account_0716">
@@ -2748,7 +2748,7 @@
 			<field name="code">0716</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2525"/>
 		</record>
 		<record model="account.account.template" id="account_1750">
@@ -2756,7 +2756,7 @@
 			<field name="code">1750</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_0020">
@@ -2764,7 +2764,7 @@
 			<field name="code">0020</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_8160">
@@ -2772,7 +2772,7 @@
 			<field name="code">8160</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0027">
@@ -2780,7 +2780,7 @@
 			<field name="code">0027</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0025">
@@ -2788,7 +2788,7 @@
 			<field name="code">0025</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4250">
@@ -2796,7 +2796,7 @@
 			<field name="code">4250</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4885">
@@ -2804,7 +2804,7 @@
 			<field name="code">4885</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_0660">
@@ -2812,7 +2812,7 @@
 			<field name="code">0660</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2475"/>
 		</record>
 		<record model="account.account.template" id="account_4500">
@@ -2820,7 +2820,7 @@
 			<field name="code">4500</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_0193">
@@ -2828,7 +2828,7 @@
 			<field name="code">0193</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8790">
@@ -2836,7 +2836,7 @@
 			<field name="code">8790</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_3700">
@@ -2844,7 +2844,7 @@
 			<field name="code">3700</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8736">
@@ -2852,7 +2852,7 @@
 			<field name="code">8736</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8794">
@@ -2860,7 +2860,7 @@
 			<field name="code">8794</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8723">
@@ -2868,7 +2868,7 @@
 			<field name="code">8723</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1880">
@@ -2876,7 +2876,7 @@
 			<field name="code">1880</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_2120">
@@ -2884,7 +2884,7 @@
 			<field name="code">2120</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2125">
@@ -2892,7 +2892,7 @@
 			<field name="code">2125</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2127">
@@ -2900,7 +2900,7 @@
 			<field name="code">2127</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2126">
@@ -2908,7 +2908,7 @@
 			<field name="code">2126</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2129">
@@ -2916,7 +2916,7 @@
 			<field name="code">2129</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2128">
@@ -2924,7 +2924,7 @@
 			<field name="code">2128</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_3115">
@@ -2932,7 +2932,7 @@
 			<field name="code">3115</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3565">
@@ -2940,7 +2940,7 @@
 			<field name="code">3565</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4660">
@@ -2948,7 +2948,7 @@
 			<field name="code">4660</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4662">
@@ -2956,7 +2956,7 @@
 			<field name="code">4662</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3110">
@@ -2964,7 +2964,7 @@
 			<field name="code">3110</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_0625">
@@ -2972,7 +2972,7 @@
 			<field name="code">0625</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2465"/>
 		</record>
 		<record model="account.account.template" id="account_1579">
@@ -2980,7 +2980,7 @@
 			<field name="code">1579</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1578">
@@ -2988,7 +2988,7 @@
 			<field name="code">1578</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0620">
@@ -2996,7 +2996,7 @@
 			<field name="code">0620</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2465"/>
 		</record>
 		<record model="account.account.template" id="account_8727">
@@ -3004,7 +3004,7 @@
 			<field name="code">8727</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0150">
@@ -3012,7 +3012,7 @@
 			<field name="code">0150</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_1475">
@@ -3020,7 +3020,7 @@
 			<field name="code">1475</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1545"/>
 		</record>
 		<record model="account.account.template" id="account_1573">
@@ -3028,7 +3028,7 @@
 			<field name="code">1573</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1572">
@@ -3036,7 +3036,7 @@
 			<field name="code">1572</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1571">
@@ -3044,7 +3044,7 @@
 			<field name="code">1571</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1479">
@@ -3052,7 +3052,7 @@
 			<field name="code">1479</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1545"/>
 		</record>
 		<record model="account.account.template" id="account_1577">
@@ -3060,7 +3060,7 @@
 			<field name="code">1577</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1576">
@@ -3068,7 +3068,7 @@
 			<field name="code">1576</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1575">
@@ -3076,7 +3076,7 @@
 			<field name="code">1575</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0090">
@@ -3084,7 +3084,7 @@
 			<field name="code">0090</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2712">
@@ -3092,7 +3092,7 @@
 			<field name="code">2712</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1305">
@@ -3100,7 +3100,7 @@
 			<field name="code">1305</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_2659">
@@ -3108,7 +3108,7 @@
 			<field name="code">2659</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2658">
@@ -3116,7 +3116,7 @@
 			<field name="code">2658</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2716">
@@ -3124,7 +3124,7 @@
 			<field name="code">2716</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1301">
@@ -3132,7 +3132,7 @@
 			<field name="code">1301</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1302">
@@ -3140,7 +3140,7 @@
 			<field name="code">1302</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_2715">
@@ -3148,7 +3148,7 @@
 			<field name="code">2715</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2653">
@@ -3156,7 +3156,7 @@
 			<field name="code">2653</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_1450">
@@ -3164,7 +3164,7 @@
 			<field name="code">1450</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_2650">
@@ -3172,7 +3172,7 @@
 			<field name="code">2650</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2657">
@@ -3180,7 +3180,7 @@
 			<field name="code">2657</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2656">
@@ -3188,7 +3188,7 @@
 			<field name="code">2656</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2655">
@@ -3196,7 +3196,7 @@
 			<field name="code">2655</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2654">
@@ -3204,7 +3204,7 @@
 			<field name="code">2654</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_4228">
@@ -3212,7 +3212,7 @@
 			<field name="code">4228</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4229">
@@ -3220,7 +3220,7 @@
 			<field name="code">4229</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4220">
@@ -3228,7 +3228,7 @@
 			<field name="code">4220</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_8540">
@@ -3236,7 +3236,7 @@
 			<field name="code">8540</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8919">
@@ -3244,7 +3244,7 @@
 			<field name="code">8919</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1830">
@@ -3252,7 +3252,7 @@
 			<field name="code">1830</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_8610">
@@ -3260,7 +3260,7 @@
 			<field name="code">8610</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_3794">
@@ -3268,7 +3268,7 @@
 			<field name="code">3794</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4380">
@@ -3276,7 +3276,7 @@
 			<field name="code">4380</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_3790">
@@ -3284,7 +3284,7 @@
 			<field name="code">3790</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2406">
@@ -3292,7 +3292,7 @@
 			<field name="code">2406</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2407">
@@ -3300,7 +3300,7 @@
 			<field name="code">2407</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2404">
@@ -3308,7 +3308,7 @@
 			<field name="code">2404</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1372">
@@ -3316,7 +3316,7 @@
 			<field name="code">1372</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2402">
@@ -3324,7 +3324,7 @@
 			<field name="code">2402</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2403">
@@ -3332,7 +3332,7 @@
 			<field name="code">2403</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2400">
@@ -3340,7 +3340,7 @@
 			<field name="code">2400</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2401">
@@ -3348,7 +3348,7 @@
 			<field name="code">2401</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4862">
@@ -3356,7 +3356,7 @@
 			<field name="code">4862</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4860">
@@ -3364,7 +3364,7 @@
 			<field name="code">4860</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4230">
@@ -3372,7 +3372,7 @@
 			<field name="code">4230</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2010">
@@ -3380,7 +3380,7 @@
 			<field name="code">2010</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2408">
@@ -3388,7 +3388,7 @@
 			<field name="code">2408</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2409">
@@ -3396,7 +3396,7 @@
 			<field name="code">2409</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_3830">
@@ -3404,7 +3404,7 @@
 			<field name="code">3830</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1759">
@@ -3412,7 +3412,7 @@
 			<field name="code">1759</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_1701">
@@ -3420,7 +3420,7 @@
 			<field name="code">1701</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_8807">
@@ -3428,7 +3428,7 @@
 			<field name="code">8807</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1344">
@@ -3436,7 +3436,7 @@
 			<field name="code">1344</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1620"/>
 		</record>
 		<record model="account.account.template" id="account_4595">
@@ -3444,7 +3444,7 @@
 			<field name="code">4595</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_4730">
@@ -3452,7 +3452,7 @@
 			<field name="code">4730</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1345">
@@ -3460,7 +3460,7 @@
 			<field name="code">1345</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1630"/>
 		</record>
 		<record model="account.account.template" id="account_8330">
@@ -3468,7 +3468,7 @@
 			<field name="code">8330</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1630">
@@ -3476,7 +3476,7 @@
 			<field name="code">1630</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1950">
@@ -3484,7 +3484,7 @@
 			<field name="code">1950</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_1704">
@@ -3492,7 +3492,7 @@
 			<field name="code">1704</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_8338">
@@ -3500,7 +3500,7 @@
 			<field name="code">8338</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4679">
@@ -3508,7 +3508,7 @@
 			<field name="code">4679</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0540">
@@ -3516,7 +3516,7 @@
 			<field name="code">0540</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1325"/>
 		</record>
 		<record model="account.account.template" id="account_4870">
@@ -3524,7 +3524,7 @@
 			<field name="code">4870</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_0530">
@@ -3532,7 +3532,7 @@
 			<field name="code">0530</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1320"/>
 		</record>
 		<record model="account.account.template" id="account_4139">
@@ -3540,7 +3540,7 @@
 			<field name="code">4139</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_3560">
@@ -3548,7 +3548,7 @@
 			<field name="code">3560</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8520">
@@ -3556,7 +3556,7 @@
 			<field name="code">8520</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_2318">
@@ -3564,7 +3564,7 @@
 			<field name="code">2318</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0760">
@@ -3572,7 +3572,7 @@
 			<field name="code">0760</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_4130">
@@ -3580,7 +3580,7 @@
 			<field name="code">4130</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0430">
@@ -3588,7 +3588,7 @@
 			<field name="code">0430</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1752">
@@ -3596,7 +3596,7 @@
 			<field name="code">1752</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_2316">
@@ -3604,7 +3604,7 @@
 			<field name="code">2316</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1751">
@@ -3612,7 +3612,7 @@
 			<field name="code">1751</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_2317">
@@ -3620,7 +3620,7 @@
 			<field name="code">2317</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8970">
@@ -3628,7 +3628,7 @@
 			<field name="code">8970</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_4678">
@@ -3636,7 +3636,7 @@
 			<field name="code">4678</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8975">
@@ -3644,7 +3644,7 @@
 			<field name="code">8975</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_8977">
@@ -3652,7 +3652,7 @@
 			<field name="code">8977</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_4900">
@@ -3660,7 +3660,7 @@
 			<field name="code">4900</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_8764">
@@ -3668,7 +3668,7 @@
 			<field name="code">8764</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1481">
@@ -3676,7 +3676,7 @@
 			<field name="code">1481</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1480">
@@ -3684,7 +3684,7 @@
 			<field name="code">1480</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1485">
@@ -3692,7 +3692,7 @@
 			<field name="code">1485</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1555"/>
 		</record>
 		<record model="account.account.template" id="account_1489">
@@ -3700,7 +3700,7 @@
 			<field name="code">1489</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1555"/>
 		</record>
 		<record model="account.account.template" id="account_1488">
@@ -3708,7 +3708,7 @@
 			<field name="code">1488</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_0699">
@@ -3716,7 +3716,7 @@
 			<field name="code">0699</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_3300">
@@ -3724,7 +3724,7 @@
 			<field name="code">3300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2309">
@@ -3732,7 +3732,7 @@
 			<field name="code">2309</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1711">
@@ -3740,7 +3740,7 @@
 			<field name="code">1711</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_1710">
@@ -3748,7 +3748,7 @@
 			<field name="code">1710</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_1717">
@@ -3756,7 +3756,7 @@
 			<field name="code">1717</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_0320">
@@ -3764,7 +3764,7 @@
 			<field name="code">0320</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_2300">
@@ -3772,7 +3772,7 @@
 			<field name="code">2300</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1719">
@@ -3780,7 +3780,7 @@
 			<field name="code">1719</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_1718">
@@ -3788,7 +3788,7 @@
 			<field name="code">1718</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_2307">
@@ -3796,7 +3796,7 @@
 			<field name="code">2307</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0990">
@@ -3804,7 +3804,7 @@
 			<field name="code">0990</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2560"/>
 		</record>
 		<record model="account.account.template" id="account_1659">
@@ -3812,7 +3812,7 @@
 			<field name="code">1659</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_0996">
@@ -3820,7 +3820,7 @@
 			<field name="code">0996</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_0997">
@@ -3828,7 +3828,7 @@
 			<field name="code">0997</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_1650">
@@ -3836,7 +3836,7 @@
 			<field name="code">1650</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1651">
@@ -3844,7 +3844,7 @@
 			<field name="code">1651</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_0440">
@@ -3852,7 +3852,7 @@
 			<field name="code">0440</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_2520">
@@ -3860,7 +3860,7 @@
 			<field name="code">2520</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1655">
@@ -3868,7 +3868,7 @@
 			<field name="code">1655</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2490"/>
 		</record>
 		<record model="account.account.template" id="account_2289">
@@ -3876,7 +3876,7 @@
 			<field name="code">2289</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_0260">
@@ -3884,7 +3884,7 @@
 			<field name="code">0260</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_3660">
@@ -3892,7 +3892,7 @@
 			<field name="code">3660</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3748">
@@ -3900,7 +3900,7 @@
 			<field name="code">3748</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1631">
@@ -3908,7 +3908,7 @@
 			<field name="code">1631</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2515"/>
 		</record>
 		<record model="account.account.template" id="account_2280">
@@ -3916,7 +3916,7 @@
 			<field name="code">2280</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2281">
@@ -3924,7 +3924,7 @@
 			<field name="code">2281</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2282">
@@ -3932,7 +3932,7 @@
 			<field name="code">2282</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2283">
@@ -3940,7 +3940,7 @@
 			<field name="code">2283</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2284">
@@ -3948,7 +3948,7 @@
 			<field name="code">2284</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2285">
@@ -3956,7 +3956,7 @@
 			<field name="code">2285</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_8200">
@@ -3964,7 +3964,7 @@
 			<field name="code">8200</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_2287">
@@ -3972,7 +3972,7 @@
 			<field name="code">2287</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_3153">
@@ -3980,7 +3980,7 @@
 			<field name="code">3153</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3152">
@@ -3988,7 +3988,7 @@
 			<field name="code">3152</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3151">
@@ -3996,7 +3996,7 @@
 			<field name="code">3151</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3150">
@@ -4004,7 +4004,7 @@
 			<field name="code">3150</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3155">
@@ -4012,7 +4012,7 @@
 			<field name="code">3155</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3154">
@@ -4020,7 +4020,7 @@
 			<field name="code">3154</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4540">
@@ -4028,7 +4028,7 @@
 			<field name="code">4540</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_4976">
@@ -4036,7 +4036,7 @@
 			<field name="code">4976</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2510">
@@ -4044,7 +4044,7 @@
 			<field name="code">2510</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2652">
@@ -4052,7 +4052,7 @@
 			<field name="code">2652</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_4970">
@@ -4060,7 +4060,7 @@
 			<field name="code">4970</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0420">
@@ -4068,7 +4068,7 @@
 			<field name="code">0420</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_4822">
@@ -4076,7 +4076,7 @@
 			<field name="code">4822</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_8729">
@@ -4084,7 +4084,7 @@
 			<field name="code">8729</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0210">
@@ -4092,7 +4092,7 @@
 			<field name="code">0210</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_0199">
@@ -4100,7 +4100,7 @@
 			<field name="code">0199</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_2149">
@@ -4108,7 +4108,7 @@
 			<field name="code">2149</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_0740">
@@ -4116,7 +4116,7 @@
 			<field name="code">0740</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0192">
@@ -4124,7 +4124,7 @@
 			<field name="code">0192</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0661">
@@ -4132,7 +4132,7 @@
 			<field name="code">0661</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2475"/>
 		</record>
 		<record model="account.account.template" id="account_0190">
@@ -4140,7 +4140,7 @@
 			<field name="code">0190</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0191">
@@ -4148,7 +4148,7 @@
 			<field name="code">0191</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8725">
@@ -4156,7 +4156,7 @@
 			<field name="code">8725</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8724">
@@ -4164,7 +4164,7 @@
 			<field name="code">8724</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0194">
@@ -4172,7 +4172,7 @@
 			<field name="code">0194</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0195">
@@ -4180,7 +4180,7 @@
 			<field name="code">0195</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_1348">
@@ -4188,7 +4188,7 @@
 			<field name="code">1348</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1640"/>
 		</record>
 		<record model="account.account.template" id="account_1349">
@@ -4196,7 +4196,7 @@
 			<field name="code">1349</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1640"/>
 		</record>
 		<record model="account.account.template" id="account_1220">
@@ -4204,7 +4204,7 @@
 			<field name="code">1220</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_1340">
@@ -4212,7 +4212,7 @@
 			<field name="code">1340</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1620"/>
 		</record>
 		<record model="account.account.template" id="account_4180">
@@ -4220,7 +4220,7 @@
 			<field name="code">4180</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_2714">
@@ -4228,7 +4228,7 @@
 			<field name="code">2714</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2451">
@@ -4236,7 +4236,7 @@
 			<field name="code">2451</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2450">
@@ -4244,7 +4244,7 @@
 			<field name="code">2450</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_4948">
@@ -4252,7 +4252,7 @@
 			<field name="code">4948</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_8700">
@@ -4260,7 +4260,7 @@
 			<field name="code">8700</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_3770">
@@ -4268,7 +4268,7 @@
 			<field name="code">3770</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4980">
@@ -4276,7 +4276,7 @@
 			<field name="code">4980</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1870">
@@ -4284,7 +4284,7 @@
 			<field name="code">1870</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_8110">
@@ -4292,7 +4292,7 @@
 			<field name="code">8110</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1879">
@@ -4300,7 +4300,7 @@
 			<field name="code">1879</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4945">
@@ -4308,7 +4308,7 @@
 			<field name="code">4945</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1502">
@@ -4316,7 +4316,7 @@
 			<field name="code">1502</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_3200">
@@ -4324,7 +4324,7 @@
 			<field name="code">3200</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4940">
@@ -4332,7 +4332,7 @@
 			<field name="code">4940</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1503">
@@ -4340,7 +4340,7 @@
 			<field name="code">1503</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4826">
@@ -4348,7 +4348,7 @@
 			<field name="code">4826</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4824">
@@ -4356,7 +4356,7 @@
 			<field name="code">4824</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4530">
@@ -4364,7 +4364,7 @@
 			<field name="code">4530</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_1645">
@@ -4372,7 +4372,7 @@
 			<field name="code">1645</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2520"/>
 		</record>
 		<record model="account.account.template" id="account_4820">
@@ -4380,7 +4380,7 @@
 			<field name="code">4820</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2118">
@@ -4388,7 +4388,7 @@
 			<field name="code">2118</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2119">
@@ -4396,7 +4396,7 @@
 			<field name="code">2119</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_1500">
@@ -4404,7 +4404,7 @@
 			<field name="code">1500</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0065">
@@ -4412,7 +4412,7 @@
 			<field name="code">0065</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1506">
@@ -4420,7 +4420,7 @@
 			<field name="code">1506</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_1507">
@@ -4428,7 +4428,7 @@
 			<field name="code">1507</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1504">
@@ -4436,7 +4436,7 @@
 			<field name="code">1504</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_1505">
@@ -4444,7 +4444,7 @@
 			<field name="code">1505</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2110">
@@ -4452,7 +4452,7 @@
 			<field name="code">2110</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_8611">
@@ -4460,7 +4460,7 @@
 			<field name="code">8611</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1508">
@@ -4468,7 +4468,7 @@
 			<field name="code">1508</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_2113">
@@ -4476,7 +4476,7 @@
 			<field name="code">2113</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2115">
@@ -4484,7 +4484,7 @@
 			<field name="code">2115</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2116">
@@ -4492,7 +4492,7 @@
 			<field name="code">2116</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_8591">
@@ -4500,7 +4500,7 @@
 			<field name="code">8591</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1110">
@@ -4508,7 +4508,7 @@
 			<field name="code">1110</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_2620">
@@ -4516,7 +4516,7 @@
 			<field name="code">2620</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_2626">
@@ -4524,7 +4524,7 @@
 			<field name="code">2626</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_0060">
@@ -4532,7 +4532,7 @@
 			<field name="code">0060</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2625">
@@ -4540,7 +4540,7 @@
 			<field name="code">2625</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_8310">
@@ -4548,7 +4548,7 @@
 			<field name="code">8310</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0963">
@@ -4556,7 +4556,7 @@
 			<field name="code">0963</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_8575">
@@ -4564,7 +4564,7 @@
 			<field name="code">8575</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8576">
@@ -4572,7 +4572,7 @@
 			<field name="code">8576</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8570">
@@ -4580,7 +4580,7 @@
 			<field name="code">8570</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0966">
@@ -4588,7 +4588,7 @@
 			<field name="code">0966</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_0965">
@@ -4596,7 +4596,7 @@
 			<field name="code">0965</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2410"/>
 		</record>
 		<record model="account.account.template" id="account_1910">
@@ -4604,7 +4604,7 @@
 			<field name="code">1910</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_0969">
@@ -4612,7 +4612,7 @@
 			<field name="code">0969</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_8579">
@@ -4620,7 +4620,7 @@
 			<field name="code">8579</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_4655">
@@ -4628,7 +4628,7 @@
 			<field name="code">4655</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8595">
@@ -4636,7 +4636,7 @@
 			<field name="code">8595</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1773">
@@ -4644,7 +4644,7 @@
 			<field name="code">1773</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_3440">
@@ -4652,7 +4652,7 @@
 			<field name="code">3440</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4985">
@@ -4660,7 +4660,7 @@
 			<field name="code">4985</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4664">
@@ -4668,7 +4668,7 @@
 			<field name="code">4664</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2020">
@@ -4676,7 +4676,7 @@
 			<field name="code">2020</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_8590">
@@ -4684,7 +4684,7 @@
 			<field name="code">8590</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_2750">
@@ -4692,7 +4692,7 @@
 			<field name="code">2750</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4666">
@@ -4700,7 +4700,7 @@
 			<field name="code">4666</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4650">
@@ -4708,7 +4708,7 @@
 			<field name="code">4650</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2405">
@@ -4716,7 +4716,7 @@
 			<field name="code">2405</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_0499">
@@ -4724,7 +4724,7 @@
 			<field name="code">0499</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0498">
@@ -4732,7 +4732,7 @@
 			<field name="code">0498</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0490">
@@ -4740,7 +4740,7 @@
 			<field name="code">0490</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_3746">
@@ -4748,7 +4748,7 @@
 			<field name="code">3746</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4590">
@@ -4756,7 +4756,7 @@
 			<field name="code">4590</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_4760">
@@ -4764,7 +4764,7 @@
 			<field name="code">4760</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_4910">
@@ -4772,7 +4772,7 @@
 			<field name="code">4910</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0799">
@@ -4780,7 +4780,7 @@
 			<field name="code">0799</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1970">
@@ -4788,7 +4788,7 @@
 			<field name="code">1970</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4199">
@@ -4796,7 +4796,7 @@
 			<field name="code">4199</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0400">
@@ -4804,7 +4804,7 @@
 			<field name="code">0400</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_4165">
@@ -4812,7 +4812,7 @@
 			<field name="code">4165</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4160">
@@ -4820,7 +4820,7 @@
 			<field name="code">4160</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1960">
@@ -4828,7 +4828,7 @@
 			<field name="code">1960</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_1470">
@@ -4836,7 +4836,7 @@
 			<field name="code">1470</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1610">
@@ -4844,7 +4844,7 @@
 			<field name="code">1610</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4168">
@@ -4852,7 +4852,7 @@
 			<field name="code">4168</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_3970">
@@ -4860,7 +4860,7 @@
 			<field name="code">3970</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1450"/>
 		</record>
 		<record model="account.account.template" id="account_8925">
@@ -4868,7 +4868,7 @@
 			<field name="code">8925</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1471">
@@ -4876,7 +4876,7 @@
 			<field name="code">1471</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_4152">
@@ -4884,7 +4884,7 @@
 			<field name="code">4152</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_8921">
@@ -4892,7 +4892,7 @@
 			<field name="code">8921</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8920">
@@ -4900,7 +4900,7 @@
 			<field name="code">8920</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8929">
@@ -4908,7 +4908,7 @@
 			<field name="code">8929</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8760">
@@ -4916,7 +4916,7 @@
 			<field name="code">8760</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8648">
@@ -4924,7 +4924,7 @@
 			<field name="code">8648</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8140">
@@ -4932,7 +4932,7 @@
 			<field name="code">8140</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0380">
@@ -4940,7 +4940,7 @@
 			<field name="code">0380</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_0220">
@@ -4948,7 +4948,7 @@
 			<field name="code">0220</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_8915">
@@ -4956,7 +4956,7 @@
 			<field name="code">8915</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8818">
@@ -4964,7 +4964,7 @@
 			<field name="code">8818</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_7100">
@@ -4972,7 +4972,7 @@
 			<field name="code">7100</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1470"/>
 		</record>
 		<record model="account.account.template" id="account_4128">
@@ -4980,7 +4980,7 @@
 			<field name="code">4128</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1558">
@@ -4988,7 +4988,7 @@
 			<field name="code">1558</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1501">
@@ -4996,7 +4996,7 @@
 			<field name="code">1501</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1478">
@@ -5004,7 +5004,7 @@
 			<field name="code">1478</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_8574">
@@ -5012,7 +5012,7 @@
 			<field name="code">8574</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1570">
@@ -5020,7 +5020,7 @@
 			<field name="code">1570</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4710">
@@ -5028,7 +5028,7 @@
 			<field name="code">4710</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_3745">
@@ -5036,7 +5036,7 @@
 			<field name="code">3745</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8769">
@@ -5044,7 +5044,7 @@
 			<field name="code">8769</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1680">
@@ -5052,7 +5052,7 @@
 			<field name="code">1680</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2500"/>
 		</record>
 		<record model="account.account.template" id="account_1768">
@@ -5060,7 +5060,7 @@
 			<field name="code">1768</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1769">
@@ -5068,7 +5068,7 @@
 			<field name="code">1769</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_8640">
@@ -5076,7 +5076,7 @@
 			<field name="code">8640</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1762">
@@ -5084,7 +5084,7 @@
 			<field name="code">1762</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1763">
@@ -5092,7 +5092,7 @@
 			<field name="code">1763</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1760">
@@ -5100,7 +5100,7 @@
 			<field name="code">1760</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_0700">
@@ -5108,7 +5108,7 @@
 			<field name="code">0700</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2515"/>
 		</record>
 		<record model="account.account.template" id="account_1766">
@@ -5116,7 +5116,7 @@
 			<field name="code">1766</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1767">
@@ -5124,7 +5124,7 @@
 			<field name="code">1767</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1764">
@@ -5132,7 +5132,7 @@
 			<field name="code">1764</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1765">
@@ -5140,7 +5140,7 @@
 			<field name="code">1765</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_4301">
@@ -5148,7 +5148,7 @@
 			<field name="code">4301</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4289">
@@ -5156,7 +5156,7 @@
 			<field name="code">4289</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0039">
@@ -5164,7 +5164,7 @@
 			<field name="code">0039</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1150"/>
 		</record>
 		<record model="account.account.template" id="account_0038">
@@ -5172,7 +5172,7 @@
 			<field name="code">0038</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1150"/>
 		</record>
 		<record model="account.account.template" id="account_2713">
@@ -5180,7 +5180,7 @@
 			<field name="code">2713</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0035">
@@ -5188,7 +5188,7 @@
 			<field name="code">0035</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1130"/>
 		</record>
 		<record model="account.account.template" id="account_8625">
@@ -5196,7 +5196,7 @@
 			<field name="code">8625</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0030">
@@ -5204,7 +5204,7 @@
 			<field name="code">0030</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_8150">
@@ -5212,7 +5212,7 @@
 			<field name="code">8150</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4570">
@@ -5220,7 +5220,7 @@
 			<field name="code">4570</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_2711">
@@ -5228,7 +5228,7 @@
 			<field name="code">2711</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8808">
@@ -5236,7 +5236,7 @@
 			<field name="code">8808</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1300">
@@ -5244,7 +5244,7 @@
 			<field name="code">1300</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_8780">
@@ -5252,7 +5252,7 @@
 			<field name="code">8780</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_3552">
@@ -5260,7 +5260,7 @@
 			<field name="code">3552</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4909">
@@ -5268,7 +5268,7 @@
 			<field name="code">4909</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1547">
@@ -5276,7 +5276,7 @@
 			<field name="code">1547</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1545">
@@ -5284,7 +5284,7 @@
 			<field name="code">1545</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1542">
@@ -5292,7 +5292,7 @@
 			<field name="code">1542</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1543">
@@ -5300,7 +5300,7 @@
 			<field name="code">1543</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1540">
@@ -5308,7 +5308,7 @@
 			<field name="code">1540</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0755">
@@ -5316,7 +5316,7 @@
 			<field name="code">0755</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_4676">
@@ -5324,7 +5324,7 @@
 			<field name="code">4676</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3120">
@@ -5332,7 +5332,7 @@
 			<field name="code">3120</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4674">
@@ -5340,7 +5340,7 @@
 			<field name="code">4674</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4673">
@@ -5348,7 +5348,7 @@
 			<field name="code">4673</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4672">
@@ -5356,7 +5356,7 @@
 			<field name="code">4672</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1548">
@@ -5364,7 +5364,7 @@
 			<field name="code">1548</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1549">
@@ -5372,7 +5372,7 @@
 			<field name="code">1549</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_8710">
@@ -5380,7 +5380,7 @@
 			<field name="code">8710</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0140">
@@ -5388,7 +5388,7 @@
 			<field name="code">0140</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0145">
@@ -5396,7 +5396,7 @@
 			<field name="code">0145</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0631">
@@ -5404,7 +5404,7 @@
 			<field name="code">0631</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2475"/>
 		</record>
 		<record model="account.account.template" id="account_0146">
@@ -5412,7 +5412,7 @@
 			<field name="code">0146</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0149">
@@ -5420,7 +5420,7 @@
 			<field name="code">0149</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0148">
@@ -5428,7 +5428,7 @@
 			<field name="code">0148</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1461">
@@ -5436,7 +5436,7 @@
 			<field name="code">1461</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1460">
@@ -5444,7 +5444,7 @@
 			<field name="code">1460</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1315">
@@ -5452,7 +5452,7 @@
 			<field name="code">1315</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_2709">
@@ -5460,7 +5460,7 @@
 			<field name="code">2709</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1312">
@@ -5468,7 +5468,7 @@
 			<field name="code">1312</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1545"/>
 		</record>
 		<record model="account.account.template" id="account_1311">
@@ -5476,7 +5476,7 @@
 			<field name="code">1311</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1310">
@@ -5484,7 +5484,7 @@
 			<field name="code">1310</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_2705">
@@ -5492,7 +5492,7 @@
 			<field name="code">2705</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2707">
@@ -5500,7 +5500,7 @@
 			<field name="code">2707</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2700">
@@ -5508,7 +5508,7 @@
 			<field name="code">2700</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4886">
@@ -5516,7 +5516,7 @@
 			<field name="code">4886</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4887">
@@ -5524,7 +5524,7 @@
 			<field name="code">4887</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2389">
@@ -5532,7 +5532,7 @@
 			<field name="code">2389</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1020">
@@ -5540,7 +5540,7 @@
 			<field name="code">1020</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4875">
@@ -5548,7 +5548,7 @@
 			<field name="code">4875</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4874">
@@ -5556,7 +5556,7 @@
 			<field name="code">4874</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2649">
@@ -5564,7 +5564,7 @@
 			<field name="code">2649</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_0616">
@@ -5572,7 +5572,7 @@
 			<field name="code">0616</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2465"/>
 		</record>
 		<record model="account.account.template" id="account_4871">
@@ -5580,7 +5580,7 @@
 			<field name="code">4871</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_0640">
@@ -5588,7 +5588,7 @@
 			<field name="code">0640</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_3400">
@@ -5596,7 +5596,7 @@
 			<field name="code">3400</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4872">
@@ -5604,7 +5604,7 @@
 			<field name="code">4872</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4879">
@@ -5612,7 +5612,7 @@
 			<field name="code">4879</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1820">
@@ -5620,7 +5620,7 @@
 			<field name="code">1820</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_2140">
@@ -5628,7 +5628,7 @@
 			<field name="code">2140</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2792">
@@ -5636,7 +5636,7 @@
 			<field name="code">2792</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4975">
@@ -5644,7 +5644,7 @@
 			<field name="code">4975</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2790">
@@ -5652,7 +5652,7 @@
 			<field name="code">2790</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8731">
@@ -5660,7 +5660,7 @@
 			<field name="code">8731</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1380">
@@ -5668,7 +5668,7 @@
 			<field name="code">1380</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2794">
@@ -5676,7 +5676,7 @@
 			<field name="code">2794</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8980">
@@ -5684,7 +5684,7 @@
 			<field name="code">8980</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_8516">
@@ -5692,7 +5692,7 @@
 			<field name="code">8516</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4700">
@@ -5700,7 +5700,7 @@
 			<field name="code">4700</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_4668">
@@ -5708,7 +5708,7 @@
 			<field name="code">4668</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1920">
@@ -5716,7 +5716,7 @@
 			<field name="code">1920</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_8515">
@@ -5724,7 +5724,7 @@
 			<field name="code">8515</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8320">
@@ -5732,7 +5732,7 @@
 			<field name="code">8320</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4280">
@@ -5740,7 +5740,7 @@
 			<field name="code">4280</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0520">
@@ -5748,7 +5748,7 @@
 			<field name="code">0520</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1310"/>
 		</record>
 		<record model="account.account.template" id="account_8609">
@@ -5756,7 +5756,7 @@
 			<field name="code">8609</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8510">
@@ -5764,7 +5764,7 @@
 			<field name="code">8510</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0525">
@@ -5772,7 +5772,7 @@
 			<field name="code">0525</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1320"/>
 		</record>
 		<record model="account.account.template" id="account_0910">
@@ -5780,7 +5780,7 @@
 			<field name="code">0910</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_4120">
@@ -5788,7 +5788,7 @@
 			<field name="code">4120</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4127">
@@ -5796,7 +5796,7 @@
 			<field name="code">4127</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4126">
@@ -5804,7 +5804,7 @@
 			<field name="code">4126</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4125">
@@ -5812,7 +5812,7 @@
 			<field name="code">4125</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4124">
@@ -5820,7 +5820,7 @@
 			<field name="code">4124</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_2666">
@@ -5828,7 +5828,7 @@
 			<field name="code">2666</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_2660">
@@ -5836,7 +5836,7 @@
 			<field name="code">2660</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0159">
@@ -5844,7 +5844,7 @@
 			<field name="code">0159</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0880">
@@ -5852,7 +5852,7 @@
 			<field name="code">0880</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_8960">
@@ -5860,7 +5860,7 @@
 			<field name="code">8960</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1040"/>
 		</record>
 		<record model="account.account.template" id="account_1775">
@@ -5868,7 +5868,7 @@
 			<field name="code">1775</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_4882">
@@ -5876,7 +5876,7 @@
 			<field name="code">4882</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1776">
@@ -5884,7 +5884,7 @@
 			<field name="code">1776</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_8518">
@@ -5892,7 +5892,7 @@
 			<field name="code">8518</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0764">
@@ -5900,7 +5900,7 @@
 			<field name="code">0764</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1771">
@@ -5908,7 +5908,7 @@
 			<field name="code">1771</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1567">
@@ -5916,7 +5916,7 @@
 			<field name="code">1567</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1746">
@@ -5924,7 +5924,7 @@
 			<field name="code">1746</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1770">
@@ -5932,7 +5932,7 @@
 			<field name="code">1770</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_0299">
@@ -5940,7 +5940,7 @@
 			<field name="code">0299</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_1641">
@@ -5948,7 +5948,7 @@
 			<field name="code">1641</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2525"/>
 		</record>
 		<record model="account.account.template" id="account_1640">
@@ -5956,7 +5956,7 @@
 			<field name="code">1640</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4750">
@@ -5964,7 +5964,7 @@
 			<field name="code">4750</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_0290">
@@ -5972,7 +5972,7 @@
 			<field name="code">0290</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0731">
@@ -5980,7 +5980,7 @@
 			<field name="code">0731</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1722">
@@ -5988,7 +5988,7 @@
 			<field name="code">1722</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_1490"/>
 		</record>
 		<record model="account.account.template" id="account_1648">
@@ -5996,7 +5996,7 @@
 			<field name="code">1648</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2520"/>
 		</record>
 		<record model="account.account.template" id="account_1720">
@@ -6004,7 +6004,7 @@
 			<field name="code">1720</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2480"/>
 		</record>
 		<record model="account.account.template" id="account_1721">
@@ -6012,7 +6012,7 @@
 			<field name="code">1721</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2480"/>
 		</record>
 		<record model="account.account.template" id="account_8817">
@@ -6020,7 +6020,7 @@
 			<field name="code">8817</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0595">
@@ -6028,7 +6028,7 @@
 			<field name="code">0595</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1330"/>
 		</record>
 		<record model="account.account.template" id="account_0590">
@@ -6036,7 +6036,7 @@
 			<field name="code">0590</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1325"/>
 		</record>
 		<record model="account.account.template" id="account_0985">
@@ -6044,7 +6044,7 @@
 			<field name="code">0985</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1680"/>
 		</record>
 		<record model="account.account.template" id="account_0984">
@@ -6052,7 +6052,7 @@
 			<field name="code">0984</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1680"/>
 		</record>
 		<record model="account.account.template" id="account_0986">
@@ -6060,7 +6060,7 @@
 			<field name="code">0986</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1680"/>
 		</record>
 		<record model="account.account.template" id="account_0980">
@@ -6068,7 +6068,7 @@
 			<field name="code">0980</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1680"/>
 		</record>
 		<record model="account.account.template" id="account_0983">
@@ -6076,7 +6076,7 @@
 			<field name="code">0983</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1700"/>
 		</record>
 		<record model="account.account.template" id="account_0450">
@@ -6084,7 +6084,7 @@
 			<field name="code">0450</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_0178">
@@ -6092,7 +6092,7 @@
 			<field name="code">0178</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0179">
@@ -6100,7 +6100,7 @@
 			<field name="code">0179</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8100">
@@ -6108,7 +6108,7 @@
 			<field name="code">8100</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8748">
@@ -6116,7 +6116,7 @@
 			<field name="code">8748</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0170">
@@ -6124,7 +6124,7 @@
 			<field name="code">0170</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3750">
@@ -6132,7 +6132,7 @@
 			<field name="code">3750</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8745">
@@ -6140,7 +6140,7 @@
 			<field name="code">8745</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8743">
@@ -6148,7 +6148,7 @@
 			<field name="code">8743</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0175">
@@ -6156,7 +6156,7 @@
 			<field name="code">0175</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0176">
@@ -6164,7 +6164,7 @@
 			<field name="code">0176</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0177">
@@ -6172,7 +6172,7 @@
 			<field name="code">0177</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4632">
@@ -6180,7 +6180,7 @@
 			<field name="code">4632</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4631">
@@ -6188,7 +6188,7 @@
 			<field name="code">4631</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4630">
@@ -6196,7 +6196,7 @@
 			<field name="code">4630</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4637">
@@ -6204,7 +6204,7 @@
 			<field name="code">4637</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_3000">
@@ -6212,7 +6212,7 @@
 			<field name="code">3000</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4635">
@@ -6220,7 +6220,7 @@
 			<field name="code">4635</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4638">
@@ -6228,7 +6228,7 @@
 			<field name="code">4638</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2200">
@@ -6236,7 +6236,7 @@
 			<field name="code">2200</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1371">
@@ -6244,7 +6244,7 @@
 			<field name="code">1371</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1588">
@@ -6252,7 +6252,7 @@
 			<field name="code">1588</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2203">
@@ -6260,7 +6260,7 @@
 			<field name="code">2203</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2204">
@@ -6268,7 +6268,7 @@
 			<field name="code">2204</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_0180">
@@ -6276,7 +6276,7 @@
 			<field name="code">0180</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_2206">
@@ -6284,7 +6284,7 @@
 			<field name="code">2206</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1370">
@@ -6292,7 +6292,7 @@
 			<field name="code">1370</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2208">
@@ -6300,7 +6300,7 @@
 			<field name="code">2208</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2209">
@@ -6308,7 +6308,7 @@
 			<field name="code">2209</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1580">
@@ -6316,7 +6316,7 @@
 			<field name="code">1580</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1581">
@@ -6324,7 +6324,7 @@
 			<field name="code">1581</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0189">
@@ -6332,7 +6332,7 @@
 			<field name="code">0189</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_1587">
@@ -6340,7 +6340,7 @@
 			<field name="code">1587</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1584">
@@ -6348,7 +6348,7 @@
 			<field name="code">1584</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1585">
@@ -6356,7 +6356,7 @@
 			<field name="code">1585</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0770">
@@ -6364,7 +6364,7 @@
 			<field name="code">0770</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0771">
@@ -6372,7 +6372,7 @@
 			<field name="code">0771</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0777">
@@ -6380,7 +6380,7 @@
 			<field name="code">0777</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0774">
@@ -6388,7 +6388,7 @@
 			<field name="code">0774</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_2150">
@@ -6396,7 +6396,7 @@
 			<field name="code">2150</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0670">
@@ -6404,7 +6404,7 @@
 			<field name="code">0670</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2470"/>
 		</record>
 		<record model="account.account.template" id="account_8105">
@@ -6412,7 +6412,7 @@
 			<field name="code">8105</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0350">
@@ -6420,7 +6420,7 @@
 			<field name="code">0350</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1210">
@@ -6428,7 +6428,7 @@
 			<field name="code">1210</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4270">
@@ -6436,7 +6436,7 @@
 			<field name="code">4270</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0001">
@@ -6444,7 +6444,7 @@
 			<field name="code">0001</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1050"/>
 		</record>
 		<record model="account.account.template" id="account_1352">
@@ -6452,7 +6452,7 @@
 			<field name="code">1352</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1350">
@@ -6460,7 +6460,7 @@
 			<field name="code">1350</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1355">
@@ -6468,7 +6468,7 @@
 			<field name="code">1355</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4780">
@@ -6476,7 +6476,7 @@
 			<field name="code">4780</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1860">
@@ -6484,7 +6484,7 @@
 			<field name="code">1860</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4810">
@@ -6492,7 +6492,7 @@
 			<field name="code">4810</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1869">
@@ -6500,7 +6500,7 @@
 			<field name="code">1869</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_3725">
@@ -6508,7 +6508,7 @@
 			<field name="code">3725</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3726">
@@ -6516,7 +6516,7 @@
 			<field name="code">3726</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3727">
@@ -6524,7 +6524,7 @@
 			<field name="code">3727</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3720">
@@ -6532,7 +6532,7 @@
 			<field name="code">3720</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3722">
@@ -6540,7 +6540,7 @@
 			<field name="code">3722</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3723">
@@ -6548,7 +6548,7 @@
 			<field name="code">3723</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4930">
@@ -6556,7 +6556,7 @@
 			<field name="code">4930</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4680">
@@ -6564,7 +6564,7 @@
 			<field name="code">4680</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2895">
@@ -6572,7 +6572,7 @@
 			<field name="code">2895</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_2894">
@@ -6580,7 +6580,7 @@
 			<field name="code">2894</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_4833">
@@ -6588,7 +6588,7 @@
 			<field name="code">4833</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4832">
@@ -6596,7 +6596,7 @@
 			<field name="code">4832</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2891">
@@ -6604,7 +6604,7 @@
 			<field name="code">2891</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_2890">
@@ -6612,7 +6612,7 @@
 			<field name="code">2890</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_2893">
@@ -6620,7 +6620,7 @@
 			<field name="code">2893</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_2892">
@@ -6628,7 +6628,7 @@
 			<field name="code">2892</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1324"/>
 		</record>
 		<record model="account.account.template" id="account_8589">
@@ -6636,7 +6636,7 @@
 			<field name="code">8589</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0070">
@@ -6644,7 +6644,7 @@
 			<field name="code">0070</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2109">
@@ -6652,7 +6652,7 @@
 			<field name="code">2109</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2108">
@@ -6660,7 +6660,7 @@
 			<field name="code">2108</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_0075">
@@ -6668,7 +6668,7 @@
 			<field name="code">0075</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1451">
@@ -6676,7 +6676,7 @@
 			<field name="code">1451</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1100">
@@ -6684,7 +6684,7 @@
 			<field name="code">1100</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_2103">
@@ -6692,7 +6692,7 @@
 			<field name="code">2103</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_1517">
@@ -6700,7 +6700,7 @@
 			<field name="code">1517</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1480"/>
 		</record>
 		<record model="account.account.template" id="account_2100">
@@ -6708,7 +6708,7 @@
 			<field name="code">2100</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2107">
@@ -6716,7 +6716,7 @@
 			<field name="code">2107</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2106">
@@ -6724,7 +6724,7 @@
 			<field name="code">2106</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2105">
@@ -6732,7 +6732,7 @@
 			<field name="code">2105</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2104">
@@ -6740,7 +6740,7 @@
 			<field name="code">2104</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_2734">
@@ -6748,7 +6748,7 @@
 			<field name="code">2734</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2735">
@@ -6756,7 +6756,7 @@
 			<field name="code">2735</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2736">
@@ -6764,7 +6764,7 @@
 			<field name="code">2736</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2730">
@@ -6772,7 +6772,7 @@
 			<field name="code">2730</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2731">
@@ -6780,7 +6780,7 @@
 			<field name="code">2731</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2732">
@@ -6788,7 +6788,7 @@
 			<field name="code">2732</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2733">
@@ -6796,7 +6796,7 @@
 			<field name="code">2733</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2738">
@@ -6804,7 +6804,7 @@
 			<field name="code">2738</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2739">
@@ -6812,7 +6812,7 @@
 			<field name="code">2739</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0767">
@@ -6820,7 +6820,7 @@
 			<field name="code">0767</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0956">
@@ -6828,7 +6828,7 @@
 			<field name="code">0956</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_0957">
@@ -6836,7 +6836,7 @@
 			<field name="code">0957</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_0955">
@@ -6844,7 +6844,7 @@
 			<field name="code">0955</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_0950">
@@ -6852,7 +6852,7 @@
 			<field name="code">0950</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2380"/>
 		</record>
 		<record model="account.account.template" id="account_4993">
@@ -6860,7 +6860,7 @@
 			<field name="code">4993</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1810">
@@ -6868,7 +6868,7 @@
 			<field name="code">1810</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_3430">
@@ -6876,7 +6876,7 @@
 			<field name="code">3430</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3435">
@@ -6884,7 +6884,7 @@
 			<field name="code">3435</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2740">
@@ -6892,7 +6892,7 @@
 			<field name="code">2740</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2743">
@@ -6900,7 +6900,7 @@
 			<field name="code">2743</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2742">
@@ -6908,7 +6908,7 @@
 			<field name="code">2742</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2744">
@@ -6916,7 +6916,7 @@
 			<field name="code">2744</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2747">
@@ -6924,7 +6924,7 @@
 			<field name="code">2747</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2746">
@@ -6932,7 +6932,7 @@
 			<field name="code">2746</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4840">
@@ -6940,7 +6940,7 @@
 			<field name="code">4840</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4841">
@@ -6948,7 +6948,7 @@
 			<field name="code">4841</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4842">
@@ -6956,7 +6956,7 @@
 			<field name="code">4842</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4843">
@@ -6964,7 +6964,7 @@
 			<field name="code">4843</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4167">
@@ -6972,7 +6972,7 @@
 			<field name="code">4167</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4100">
@@ -6980,7 +6980,7 @@
 			<field name="code">4100</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_8315">
@@ -6988,7 +6988,7 @@
 			<field name="code">8315</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0781">
@@ -6996,7 +6996,7 @@
 			<field name="code">0781</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0780">
@@ -7004,7 +7004,7 @@
 			<field name="code">0780</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_0787">
@@ -7012,7 +7012,7 @@
 			<field name="code">0787</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_0784">
@@ -7020,7 +7020,7 @@
 			<field name="code">0784</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_4790">
@@ -7028,7 +7028,7 @@
 			<field name="code">4790</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1609">
@@ -7036,7 +7036,7 @@
 			<field name="code">1609</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_4150">
@@ -7044,7 +7044,7 @@
 			<field name="code">4150</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0410">
@@ -7052,7 +7052,7 @@
 			<field name="code">0410</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_3540">
@@ -7060,7 +7060,7 @@
 			<field name="code">3540</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4925">
@@ -7068,7 +7068,7 @@
 			<field name="code">4925</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4155">
@@ -7076,7 +7076,7 @@
 			<field name="code">4155</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1601">
@@ -7084,7 +7084,7 @@
 			<field name="code">1601</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1600">
@@ -7092,7 +7092,7 @@
 			<field name="code">1600</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_8720">
@@ -7100,7 +7100,7 @@
 			<field name="code">8720</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1605">
@@ -7108,7 +7108,7 @@
 			<field name="code">1605</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1607">
@@ -7116,7 +7116,7 @@
 			<field name="code">1607</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_1606">
@@ -7124,7 +7124,7 @@
 			<field name="code">1606</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">payable</field>
-			<field name="user_type" ref="account.account_type_payable"/>
+			<field name="user_type" ref="account.data_account_type_payable"/>
 			<field name="parent_id" ref="view_balance_2495"/>
 		</record>
 		<record model="account.account.template" id="account_8950">
@@ -7132,7 +7132,7 @@
 			<field name="code">8950</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8910">
@@ -7140,7 +7140,7 @@
 			<field name="code">8910</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8819">
@@ -7148,7 +7148,7 @@
 			<field name="code">8819</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1574">
@@ -7156,7 +7156,7 @@
 			<field name="code">1574</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_8853">
@@ -7164,7 +7164,7 @@
 			<field name="code">8853</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8852">
@@ -7172,7 +7172,7 @@
 			<field name="code">8852</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0550">
@@ -7180,7 +7180,7 @@
 			<field name="code">0550</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1325"/>
 		</record>
 		<record model="account.account.template" id="account_4955">
@@ -7188,7 +7188,7 @@
 			<field name="code">4955</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_3980">
@@ -7196,7 +7196,7 @@
 			<field name="code">3980</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1470"/>
 		</record>
 		<record model="account.account.template" id="account_8337">
@@ -7204,7 +7204,7 @@
 			<field name="code">8337</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1788">
@@ -7212,7 +7212,7 @@
 			<field name="code">1788</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1789">
@@ -7220,7 +7220,7 @@
 			<field name="code">1789</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1780">
@@ -7228,7 +7228,7 @@
 			<field name="code">1780</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1781">
@@ -7236,7 +7236,7 @@
 			<field name="code">1781</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1782">
@@ -7244,7 +7244,7 @@
 			<field name="code">1782</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1783">
@@ -7252,7 +7252,7 @@
 			<field name="code">1783</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1784">
@@ -7260,7 +7260,7 @@
 			<field name="code">1784</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1785">
@@ -7268,7 +7268,7 @@
 			<field name="code">1785</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1786">
@@ -7276,7 +7276,7 @@
 			<field name="code">1786</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1787">
@@ -7284,7 +7284,7 @@
 			<field name="code">1787</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_7110">
@@ -7292,7 +7292,7 @@
 			<field name="code">7110</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1470"/>
 		</record>
 		<record model="account.account.template" id="account_4169">
@@ -7300,7 +7300,7 @@
 			<field name="code">4169</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_4288">
@@ -7308,7 +7308,7 @@
 			<field name="code">4288</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4290">
@@ -7316,7 +7316,7 @@
 			<field name="code">4290</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2323">
@@ -7324,7 +7324,7 @@
 			<field name="code">2323</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1774">
@@ -7332,7 +7332,7 @@
 			<field name="code">1774</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1777">
@@ -7340,7 +7340,7 @@
 			<field name="code">1777</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_2320">
@@ -7348,7 +7348,7 @@
 			<field name="code">2320</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2327">
@@ -7356,7 +7356,7 @@
 			<field name="code">2327</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2326">
@@ -7364,7 +7364,7 @@
 			<field name="code">2326</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2325">
@@ -7372,7 +7372,7 @@
 			<field name="code">2325</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1772">
@@ -7380,7 +7380,7 @@
 			<field name="code">1772</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_8930">
@@ -7388,7 +7388,7 @@
 			<field name="code">8930</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_7050">
@@ -7396,7 +7396,7 @@
 			<field name="code">7050</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1460"/>
 		</record>
 		<record model="account.account.template" id="account_2328">
@@ -7404,7 +7404,7 @@
 			<field name="code">2328</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1779">
@@ -7412,7 +7412,7 @@
 			<field name="code">1779</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1778">
@@ -7420,7 +7420,7 @@
 			<field name="code">1778</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_4140">
@@ -7428,7 +7428,7 @@
 			<field name="code">4140</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_8924">
@@ -7436,7 +7436,7 @@
 			<field name="code">8924</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_8746">
@@ -7444,7 +7444,7 @@
 			<field name="code">8746</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_8931">
@@ -7452,7 +7452,7 @@
 			<field name="code">8931</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_0300">
@@ -7460,7 +7460,7 @@
 			<field name="code">0300</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_3760">
@@ -7468,7 +7468,7 @@
 			<field name="code">3760</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4138">
@@ -7476,7 +7476,7 @@
 			<field name="code">4138</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_3764">
@@ -7484,7 +7484,7 @@
 			<field name="code">3764</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_0120">
@@ -7492,7 +7492,7 @@
 			<field name="code">0120</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_0040">
@@ -7500,7 +7500,7 @@
 			<field name="code">0040</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1130"/>
 		</record>
 		<record model="account.account.template" id="account_3769">
@@ -7508,7 +7508,7 @@
 			<field name="code">3769</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8829">
@@ -7516,7 +7516,7 @@
 			<field name="code">8829</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0129">
@@ -7524,7 +7524,7 @@
 			<field name="code">0129</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1230"/>
 		</record>
 		<record model="account.account.template" id="account_8630">
@@ -7532,7 +7532,7 @@
 			<field name="code">8630</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_3135">
@@ -7540,7 +7540,7 @@
 			<field name="code">3135</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4560">
@@ -7548,7 +7548,7 @@
 			<field name="code">4560</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_3130">
@@ -7556,7 +7556,7 @@
 			<field name="code">3130</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1561">
@@ -7564,7 +7564,7 @@
 			<field name="code">1561</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_8801">
@@ -7572,7 +7572,7 @@
 			<field name="code">8801</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1290">
@@ -7580,7 +7580,7 @@
 			<field name="code">1290</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_0535">
@@ -7588,7 +7588,7 @@
 			<field name="code">0535</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1320"/>
 		</record>
 		<record model="account.account.template" id="account_1551">
@@ -7596,7 +7596,7 @@
 			<field name="code">1551</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1550">
@@ -7604,7 +7604,7 @@
 			<field name="code">1550</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1555">
@@ -7612,7 +7612,7 @@
 			<field name="code">1555</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_8932">
@@ -7620,7 +7620,7 @@
 			<field name="code">8932</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1557">
@@ -7628,7 +7628,7 @@
 			<field name="code">1557</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1556">
@@ -7636,7 +7636,7 @@
 			<field name="code">1556</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1559">
@@ -7644,7 +7644,7 @@
 			<field name="code">1559</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2490">
@@ -7652,7 +7652,7 @@
 			<field name="code">2490</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2493">
@@ -7660,7 +7660,7 @@
 			<field name="code">2493</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2492">
@@ -7668,7 +7668,7 @@
 			<field name="code">2492</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2494">
@@ -7676,7 +7676,7 @@
 			<field name="code">2494</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2990">
@@ -7684,7 +7684,7 @@
 			<field name="code">2990</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0600">
@@ -7692,7 +7692,7 @@
 			<field name="code">0600</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2467"/>
 		</record>
 		<record model="account.account.template" id="account_0601">
@@ -7700,7 +7700,7 @@
 			<field name="code">0601</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2467"/>
 		</record>
 		<record model="account.account.template" id="account_2501">
@@ -7708,7 +7708,7 @@
 			<field name="code">2501</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2390">
@@ -7716,7 +7716,7 @@
 			<field name="code">2390</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_0605">
@@ -7724,7 +7724,7 @@
 			<field name="code">0605</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2460"/>
 		</record>
 		<record model="account.account.template" id="account_1410">
@@ -7732,7 +7732,7 @@
 			<field name="code">1410</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_2255">
@@ -7740,7 +7740,7 @@
 			<field name="code">2255</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1295">
@@ -7748,7 +7748,7 @@
 			<field name="code">1295</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4640">
@@ -7756,7 +7756,7 @@
 			<field name="code">4640</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2250">
@@ -7764,7 +7764,7 @@
 			<field name="code">2250</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_1322">
@@ -7772,7 +7772,7 @@
 			<field name="code">1322</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1555"/>
 		</record>
 		<record model="account.account.template" id="account_1320">
@@ -7780,7 +7780,7 @@
 			<field name="code">1320</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1321">
@@ -7788,7 +7788,7 @@
 			<field name="code">1321</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1327">
@@ -7796,7 +7796,7 @@
 			<field name="code">1327</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1640"/>
 		</record>
 		<record model="account.account.template" id="account_1325">
@@ -7804,7 +7804,7 @@
 			<field name="code">1325</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1329">
@@ -7812,7 +7812,7 @@
 			<field name="code">1329</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1640"/>
 		</record>
 		<record model="account.account.template" id="account_4852">
@@ -7820,7 +7820,7 @@
 			<field name="code">4852</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_8519">
@@ -7828,7 +7828,7 @@
 			<field name="code">8519</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4670">
@@ -7836,7 +7836,7 @@
 			<field name="code">4670</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0870">
@@ -7844,7 +7844,7 @@
 			<field name="code">0870</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_8135">
@@ -7852,7 +7852,7 @@
 			<field name="code">8135</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4200">
@@ -7860,7 +7860,7 @@
 			<field name="code">4200</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_0920">
@@ -7868,7 +7868,7 @@
 			<field name="code">0920</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_8130">
@@ -7876,7 +7876,7 @@
 			<field name="code">8130</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4800">
@@ -7884,7 +7884,7 @@
 			<field name="code">4800</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1250"/>
 		</record>
 		<record model="account.account.template" id="account_1568">
@@ -7892,7 +7892,7 @@
 			<field name="code">1568</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4636">
@@ -7900,7 +7900,7 @@
 			<field name="code">4636</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_4805">
@@ -7908,7 +7908,7 @@
 			<field name="code">4805</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1250"/>
 		</record>
 		<record model="account.account.template" id="account_4806">
@@ -7916,7 +7916,7 @@
 			<field name="code">4806</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1250"/>
 		</record>
 		<record model="account.account.template" id="account_4876">
@@ -7924,7 +7924,7 @@
 			<field name="code">4876</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1850">
@@ -7932,7 +7932,7 @@
 			<field name="code">1850</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4809">
@@ -7940,7 +7940,7 @@
 			<field name="code">4809</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1250"/>
 		</record>
 		<record model="account.account.template" id="account_4949">
@@ -7948,7 +7948,7 @@
 			<field name="code">4949</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1525">
@@ -7956,7 +7956,7 @@
 			<field name="code">1525</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1526">
@@ -7964,7 +7964,7 @@
 			<field name="code">1526</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1527">
@@ -7972,7 +7972,7 @@
 			<field name="code">1527</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1585"/>
 		</record>
 		<record model="account.account.template" id="account_2176">
@@ -7980,7 +7980,7 @@
 			<field name="code">2176</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1521">
@@ -7988,7 +7988,7 @@
 			<field name="code">1521</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1250">
@@ -7996,7 +7996,7 @@
 			<field name="code">1250</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4965">
@@ -8004,7 +8004,7 @@
 			<field name="code">4965</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0761">
@@ -8012,7 +8012,7 @@
 			<field name="code">0761</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1528">
@@ -8020,7 +8020,7 @@
 			<field name="code">1528</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1529">
@@ -8028,7 +8028,7 @@
 			<field name="code">1529</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_4961">
@@ -8036,7 +8036,7 @@
 			<field name="code">4961</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1390">
@@ -8044,7 +8044,7 @@
 			<field name="code">1390</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2600">
@@ -8052,7 +8052,7 @@
 			<field name="code">2600</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_8705">
@@ -8060,7 +8060,7 @@
 			<field name="code">8705</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_2375">
@@ -8068,7 +8068,7 @@
 			<field name="code">2375</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_1930">
@@ -8076,7 +8076,7 @@
 			<field name="code">1930</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_0900">
@@ -8084,7 +8084,7 @@
 			<field name="code">0900</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2030"/>
 		</record>
 		<record model="account.account.template" id="account_4110">
@@ -8092,7 +8092,7 @@
 			<field name="code">4110</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_8945">
@@ -8100,7 +8100,7 @@
 			<field name="code">8945</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4873">
@@ -8108,7 +8108,7 @@
 			<field name="code">4873</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2205">
@@ -8116,7 +8116,7 @@
 			<field name="code">2205</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_4890">
@@ -8124,7 +8124,7 @@
 			<field name="code">4890</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_7080">
@@ -8132,7 +8132,7 @@
 			<field name="code">7080</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1460"/>
 		</record>
 		<record model="account.account.template" id="account_7090">
@@ -8140,7 +8140,7 @@
 			<field name="code">7090</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1465"/>
 		</record>
 		<record model="account.account.template" id="account_0518">
@@ -8148,7 +8148,7 @@
 			<field name="code">0518</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_0519">
@@ -8156,7 +8156,7 @@
 			<field name="code">0519</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_0516">
@@ -8164,7 +8164,7 @@
 			<field name="code">0516</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_0517">
@@ -8172,7 +8172,7 @@
 			<field name="code">0517</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_3505">
@@ -8180,7 +8180,7 @@
 			<field name="code">3505</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_0510">
@@ -8188,7 +8188,7 @@
 			<field name="code">0510</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1300"/>
 		</record>
 		<record model="account.account.template" id="account_1582">
@@ -8196,7 +8196,7 @@
 			<field name="code">1582</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1583">
@@ -8204,7 +8204,7 @@
 			<field name="code">1583</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2679">
@@ -8212,7 +8212,7 @@
 			<field name="code">2679</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1322"/>
 		</record>
 		<record model="account.account.template" id="account_0999">
@@ -8220,7 +8220,7 @@
 			<field name="code">0999</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1535"/>
 		</record>
 		<record model="account.account.template" id="account_4998">
@@ -8228,7 +8228,7 @@
 			<field name="code">4998</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_8918">
@@ -8236,7 +8236,7 @@
 			<field name="code">8918</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_4663">
@@ -8244,7 +8244,7 @@
 			<field name="code">4663</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_8614">
@@ -8252,7 +8252,7 @@
 			<field name="code">8614</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1090"/>
 		</record>
 		<record model="account.account.template" id="account_1739">
@@ -8260,7 +8260,7 @@
 			<field name="code">1739</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1738">
@@ -8268,7 +8268,7 @@
 			<field name="code">1738</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1635">
@@ -8276,7 +8276,7 @@
 			<field name="code">1635</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2510"/>
 		</record>
 		<record model="account.account.template" id="account_1980">
@@ -8284,7 +8284,7 @@
 			<field name="code">1980</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4999">
@@ -8292,7 +8292,7 @@
 			<field name="code">4999</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_1638">
@@ -8300,7 +8300,7 @@
 			<field name="code">1638</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2510"/>
 		</record>
 		<record model="account.account.template" id="account_1730">
@@ -8308,7 +8308,7 @@
 			<field name="code">1730</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1733">
@@ -8316,7 +8316,7 @@
 			<field name="code">1733</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1732">
@@ -8324,7 +8324,7 @@
 			<field name="code">1732</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1735">
@@ -8332,7 +8332,7 @@
 			<field name="code">1735</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1734">
@@ -8340,7 +8340,7 @@
 			<field name="code">1734</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2530"/>
 		</record>
 		<record model="account.account.template" id="account_1737">
@@ -8348,7 +8348,7 @@
 			<field name="code">1737</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1736">
@@ -8356,7 +8356,7 @@
 			<field name="code">1736</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_0580">
@@ -8364,7 +8364,7 @@
 			<field name="code">0580</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1325"/>
 		</record>
 		<record model="account.account.template" id="account_8820">
@@ -8372,7 +8372,7 @@
 			<field name="code">8820</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_8827">
@@ -8380,7 +8380,7 @@
 			<field name="code">8827</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_0460">
@@ -8388,7 +8388,7 @@
 			<field name="code">0460</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_1195">
@@ -8396,7 +8396,7 @@
 			<field name="code">1195</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_1446">
@@ -8404,7 +8404,7 @@
 			<field name="code">1446</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_0240">
@@ -8412,7 +8412,7 @@
 			<field name="code">0240</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1210"/>
 		</record>
 		<record model="account.account.template" id="account_3600">
@@ -8420,7 +8420,7 @@
 			<field name="code">3600</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_8770">
@@ -8428,7 +8428,7 @@
 			<field name="code">8770</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0160">
@@ -8436,7 +8436,7 @@
 			<field name="code">0160</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_0165">
@@ -8444,7 +8444,7 @@
 			<field name="code">0165</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1595">
@@ -8452,7 +8452,7 @@
 			<field name="code">1595</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1594">
@@ -8460,7 +8460,7 @@
 			<field name="code">1594</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1540"/>
 		</record>
 		<record model="account.account.template" id="account_1597">
@@ -8468,7 +8468,7 @@
 			<field name="code">1597</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_1596">
@@ -8476,7 +8476,7 @@
 			<field name="code">1596</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1545"/>
 		</record>
 		<record model="account.account.template" id="account_1590">
@@ -8484,7 +8484,7 @@
 			<field name="code">1590</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1593">
@@ -8492,7 +8492,7 @@
 			<field name="code">1593</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1592">
@@ -8500,7 +8500,7 @@
 			<field name="code">1592</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1599">
@@ -8508,7 +8508,7 @@
 			<field name="code">1599</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1555"/>
 		</record>
 		<record model="account.account.template" id="account_1598">
@@ -8516,7 +8516,7 @@
 			<field name="code">1598</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1550"/>
 		</record>
 		<record model="account.account.template" id="account_4600">
@@ -8524,7 +8524,7 @@
 			<field name="code">4600</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2213">
@@ -8532,7 +8532,7 @@
 			<field name="code">2213</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2212">
@@ -8540,7 +8540,7 @@
 			<field name="code">2212</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2210">
@@ -8548,7 +8548,7 @@
 			<field name="code">2210</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_4865">
@@ -8556,7 +8556,7 @@
 			<field name="code">4865</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_2216">
@@ -8564,7 +8564,7 @@
 			<field name="code">2216</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2215">
@@ -8572,7 +8572,7 @@
 			<field name="code">2215</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2214">
@@ -8580,7 +8580,7 @@
 			<field name="code">2214</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2219">
@@ -8588,7 +8588,7 @@
 			<field name="code">2219</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_2218">
@@ -8596,7 +8596,7 @@
 			<field name="code">2218</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1355"/>
 		</record>
 		<record model="account.account.template" id="account_8735">
@@ -8604,7 +8604,7 @@
 			<field name="code">8735</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_1748">
@@ -8612,7 +8612,7 @@
 			<field name="code">1748</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1749">
@@ -8620,7 +8620,7 @@
 			<field name="code">1749</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1744">
@@ -8628,7 +8628,7 @@
 			<field name="code">1744</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_1745">
@@ -8636,7 +8636,7 @@
 			<field name="code">1745</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_2350">
@@ -8644,7 +8644,7 @@
 			<field name="code">2350</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_1747">
@@ -8652,7 +8652,7 @@
 			<field name="code">1747</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1740">
@@ -8660,7 +8660,7 @@
 			<field name="code">1740</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2539"/>
 		</record>
 		<record model="account.account.template" id="account_1741">
@@ -8668,7 +8668,7 @@
 			<field name="code">1741</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2535"/>
 		</record>
 		<record model="account.account.template" id="account_1742">
@@ -8676,7 +8676,7 @@
 			<field name="code">1742</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_1743">
@@ -8684,7 +8684,7 @@
 			<field name="code">1743</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2537"/>
 		</record>
 		<record model="account.account.template" id="account_0015">
@@ -8692,7 +8692,7 @@
 			<field name="code">0015</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4366">
@@ -8700,7 +8700,7 @@
 			<field name="code">4366</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_4360">
@@ -8708,7 +8708,7 @@
 			<field name="code">4360</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_0010">
@@ -8716,7 +8716,7 @@
 			<field name="code">0010</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2430">
@@ -8724,7 +8724,7 @@
 			<field name="code">2430</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_1200">
@@ -8732,7 +8732,7 @@
 			<field name="code">1200</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1660"/>
 		</record>
 		<record model="account.account.template" id="account_4240">
@@ -8740,7 +8740,7 @@
 			<field name="code">4240</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_4396">
@@ -8748,7 +8748,7 @@
 			<field name="code">4396</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_3736">
@@ -8756,7 +8756,7 @@
 			<field name="code">3736</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3735">
@@ -8764,7 +8764,7 @@
 			<field name="code">3735</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1890">
@@ -8772,7 +8772,7 @@
 			<field name="code">1890</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_3731">
@@ -8780,7 +8780,7 @@
 			<field name="code">3731</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_3730">
@@ -8788,7 +8788,7 @@
 			<field name="code">3730</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4920">
@@ -8796,7 +8796,7 @@
 			<field name="code">4920</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2130">
@@ -8804,7 +8804,7 @@
 			<field name="code">2130</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_4510">
@@ -8812,7 +8812,7 @@
 			<field name="code">4510</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1140"/>
 		</record>
 		<record model="account.account.template" id="account_3100">
@@ -8820,7 +8820,7 @@
 			<field name="code">3100</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4994">
@@ -8828,7 +8828,7 @@
 			<field name="code">4994</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2139">
@@ -8836,7 +8836,7 @@
 			<field name="code">2139</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1310"/>
 		</record>
 		<record model="account.account.template" id="account_1447">
@@ -8844,7 +8844,7 @@
 			<field name="code">1447</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">receivable</field>
-			<field name="user_type" ref="account.account_type_receivable"/>
+			<field name="user_type" ref="account.data_account_type_receivable"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_1569">
@@ -8852,7 +8852,7 @@
 			<field name="code">1569</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1445">
@@ -8860,7 +8860,7 @@
 			<field name="code">1445</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1530"/>
 		</record>
 		<record model="account.account.template" id="account_4995">
@@ -8868,7 +8868,7 @@
 			<field name="code">4995</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_1658">
@@ -8876,7 +8876,7 @@
 			<field name="code">1658</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2490"/>
 		</record>
 		<record model="account.account.template" id="account_1560">
@@ -8884,7 +8884,7 @@
 			<field name="code">1560</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0085">
@@ -8892,7 +8892,7 @@
 			<field name="code">0085</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2505">
@@ -8900,7 +8900,7 @@
 			<field name="code">2505</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1563">
@@ -8908,7 +8908,7 @@
 			<field name="code">1563</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0080">
@@ -8916,7 +8916,7 @@
 			<field name="code">0080</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_1565">
@@ -8924,7 +8924,7 @@
 			<field name="code">1565</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_1566">
@@ -8932,7 +8932,7 @@
 			<field name="code">1566</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2500">
@@ -8940,7 +8940,7 @@
 			<field name="code">2500</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2726">
@@ -8948,7 +8948,7 @@
 			<field name="code">2726</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2725">
@@ -8956,7 +8956,7 @@
 			<field name="code">2725</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_2723">
@@ -8964,7 +8964,7 @@
 			<field name="code">2723</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4990">
@@ -8972,7 +8972,7 @@
 			<field name="code">4990</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1100"/>
 		</record>
 		<record model="account.account.template" id="account_0110">
@@ -8980,7 +8980,7 @@
 			<field name="code">0110</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1200"/>
 		</record>
 		<record model="account.account.template" id="account_2720">
@@ -8988,7 +8988,7 @@
 			<field name="code">2720</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_4991">
@@ -8996,7 +8996,7 @@
 			<field name="code">4991</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1120"/>
 		</record>
 		<record model="account.account.template" id="account_2710">
@@ -9004,7 +9004,7 @@
 			<field name="code">2710</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1323"/>
 		</record>
 		<record model="account.account.template" id="account_1562">
@@ -9012,7 +9012,7 @@
 			<field name="code">1562</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_0949">
@@ -9020,7 +9020,7 @@
 			<field name="code">0949</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2335"/>
 		</record>
 		<record model="account.account.template" id="account_0948">
@@ -9028,7 +9028,7 @@
 			<field name="code">0948</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_0940">
@@ -9036,7 +9036,7 @@
 			<field name="code">0940</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_0943">
@@ -9044,7 +9044,7 @@
 			<field name="code">0943</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_8410">
@@ -9052,7 +9052,7 @@
 			<field name="code">8410</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_0701">
@@ -9060,7 +9060,7 @@
 			<field name="code">0701</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2515"/>
 		</record>
 		<record model="account.account.template" id="account_0947">
@@ -9068,7 +9068,7 @@
 			<field name="code">0947</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2330"/>
 		</record>
 		<record model="account.account.template" id="account_1716">
@@ -9076,7 +9076,7 @@
 			<field name="code">1716</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2485"/>
 		</record>
 		<record model="account.account.template" id="account_3780">
@@ -9084,7 +9084,7 @@
 			<field name="code">3780</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_1761">
@@ -9092,7 +9092,7 @@
 			<field name="code">1761</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2390"/>
 		</record>
 		<record model="account.account.template" id="account_1800">
@@ -9100,7 +9100,7 @@
 			<field name="code">1800</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2060"/>
 		</record>
 		<record model="account.account.template" id="account_4390">
@@ -9108,7 +9108,7 @@
 			<field name="code">4390</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_0310">
@@ -9116,7 +9116,7 @@
 			<field name="code">0310</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1220"/>
 		</record>
 		<record model="account.account.template" id="account_8990">
@@ -9124,7 +9124,7 @@
 			<field name="code">8990</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1045"/>
 		</record>
 		<record model="account.account.template" id="account_3420">
@@ -9132,7 +9132,7 @@
 			<field name="code">3420</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_2170">
@@ -9140,7 +9140,7 @@
 			<field name="code">2170</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_3425">
@@ -9148,7 +9148,7 @@
 			<field name="code">3425</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1060"/>
 		</record>
 		<record model="account.account.template" id="account_4397">
@@ -9156,7 +9156,7 @@
 			<field name="code">4397</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1150"/>
 		</record>
 		<record model="account.account.template" id="account_4996">
@@ -9164,7 +9164,7 @@
 			<field name="code">4996</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_4997">
@@ -9172,7 +9172,7 @@
 			<field name="code">4997</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_2000">
@@ -9180,7 +9180,7 @@
 			<field name="code">2000</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_2001">
@@ -9188,7 +9188,7 @@
 			<field name="code">2001</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_4992">
@@ -9196,7 +9196,7 @@
 			<field name="code">4992</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1260"/>
 		</record>
 		<record model="account.account.template" id="account_0705">
@@ -9204,7 +9204,7 @@
 			<field name="code">0705</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_liability"/>
+			<field name="user_type" ref="account.data_account_type_liability"/>
 			<field name="parent_id" ref="view_balance_2510"/>
 		</record>
 		<record model="account.account.template" id="account_1360">
@@ -9212,7 +9212,7 @@
 			<field name="code">1360</field>
 			<field name="reconcile" eval="True"/>
 			<field name="type">liquidity</field>
-			<field name="user_type" ref="account.account_type_asset"/>
+			<field name="user_type" ref="account.data_account_type_asset"/>
 			<field name="parent_id" ref="view_balance_1580"/>
 		</record>
 		<record model="account.account.template" id="account_2005">
@@ -9220,7 +9220,7 @@
 			<field name="code">2005</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1312"/>
 		</record>
 		<record model="account.account.template" id="account_8340">
@@ -9228,7 +9228,7 @@
 			<field name="code">8340</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_income"/>
+			<field name="user_type" ref="account.data_account_type_income"/>
 			<field name="parent_id" ref="view_income_1020"/>
 		</record>
 		<record model="account.account.template" id="account_4855">
@@ -9236,7 +9236,7 @@
 			<field name="code">4855</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4854">
@@ -9244,7 +9244,7 @@
 			<field name="code">4854</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4853">
@@ -9252,7 +9252,7 @@
 			<field name="code">4853</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4580">
@@ -9260,7 +9260,7 @@
 			<field name="code">4580</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1180"/>
 		</record>
 		<record model="account.account.template" id="account_4851">
@@ -9268,7 +9268,7 @@
 			<field name="code">4851</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
 		<record model="account.account.template" id="account_4850">
@@ -9276,7 +9276,7 @@
 			<field name="code">4850</field>
 			<field name="reconcile" eval="False"/>
 			<field name="type">other</field>
-			<field name="user_type" ref="account.account_type_expense"/>
+			<field name="user_type" ref="account.data_account_type_expense"/>
 			<field name="parent_id" ref="view_income_1240"/>
 		</record>
     
diff --git a/addons/l10n_de/account_chart_skr04.xml b/addons/l10n_de/account_chart_skr04.xml
index 09af6c20e28..b3315ce3b50 100644
--- a/addons/l10n_de/account_chart_skr04.xml
+++ b/addons/l10n_de/account_chart_skr04.xml
@@ -160,7 +160,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_40" model="account.account.template">
@@ -169,7 +169,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA12" model="account.account.template">
@@ -186,7 +186,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_51" model="account.account.template">
@@ -195,7 +195,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_52" model="account.account.template">
@@ -204,7 +204,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_53" model="account.account.template">
@@ -213,7 +213,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_54" model="account.account.template">
@@ -222,7 +222,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_55" model="account.account.template">
@@ -231,7 +231,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_56" model="account.account.template">
@@ -240,7 +240,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_57" model="account.account.template">
@@ -249,7 +249,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_58" model="account.account.template">
@@ -258,7 +258,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_59" model="account.account.template">
@@ -267,7 +267,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_60" model="account.account.template">
@@ -276,7 +276,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_61" model="account.account.template">
@@ -285,7 +285,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_62" model="account.account.template">
@@ -294,7 +294,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_63" model="account.account.template">
@@ -303,7 +303,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_64" model="account.account.template">
@@ -312,7 +312,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_65" model="account.account.template">
@@ -321,7 +321,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_66" model="account.account.template">
@@ -330,7 +330,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_67" model="account.account.template">
@@ -339,7 +339,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_68" model="account.account.template">
@@ -348,7 +348,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_69" model="account.account.template">
@@ -357,7 +357,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_70" model="account.account.template">
@@ -366,7 +366,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_71" model="account.account.template">
@@ -375,7 +375,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_72" model="account.account.template">
@@ -384,7 +384,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_73" model="account.account.template">
@@ -393,7 +393,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_74" model="account.account.template">
@@ -402,7 +402,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_75" model="account.account.template">
@@ -411,7 +411,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_76" model="account.account.template">
@@ -420,7 +420,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_77" model="account.account.template">
@@ -429,7 +429,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_78" model="account.account.template">
@@ -438,7 +438,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_79" model="account.account.template">
@@ -447,7 +447,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_80" model="account.account.template">
@@ -456,7 +456,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_81" model="account.account.template">
@@ -465,7 +465,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_82" model="account.account.template">
@@ -474,7 +474,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_83" model="account.account.template">
@@ -483,7 +483,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_84" model="account.account.template">
@@ -492,7 +492,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_85" model="account.account.template">
@@ -501,7 +501,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_86" model="account.account.template">
@@ -510,7 +510,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_87" model="account.account.template">
@@ -519,7 +519,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_88" model="account.account.template">
@@ -528,7 +528,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_89" model="account.account.template">
@@ -537,7 +537,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA2" model="account.account.template">
@@ -562,7 +562,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA22" model="account.account.template">
@@ -579,7 +579,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA3" model="account.account.template">
@@ -604,7 +604,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_110" model="account.account.template">
@@ -613,7 +613,7 @@
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_120" model="account.account.template">
@@ -622,7 +622,7 @@
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_130" model="account.account.template">
@@ -631,7 +631,7 @@
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_135" model="account.account.template">
@@ -640,7 +640,7 @@
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_140" model="account.account.template">
@@ -649,7 +649,7 @@
       <field name="parent_id" ref="chart_skr04_100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA32" model="account.account.template">
@@ -666,7 +666,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA33" model="account.account.template">
@@ -683,7 +683,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA33"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA34" model="account.account.template">
@@ -700,7 +700,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA34"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_179" model="account.account.template">
@@ -709,7 +709,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA34"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA4" model="account.account.template">
@@ -734,7 +734,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_210" model="account.account.template">
@@ -743,7 +743,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_215" model="account.account.template">
@@ -752,7 +752,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_220" model="account.account.template">
@@ -761,7 +761,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_225" model="account.account.template">
@@ -770,7 +770,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_229" model="account.account.template">
@@ -779,7 +779,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_230" model="account.account.template">
@@ -788,7 +788,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_235" model="account.account.template">
@@ -797,7 +797,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_240" model="account.account.template">
@@ -806,7 +806,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_250" model="account.account.template">
@@ -815,7 +815,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_260" model="account.account.template">
@@ -824,7 +824,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_270" model="account.account.template">
@@ -833,7 +833,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_280" model="account.account.template">
@@ -842,7 +842,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_285" model="account.account.template">
@@ -851,7 +851,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_290" model="account.account.template">
@@ -860,7 +860,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_300" model="account.account.template">
@@ -869,7 +869,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_305" model="account.account.template">
@@ -878,7 +878,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_310" model="account.account.template">
@@ -887,7 +887,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_315" model="account.account.template">
@@ -896,7 +896,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_320" model="account.account.template">
@@ -905,7 +905,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_329" model="account.account.template">
@@ -914,7 +914,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_330" model="account.account.template">
@@ -923,7 +923,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_340" model="account.account.template">
@@ -932,7 +932,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_350" model="account.account.template">
@@ -941,7 +941,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_360" model="account.account.template">
@@ -950,7 +950,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_370" model="account.account.template">
@@ -959,7 +959,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_380" model="account.account.template">
@@ -968,7 +968,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_390" model="account.account.template">
@@ -977,7 +977,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_395" model="account.account.template">
@@ -986,7 +986,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_398" model="account.account.template">
@@ -995,7 +995,7 @@
       <field name="parent_id" ref="chart_skr04_200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA42" model="account.account.template">
@@ -1012,7 +1012,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_420" model="account.account.template">
@@ -1021,7 +1021,7 @@
       <field name="parent_id" ref="chart_skr04_400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_440" model="account.account.template">
@@ -1030,7 +1030,7 @@
       <field name="parent_id" ref="chart_skr04_400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_460" model="account.account.template">
@@ -1039,7 +1039,7 @@
       <field name="parent_id" ref="chart_skr04_400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_470" model="account.account.template">
@@ -1048,7 +1048,7 @@
       <field name="parent_id" ref="chart_skr04_400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA43" model="account.account.template">
@@ -1065,7 +1065,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA43"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_510" model="account.account.template">
@@ -1074,7 +1074,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_520" model="account.account.template">
@@ -1083,7 +1083,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_540" model="account.account.template">
@@ -1092,7 +1092,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_560" model="account.account.template">
@@ -1101,7 +1101,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_620" model="account.account.template">
@@ -1110,7 +1110,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_640" model="account.account.template">
@@ -1119,7 +1119,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_650" model="account.account.template">
@@ -1128,7 +1128,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_660" model="account.account.template">
@@ -1137,7 +1137,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_670" model="account.account.template">
@@ -1146,7 +1146,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_680" model="account.account.template">
@@ -1155,7 +1155,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_690" model="account.account.template">
@@ -1164,7 +1164,7 @@
       <field name="parent_id" ref="chart_skr04_500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA44" model="account.account.template">
@@ -1181,7 +1181,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA44"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_705" model="account.account.template">
@@ -1190,7 +1190,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_710" model="account.account.template">
@@ -1199,7 +1199,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_720" model="account.account.template">
@@ -1208,7 +1208,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_725" model="account.account.template">
@@ -1217,7 +1217,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_735" model="account.account.template">
@@ -1226,7 +1226,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_740" model="account.account.template">
@@ -1235,7 +1235,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_750" model="account.account.template">
@@ -1244,7 +1244,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_755" model="account.account.template">
@@ -1253,7 +1253,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_765" model="account.account.template">
@@ -1262,7 +1262,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_770" model="account.account.template">
@@ -1271,7 +1271,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_780" model="account.account.template">
@@ -1280,7 +1280,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_785" model="account.account.template">
@@ -1289,7 +1289,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_795" model="account.account.template">
@@ -1298,7 +1298,7 @@
       <field name="parent_id" ref="chart_skr04_700"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA5" model="account.account.template">
@@ -1323,7 +1323,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_809" model="account.account.template">
@@ -1332,7 +1332,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA52" model="account.account.template">
@@ -1349,7 +1349,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA52"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA53" model="account.account.template">
@@ -1366,7 +1366,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA53"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_829" model="account.account.template">
@@ -1375,7 +1375,7 @@
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_830" model="account.account.template">
@@ -1384,7 +1384,7 @@
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_840" model="account.account.template">
@@ -1393,7 +1393,7 @@
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_850" model="account.account.template">
@@ -1402,7 +1402,7 @@
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_860" model="account.account.template">
@@ -1411,7 +1411,7 @@
       <field name="parent_id" ref="chart_skr04_820"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA54" model="account.account.template">
@@ -1428,7 +1428,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA54"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA55" model="account.account.template">
@@ -1445,7 +1445,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA55"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_910" model="account.account.template">
@@ -1454,7 +1454,7 @@
       <field name="parent_id" ref="chart_skr04_900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_920" model="account.account.template">
@@ -1463,7 +1463,7 @@
       <field name="parent_id" ref="chart_skr04_900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA56" model="account.account.template">
@@ -1480,7 +1480,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA56"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_940" model="account.account.template">
@@ -1489,7 +1489,7 @@
       <field name="parent_id" ref="chart_skr04_930"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_960" model="account.account.template">
@@ -1498,7 +1498,7 @@
       <field name="parent_id" ref="chart_skr04_930"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_970" model="account.account.template">
@@ -1507,7 +1507,7 @@
       <field name="parent_id" ref="chart_skr04_930"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA57" model="account.account.template">
@@ -1524,7 +1524,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA57"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K0BA58" model="account.account.template">
@@ -1541,7 +1541,7 @@
       <field name="parent_id" ref="chart_skr04_K0BA58"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA1" model="account.account.template">
@@ -1566,7 +1566,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1001" model="account.account.template">
@@ -1575,7 +1575,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1002" model="account.account.template">
@@ -1584,7 +1584,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1003" model="account.account.template">
@@ -1593,7 +1593,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1004" model="account.account.template">
@@ -1602,7 +1602,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1005" model="account.account.template">
@@ -1611,7 +1611,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1006" model="account.account.template">
@@ -1620,7 +1620,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1007" model="account.account.template">
@@ -1629,7 +1629,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1008" model="account.account.template">
@@ -1638,7 +1638,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1009" model="account.account.template">
@@ -1647,7 +1647,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1010" model="account.account.template">
@@ -1656,7 +1656,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1011" model="account.account.template">
@@ -1665,7 +1665,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1012" model="account.account.template">
@@ -1674,7 +1674,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1013" model="account.account.template">
@@ -1683,7 +1683,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1014" model="account.account.template">
@@ -1692,7 +1692,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1015" model="account.account.template">
@@ -1701,7 +1701,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1016" model="account.account.template">
@@ -1710,7 +1710,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1017" model="account.account.template">
@@ -1719,7 +1719,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1018" model="account.account.template">
@@ -1728,7 +1728,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1019" model="account.account.template">
@@ -1737,7 +1737,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1020" model="account.account.template">
@@ -1746,7 +1746,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1021" model="account.account.template">
@@ -1755,7 +1755,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1022" model="account.account.template">
@@ -1764,7 +1764,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1023" model="account.account.template">
@@ -1773,7 +1773,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1024" model="account.account.template">
@@ -1782,7 +1782,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1025" model="account.account.template">
@@ -1791,7 +1791,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1026" model="account.account.template">
@@ -1800,7 +1800,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1027" model="account.account.template">
@@ -1809,7 +1809,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1028" model="account.account.template">
@@ -1818,7 +1818,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1029" model="account.account.template">
@@ -1827,7 +1827,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1030" model="account.account.template">
@@ -1836,7 +1836,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1031" model="account.account.template">
@@ -1845,7 +1845,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1032" model="account.account.template">
@@ -1854,7 +1854,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1033" model="account.account.template">
@@ -1863,7 +1863,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1034" model="account.account.template">
@@ -1872,7 +1872,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1035" model="account.account.template">
@@ -1881,7 +1881,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1036" model="account.account.template">
@@ -1890,7 +1890,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1037" model="account.account.template">
@@ -1899,7 +1899,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1038" model="account.account.template">
@@ -1908,7 +1908,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1039" model="account.account.template">
@@ -1917,7 +1917,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA12" model="account.account.template">
@@ -1934,7 +1934,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1041" model="account.account.template">
@@ -1943,7 +1943,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1042" model="account.account.template">
@@ -1952,7 +1952,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1043" model="account.account.template">
@@ -1961,7 +1961,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1044" model="account.account.template">
@@ -1970,7 +1970,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1045" model="account.account.template">
@@ -1979,7 +1979,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1046" model="account.account.template">
@@ -1988,7 +1988,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1047" model="account.account.template">
@@ -1997,7 +1997,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1048" model="account.account.template">
@@ -2006,7 +2006,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1049" model="account.account.template">
@@ -2015,7 +2015,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1050" model="account.account.template">
@@ -2024,7 +2024,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1051" model="account.account.template">
@@ -2033,7 +2033,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1052" model="account.account.template">
@@ -2042,7 +2042,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1053" model="account.account.template">
@@ -2051,7 +2051,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1054" model="account.account.template">
@@ -2060,7 +2060,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1055" model="account.account.template">
@@ -2069,7 +2069,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1056" model="account.account.template">
@@ -2078,7 +2078,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1057" model="account.account.template">
@@ -2087,7 +2087,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1058" model="account.account.template">
@@ -2096,7 +2096,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1059" model="account.account.template">
@@ -2105,7 +2105,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1060" model="account.account.template">
@@ -2114,7 +2114,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1061" model="account.account.template">
@@ -2123,7 +2123,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1062" model="account.account.template">
@@ -2132,7 +2132,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1063" model="account.account.template">
@@ -2141,7 +2141,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1064" model="account.account.template">
@@ -2150,7 +2150,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1065" model="account.account.template">
@@ -2159,7 +2159,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1066" model="account.account.template">
@@ -2168,7 +2168,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1067" model="account.account.template">
@@ -2177,7 +2177,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1068" model="account.account.template">
@@ -2186,7 +2186,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1069" model="account.account.template">
@@ -2195,7 +2195,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1070" model="account.account.template">
@@ -2204,7 +2204,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1071" model="account.account.template">
@@ -2213,7 +2213,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1072" model="account.account.template">
@@ -2222,7 +2222,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1073" model="account.account.template">
@@ -2231,7 +2231,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1074" model="account.account.template">
@@ -2240,7 +2240,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1075" model="account.account.template">
@@ -2249,7 +2249,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1076" model="account.account.template">
@@ -2258,7 +2258,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1077" model="account.account.template">
@@ -2267,7 +2267,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1078" model="account.account.template">
@@ -2276,7 +2276,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1079" model="account.account.template">
@@ -2285,7 +2285,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1080" model="account.account.template">
@@ -2294,7 +2294,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1081" model="account.account.template">
@@ -2303,7 +2303,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1082" model="account.account.template">
@@ -2312,7 +2312,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1083" model="account.account.template">
@@ -2321,7 +2321,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1084" model="account.account.template">
@@ -2330,7 +2330,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1085" model="account.account.template">
@@ -2339,7 +2339,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1086" model="account.account.template">
@@ -2348,7 +2348,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1087" model="account.account.template">
@@ -2357,7 +2357,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1088" model="account.account.template">
@@ -2366,7 +2366,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1089" model="account.account.template">
@@ -2375,7 +2375,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA13" model="account.account.template">
@@ -2392,7 +2392,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1091" model="account.account.template">
@@ -2401,7 +2401,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1092" model="account.account.template">
@@ -2410,7 +2410,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1093" model="account.account.template">
@@ -2419,7 +2419,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1094" model="account.account.template">
@@ -2428,7 +2428,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA14" model="account.account.template">
@@ -2445,7 +2445,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1096" model="account.account.template">
@@ -2454,7 +2454,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1097" model="account.account.template">
@@ -2463,7 +2463,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1098" model="account.account.template">
@@ -2472,7 +2472,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1099" model="account.account.template">
@@ -2481,7 +2481,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA14"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA15" model="account.account.template">
@@ -2498,7 +2498,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1101" model="account.account.template">
@@ -2507,7 +2507,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1102" model="account.account.template">
@@ -2516,7 +2516,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1103" model="account.account.template">
@@ -2525,7 +2525,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1104" model="account.account.template">
@@ -2534,7 +2534,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1105" model="account.account.template">
@@ -2543,7 +2543,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1106" model="account.account.template">
@@ -2552,7 +2552,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1107" model="account.account.template">
@@ -2561,7 +2561,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1108" model="account.account.template">
@@ -2570,7 +2570,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1109" model="account.account.template">
@@ -2579,7 +2579,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1110" model="account.account.template">
@@ -2588,7 +2588,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1111" model="account.account.template">
@@ -2597,7 +2597,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1112" model="account.account.template">
@@ -2606,7 +2606,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1113" model="account.account.template">
@@ -2615,7 +2615,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1114" model="account.account.template">
@@ -2624,7 +2624,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1115" model="account.account.template">
@@ -2633,7 +2633,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1116" model="account.account.template">
@@ -2642,7 +2642,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1117" model="account.account.template">
@@ -2651,7 +2651,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1118" model="account.account.template">
@@ -2660,7 +2660,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1119" model="account.account.template">
@@ -2669,7 +2669,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1120" model="account.account.template">
@@ -2678,7 +2678,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1121" model="account.account.template">
@@ -2687,7 +2687,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1122" model="account.account.template">
@@ -2696,7 +2696,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1123" model="account.account.template">
@@ -2705,7 +2705,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1124" model="account.account.template">
@@ -2714,7 +2714,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1125" model="account.account.template">
@@ -2723,7 +2723,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1126" model="account.account.template">
@@ -2732,7 +2732,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1127" model="account.account.template">
@@ -2741,7 +2741,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1128" model="account.account.template">
@@ -2750,7 +2750,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1129" model="account.account.template">
@@ -2759,7 +2759,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1130" model="account.account.template">
@@ -2768,7 +2768,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1131" model="account.account.template">
@@ -2777,7 +2777,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1132" model="account.account.template">
@@ -2786,7 +2786,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1133" model="account.account.template">
@@ -2795,7 +2795,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1134" model="account.account.template">
@@ -2804,7 +2804,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1135" model="account.account.template">
@@ -2813,7 +2813,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1136" model="account.account.template">
@@ -2822,7 +2822,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1137" model="account.account.template">
@@ -2831,7 +2831,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1138" model="account.account.template">
@@ -2840,7 +2840,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1139" model="account.account.template">
@@ -2849,7 +2849,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1140" model="account.account.template">
@@ -2858,7 +2858,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1141" model="account.account.template">
@@ -2867,7 +2867,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1142" model="account.account.template">
@@ -2876,7 +2876,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1143" model="account.account.template">
@@ -2885,7 +2885,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1144" model="account.account.template">
@@ -2894,7 +2894,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1145" model="account.account.template">
@@ -2903,7 +2903,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1146" model="account.account.template">
@@ -2912,7 +2912,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1147" model="account.account.template">
@@ -2921,7 +2921,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1148" model="account.account.template">
@@ -2930,7 +2930,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1149" model="account.account.template">
@@ -2939,7 +2939,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1150" model="account.account.template">
@@ -2948,7 +2948,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1151" model="account.account.template">
@@ -2957,7 +2957,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1152" model="account.account.template">
@@ -2966,7 +2966,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1153" model="account.account.template">
@@ -2975,7 +2975,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1154" model="account.account.template">
@@ -2984,7 +2984,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1155" model="account.account.template">
@@ -2993,7 +2993,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1156" model="account.account.template">
@@ -3002,7 +3002,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1157" model="account.account.template">
@@ -3011,7 +3011,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1158" model="account.account.template">
@@ -3020,7 +3020,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1159" model="account.account.template">
@@ -3029,7 +3029,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1160" model="account.account.template">
@@ -3038,7 +3038,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1161" model="account.account.template">
@@ -3047,7 +3047,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1162" model="account.account.template">
@@ -3056,7 +3056,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1163" model="account.account.template">
@@ -3065,7 +3065,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1164" model="account.account.template">
@@ -3074,7 +3074,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1165" model="account.account.template">
@@ -3083,7 +3083,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1166" model="account.account.template">
@@ -3092,7 +3092,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1167" model="account.account.template">
@@ -3101,7 +3101,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1168" model="account.account.template">
@@ -3110,7 +3110,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1169" model="account.account.template">
@@ -3119,7 +3119,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1170" model="account.account.template">
@@ -3128,7 +3128,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1171" model="account.account.template">
@@ -3137,7 +3137,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1172" model="account.account.template">
@@ -3146,7 +3146,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1173" model="account.account.template">
@@ -3155,7 +3155,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1174" model="account.account.template">
@@ -3164,7 +3164,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1175" model="account.account.template">
@@ -3173,7 +3173,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1176" model="account.account.template">
@@ -3182,7 +3182,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1177" model="account.account.template">
@@ -3191,7 +3191,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1178" model="account.account.template">
@@ -3200,7 +3200,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1179" model="account.account.template">
@@ -3209,7 +3209,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA15"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA16" model="account.account.template">
@@ -3226,7 +3226,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA16"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1181" model="account.account.template">
@@ -3235,7 +3235,7 @@
       <field name="parent_id" ref="chart_skr04_1180"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1184" model="account.account.template">
@@ -3244,7 +3244,7 @@
       <field name="parent_id" ref="chart_skr04_1180"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1185" model="account.account.template">
@@ -3253,7 +3253,7 @@
       <field name="parent_id" ref="chart_skr04_1180"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1186" model="account.account.template">
@@ -3262,7 +3262,7 @@
       <field name="parent_id" ref="chart_skr04_1180"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA17" model="account.account.template">
@@ -3279,7 +3279,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA17"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA2" model="account.account.template">
@@ -3304,7 +3304,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1206" model="account.account.template">
@@ -3313,7 +3313,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1210" model="account.account.template">
@@ -3322,7 +3322,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1211" model="account.account.template">
@@ -3331,7 +3331,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1212" model="account.account.template">
@@ -3340,7 +3340,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1213" model="account.account.template">
@@ -3349,7 +3349,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1214" model="account.account.template">
@@ -3358,7 +3358,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1215" model="account.account.template">
@@ -3367,7 +3367,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1216" model="account.account.template">
@@ -3376,7 +3376,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1217" model="account.account.template">
@@ -3385,7 +3385,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1218" model="account.account.template">
@@ -3394,7 +3394,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1219" model="account.account.template">
@@ -3403,7 +3403,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1220" model="account.account.template">
@@ -3412,7 +3412,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1221" model="account.account.template">
@@ -3421,7 +3421,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1225" model="account.account.template">
@@ -3430,7 +3430,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1230" model="account.account.template">
@@ -3439,7 +3439,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1231" model="account.account.template">
@@ -3448,7 +3448,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1232" model="account.account.template">
@@ -3457,7 +3457,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1235" model="account.account.template">
@@ -3466,7 +3466,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1240" model="account.account.template">
@@ -3475,7 +3475,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1241" model="account.account.template">
@@ -3484,7 +3484,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1245" model="account.account.template">
@@ -3493,7 +3493,7 @@
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA22" model="account.account.template">
@@ -3510,7 +3510,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1247" model="account.account.template">
@@ -3519,7 +3519,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1248" model="account.account.template">
@@ -3528,7 +3528,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1249" model="account.account.template">
@@ -3537,7 +3537,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1250" model="account.account.template">
@@ -3546,7 +3546,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1251" model="account.account.template">
@@ -3555,7 +3555,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1255" model="account.account.template">
@@ -3564,7 +3564,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1258" model="account.account.template">
@@ -3573,7 +3573,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA23" model="account.account.template">
@@ -3590,7 +3590,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA23"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA24" model="account.account.template">
@@ -3607,7 +3607,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA24"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1261" model="account.account.template">
@@ -3616,7 +3616,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1265" model="account.account.template">
@@ -3625,7 +3625,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1266" model="account.account.template">
@@ -3634,7 +3634,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1267" model="account.account.template">
@@ -3643,7 +3643,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1268" model="account.account.template">
@@ -3652,7 +3652,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1269" model="account.account.template">
@@ -3661,7 +3661,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1270" model="account.account.template">
@@ -3670,7 +3670,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1271" model="account.account.template">
@@ -3679,7 +3679,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1275" model="account.account.template">
@@ -3688,7 +3688,7 @@
       <field name="parent_id" ref="chart_skr04_1260"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA25" model="account.account.template">
@@ -3705,7 +3705,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA25"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1277" model="account.account.template">
@@ -3714,7 +3714,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA25"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA26" model="account.account.template">
@@ -3731,7 +3731,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA26"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1281" model="account.account.template">
@@ -3740,7 +3740,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1285" model="account.account.template">
@@ -3749,7 +3749,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1286" model="account.account.template">
@@ -3758,7 +3758,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1287" model="account.account.template">
@@ -3767,7 +3767,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1288" model="account.account.template">
@@ -3776,7 +3776,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1289" model="account.account.template">
@@ -3785,7 +3785,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1290" model="account.account.template">
@@ -3794,7 +3794,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="True"/>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account.account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_receivable"/>
     </record>
     
     <record id="chart_skr04_1291" model="account.account.template">
@@ -3803,7 +3803,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1295" model="account.account.template">
@@ -3812,7 +3812,7 @@
       <field name="parent_id" ref="chart_skr04_1280"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA27" model="account.account.template">
@@ -3829,7 +3829,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA27"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1297" model="account.account.template">
@@ -3838,7 +3838,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA27"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA28" model="account.account.template">
@@ -3855,7 +3855,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA28"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA29" model="account.account.template">
@@ -3872,7 +3872,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA29"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA2a" model="account.account.template">
@@ -3889,7 +3889,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1301" model="account.account.template">
@@ -3898,7 +3898,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1305" model="account.account.template">
@@ -3907,7 +3907,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1310" model="account.account.template">
@@ -3916,7 +3916,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1311" model="account.account.template">
@@ -3925,7 +3925,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1315" model="account.account.template">
@@ -3934,7 +3934,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1320" model="account.account.template">
@@ -3943,7 +3943,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1321" model="account.account.template">
@@ -3952,7 +3952,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1325" model="account.account.template">
@@ -3961,7 +3961,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1330" model="account.account.template">
@@ -3970,7 +3970,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1331" model="account.account.template">
@@ -3979,7 +3979,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1335" model="account.account.template">
@@ -3988,7 +3988,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1340" model="account.account.template">
@@ -3997,7 +3997,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1341" model="account.account.template">
@@ -4006,7 +4006,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1345" model="account.account.template">
@@ -4015,7 +4015,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1350" model="account.account.template">
@@ -4024,7 +4024,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1351" model="account.account.template">
@@ -4033,7 +4033,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1355" model="account.account.template">
@@ -4042,7 +4042,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1360" model="account.account.template">
@@ -4051,7 +4051,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1361" model="account.account.template">
@@ -4060,7 +4060,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1365" model="account.account.template">
@@ -4069,7 +4069,7 @@
       <field name="parent_id" ref="chart_skr04_1300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA2b" model="account.account.template">
@@ -4086,7 +4086,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1374" model="account.account.template">
@@ -4095,7 +4095,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1375" model="account.account.template">
@@ -4104,7 +4104,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1376" model="account.account.template">
@@ -4113,7 +4113,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1377" model="account.account.template">
@@ -4122,7 +4122,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1378" model="account.account.template">
@@ -4131,7 +4131,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1390" model="account.account.template">
@@ -4140,7 +4140,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1395" model="account.account.template">
@@ -4149,7 +4149,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1396" model="account.account.template">
@@ -4158,7 +4158,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1397" model="account.account.template">
@@ -4167,7 +4167,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1398" model="account.account.template">
@@ -4176,7 +4176,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1399" model="account.account.template">
@@ -4185,7 +4185,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
 <record id="chart_skr04_1400" model="account.account.template">
@@ -4194,7 +4194,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1401" model="account.account.template">
@@ -4203,7 +4203,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1402" model="account.account.template">
@@ -4212,7 +4212,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1403" model="account.account.template">
@@ -4221,7 +4221,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1404" model="account.account.template">
@@ -4230,7 +4230,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1405" model="account.account.template">
@@ -4239,7 +4239,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1406" model="account.account.template">
@@ -4248,7 +4248,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1407" model="account.account.template">
@@ -4257,7 +4257,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1408" model="account.account.template">
@@ -4266,7 +4266,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1409" model="account.account.template">
@@ -4275,7 +4275,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1410" model="account.account.template">
@@ -4284,7 +4284,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1411" model="account.account.template">
@@ -4293,7 +4293,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1412" model="account.account.template">
@@ -4302,7 +4302,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1413" model="account.account.template">
@@ -4311,7 +4311,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1415" model="account.account.template">
@@ -4320,7 +4320,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1416" model="account.account.template">
@@ -4329,7 +4329,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1417" model="account.account.template">
@@ -4338,7 +4338,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1418" model="account.account.template">
@@ -4347,7 +4347,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1419" model="account.account.template">
@@ -4356,7 +4356,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1420" model="account.account.template">
@@ -4365,7 +4365,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1421" model="account.account.template">
@@ -4374,7 +4374,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1422" model="account.account.template">
@@ -4383,7 +4383,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1425" model="account.account.template">
@@ -4392,7 +4392,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1427" model="account.account.template">
@@ -4401,7 +4401,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1431" model="account.account.template">
@@ -4410,7 +4410,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1432" model="account.account.template">
@@ -4419,7 +4419,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1433" model="account.account.template">
@@ -4428,7 +4428,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1434" model="account.account.template">
@@ -4437,7 +4437,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1435" model="account.account.template">
@@ -4446,7 +4446,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1440" model="account.account.template">
@@ -4455,7 +4455,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1450" model="account.account.template">
@@ -4464,7 +4464,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1452" model="account.account.template">
@@ -4473,7 +4473,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1453" model="account.account.template">
@@ -4482,7 +4482,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1456" model="account.account.template">
@@ -4491,7 +4491,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1460" model="account.account.template">
@@ -4500,7 +4500,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1480" model="account.account.template">
@@ -4509,7 +4509,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1481" model="account.account.template">
@@ -4518,7 +4518,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1482" model="account.account.template">
@@ -4527,7 +4527,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1483" model="account.account.template">
@@ -4536,7 +4536,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1484" model="account.account.template">
@@ -4545,7 +4545,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1485" model="account.account.template">
@@ -4554,7 +4554,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1486" model="account.account.template">
@@ -4563,7 +4563,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1487" model="account.account.template">
@@ -4572,7 +4572,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1490" model="account.account.template">
@@ -4581,7 +4581,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA2c" model="account.account.template">
@@ -4598,7 +4598,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2c"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1498" model="account.account.template">
@@ -4607,7 +4607,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA3" model="account.account.template">
@@ -4632,7 +4632,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1504" model="account.account.template">
@@ -4641,7 +4641,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA32" model="account.account.template">
@@ -4658,7 +4658,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA33" model="account.account.template">
@@ -4675,7 +4675,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA33"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1520" model="account.account.template">
@@ -4684,7 +4684,7 @@
       <field name="parent_id" ref="chart_skr04_1510"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1525" model="account.account.template">
@@ -4693,7 +4693,7 @@
       <field name="parent_id" ref="chart_skr04_1510"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1530" model="account.account.template">
@@ -4702,7 +4702,7 @@
       <field name="parent_id" ref="chart_skr04_1510"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA4" model="account.account.template">
@@ -4727,7 +4727,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA41"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1600" model="account.account.template">
@@ -4736,7 +4736,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA41"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1610" model="account.account.template">
@@ -4745,7 +4745,7 @@
       <field name="parent_id" ref="chart_skr04_1600"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1620" model="account.account.template">
@@ -4754,7 +4754,7 @@
       <field name="parent_id" ref="chart_skr04_1600"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA42" model="account.account.template">
@@ -4771,7 +4771,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1710" model="account.account.template">
@@ -4780,7 +4780,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1720" model="account.account.template">
@@ -4789,7 +4789,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1730" model="account.account.template">
@@ -4798,7 +4798,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1780" model="account.account.template">
@@ -4807,7 +4807,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1790" model="account.account.template">
@@ -4816,7 +4816,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1800" model="account.account.template">
@@ -4825,7 +4825,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
        
@@ -4835,7 +4835,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1820" model="account.account.template">
@@ -4844,7 +4844,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1830" model="account.account.template">
@@ -4853,7 +4853,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1840" model="account.account.template">
@@ -4862,7 +4862,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1850" model="account.account.template">
@@ -4871,7 +4871,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">liquidity</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
      </record>
     
     <record id="chart_skr04_1890" model="account.account.template">
@@ -4880,7 +4880,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
      </record>
 
     <record id="chart_skr04_1895" model="account.account.template">
@@ -4889,7 +4889,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA5" model="account.account.template">
@@ -4914,7 +4914,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1920" model="account.account.template">
@@ -4923,7 +4923,7 @@
       <field name="parent_id" ref="chart_skr04_1900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1930" model="account.account.template">
@@ -4932,7 +4932,7 @@
       <field name="parent_id" ref="chart_skr04_1900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_1940" model="account.account.template">
@@ -4941,7 +4941,7 @@
       <field name="parent_id" ref="chart_skr04_1900"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K1BA52" model="account.account.template">
@@ -4958,7 +4958,7 @@
       <field name="parent_id" ref="chart_skr04_K1BA52"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_asset"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
     </record>
     
     <record id="chart_skr04_K2BP1" model="account.account.template">
@@ -4975,7 +4975,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP1"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2010" model="account.account.template">
@@ -4984,7 +4984,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP1"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2020" model="account.account.template">
@@ -4993,7 +4993,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP1"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2030" model="account.account.template">
@@ -5002,7 +5002,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP1"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP2" model="account.account.template">
@@ -5019,7 +5019,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP2"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2060" model="account.account.template">
@@ -5028,7 +5028,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP2"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2070" model="account.account.template">
@@ -5037,7 +5037,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP2"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2080" model="account.account.template">
@@ -5046,7 +5046,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP2"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP3" model="account.account.template">
@@ -5063,7 +5063,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2130" model="account.account.template">
@@ -5072,7 +5072,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2150" model="account.account.template">
@@ -5081,7 +5081,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2180" model="account.account.template">
@@ -5090,7 +5090,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2200" model="account.account.template">
@@ -5099,7 +5099,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2230" model="account.account.template">
@@ -5108,7 +5108,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2250" model="account.account.template">
@@ -5117,7 +5117,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2280" model="account.account.template">
@@ -5126,7 +5126,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2300" model="account.account.template">
@@ -5135,7 +5135,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2349" model="account.account.template">
@@ -5144,7 +5144,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2350" model="account.account.template">
@@ -5153,7 +5153,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2399" model="account.account.template">
@@ -5162,7 +5162,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP3"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP4" model="account.account.template">
@@ -5179,7 +5179,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2530" model="account.account.template">
@@ -5188,7 +5188,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2550" model="account.account.template">
@@ -5197,7 +5197,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2580" model="account.account.template">
@@ -5206,7 +5206,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2600" model="account.account.template">
@@ -5215,7 +5215,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2630" model="account.account.template">
@@ -5224,7 +5224,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2650" model="account.account.template">
@@ -5233,7 +5233,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2680" model="account.account.template">
@@ -5242,7 +5242,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2700" model="account.account.template">
@@ -5251,7 +5251,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2750" model="account.account.template">
@@ -5260,7 +5260,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP4"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP5" model="account.account.template">
@@ -5285,7 +5285,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP52" model="account.account.template">
@@ -5302,7 +5302,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP52"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP6" model="account.account.template">
@@ -5327,7 +5327,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2925" model="account.account.template">
@@ -5336,7 +5336,7 @@
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2926" model="account.account.template">
@@ -5345,7 +5345,7 @@
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2927" model="account.account.template">
@@ -5354,7 +5354,7 @@
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2928" model="account.account.template">
@@ -5363,7 +5363,7 @@
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2929" model="account.account.template">
@@ -5372,7 +5372,7 @@
       <field name="parent_id" ref="chart_skr04_2920"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP7" model="account.account.template">
@@ -5397,7 +5397,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP71"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP72" model="account.account.template">
@@ -5414,7 +5414,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP72"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP73" model="account.account.template">
@@ -5431,7 +5431,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP73"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP74" model="account.account.template">
@@ -5448,7 +5448,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP74"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2962" model="account.account.template">
@@ -5457,7 +5457,7 @@
       <field name="parent_id" ref="chart_skr04_2960"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP8" model="account.account.template">
@@ -5482,7 +5482,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP81"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2978" model="account.account.template">
@@ -5491,7 +5491,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP81"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP82" model="account.account.template">
@@ -5508,7 +5508,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP82"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP9" model="account.account.template">
@@ -5533,7 +5533,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2981" model="account.account.template">
@@ -5542,7 +5542,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2982" model="account.account.template">
@@ -5551,7 +5551,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2983" model="account.account.template">
@@ -5560,7 +5560,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2984" model="account.account.template">
@@ -5569,7 +5569,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP92" model="account.account.template">
@@ -5586,7 +5586,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP92"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2986" model="account.account.template">
@@ -5595,7 +5595,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2987" model="account.account.template">
@@ -5604,7 +5604,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2988" model="account.account.template">
@@ -5613,7 +5613,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2989" model="account.account.template">
@@ -5622,7 +5622,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2990" model="account.account.template">
@@ -5631,7 +5631,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2991" model="account.account.template">
@@ -5640,7 +5640,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2992" model="account.account.template">
@@ -5649,7 +5649,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2993" model="account.account.template">
@@ -5658,7 +5658,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2994" model="account.account.template">
@@ -5667,7 +5667,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2995" model="account.account.template">
@@ -5676,7 +5676,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2996" model="account.account.template">
@@ -5685,7 +5685,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2997" model="account.account.template">
@@ -5694,7 +5694,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_2998" model="account.account.template">
@@ -5703,7 +5703,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP91"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K2BP93" model="account.account.template">
@@ -5720,7 +5720,7 @@
       <field name="parent_id" ref="chart_skr04_K2BP93"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP1" model="account.account.template">
@@ -5745,7 +5745,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3010" model="account.account.template">
@@ -5754,7 +5754,7 @@
       <field name="parent_id" ref="chart_skr04_3000"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3015" model="account.account.template">
@@ -5763,7 +5763,7 @@
       <field name="parent_id" ref="chart_skr04_3000"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP12" model="account.account.template">
@@ -5780,7 +5780,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3030" model="account.account.template">
@@ -5789,7 +5789,7 @@
       <field name="parent_id" ref="chart_skr04_3020"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3040" model="account.account.template">
@@ -5798,7 +5798,7 @@
       <field name="parent_id" ref="chart_skr04_3020"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3060" model="account.account.template">
@@ -5807,7 +5807,7 @@
       <field name="parent_id" ref="chart_skr04_3020"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP13" model="account.account.template">
@@ -5824,7 +5824,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP13"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3074" model="account.account.template">
@@ -5833,7 +5833,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3075" model="account.account.template">
@@ -5842,7 +5842,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3080" model="account.account.template">
@@ -5851,7 +5851,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3085" model="account.account.template">
@@ -5860,7 +5860,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3090" model="account.account.template">
@@ -5869,7 +5869,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3092" model="account.account.template">
@@ -5878,7 +5878,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3095" model="account.account.template">
@@ -5887,7 +5887,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3096" model="account.account.template">
@@ -5896,7 +5896,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3098" model="account.account.template">
@@ -5905,7 +5905,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3099" model="account.account.template">
@@ -5914,7 +5914,7 @@
       <field name="parent_id" ref="chart_skr04_3070"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP2" model="account.account.template">
@@ -5939,7 +5939,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3101" model="account.account.template">
@@ -5948,7 +5948,7 @@
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3105" model="account.account.template">
@@ -5957,7 +5957,7 @@
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3110" model="account.account.template">
@@ -5966,7 +5966,7 @@
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3120" model="account.account.template">
@@ -5975,7 +5975,7 @@
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3121" model="account.account.template">
@@ -5984,7 +5984,7 @@
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3125" model="account.account.template">
@@ -5993,7 +5993,7 @@
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3130" model="account.account.template">
@@ -6002,7 +6002,7 @@
       <field name="parent_id" ref="chart_skr04_3100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP22" model="account.account.template">
@@ -6019,7 +6019,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3151" model="account.account.template">
@@ -6028,7 +6028,7 @@
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3160" model="account.account.template">
@@ -6037,7 +6037,7 @@
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3170" model="account.account.template">
@@ -6046,7 +6046,7 @@
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3180" model="account.account.template">
@@ -6055,7 +6055,7 @@
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3181" model="account.account.template">
@@ -6064,7 +6064,7 @@
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3190" model="account.account.template">
@@ -6073,7 +6073,7 @@
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3200" model="account.account.template">
@@ -6082,7 +6082,7 @@
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3210" model="account.account.template">
@@ -6091,7 +6091,7 @@
       <field name="parent_id" ref="chart_skr04_3150"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP23" model="account.account.template">
@@ -6108,7 +6108,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP23"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP24" model="account.account.template">
@@ -6125,7 +6125,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP24"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3260" model="account.account.template">
@@ -6134,7 +6134,7 @@
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3270" model="account.account.template">
@@ -6143,7 +6143,7 @@
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3271" model="account.account.template">
@@ -6152,7 +6152,7 @@
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3272" model="account.account.template">
@@ -6161,7 +6161,7 @@
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3280" model="account.account.template">
@@ -6170,7 +6170,7 @@
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3284" model="account.account.template">
@@ -6179,7 +6179,7 @@
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3285" model="account.account.template">
@@ -6188,7 +6188,7 @@
       <field name="parent_id" ref="chart_skr04_3250"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP25" model="account.account.template">
@@ -6205,7 +6205,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP25"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3301" model="account.account.template">
@@ -6214,7 +6214,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3305" model="account.account.template">
@@ -6223,7 +6223,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3306" model="account.account.template">
@@ -6232,7 +6232,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3307" model="account.account.template">
@@ -6241,7 +6241,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3309" model="account.account.template">
@@ -6250,7 +6250,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3310" model="account.account.template">
@@ -6259,7 +6259,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3334" model="account.account.template">
@@ -6268,7 +6268,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3335" model="account.account.template">
@@ -6277,7 +6277,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3337" model="account.account.template">
@@ -6286,7 +6286,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3338" model="account.account.template">
@@ -6295,7 +6295,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3340" model="account.account.template">
@@ -6304,7 +6304,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3341" model="account.account.template">
@@ -6313,7 +6313,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3345" model="account.account.template">
@@ -6322,7 +6322,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3348" model="account.account.template">
@@ -6331,7 +6331,7 @@
       <field name="parent_id" ref="chart_skr04_3300"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP26" model="account.account.template">
@@ -6348,7 +6348,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP26"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP27" model="account.account.template">
@@ -6365,7 +6365,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP27"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3351" model="account.account.template">
@@ -6374,7 +6374,7 @@
       <field name="parent_id" ref="chart_skr04_3350"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3380" model="account.account.template">
@@ -6383,7 +6383,7 @@
       <field name="parent_id" ref="chart_skr04_3350"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3390" model="account.account.template">
@@ -6392,7 +6392,7 @@
       <field name="parent_id" ref="chart_skr04_3350"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP28" model="account.account.template">
@@ -6409,7 +6409,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP28"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3401" model="account.account.template">
@@ -6418,7 +6418,7 @@
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3405" model="account.account.template">
@@ -6427,7 +6427,7 @@
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3410" model="account.account.template">
@@ -6436,7 +6436,7 @@
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3420" model="account.account.template">
@@ -6445,7 +6445,7 @@
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3421" model="account.account.template">
@@ -6454,7 +6454,7 @@
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3425" model="account.account.template">
@@ -6463,7 +6463,7 @@
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3430" model="account.account.template">
@@ -6472,7 +6472,7 @@
       <field name="parent_id" ref="chart_skr04_3400"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP29" model="account.account.template">
@@ -6489,7 +6489,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP29"/>
       <field name="reconcile" eval="True"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3451" model="account.account.template">
@@ -6498,7 +6498,7 @@
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3455" model="account.account.template">
@@ -6507,7 +6507,7 @@
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3460" model="account.account.template">
@@ -6516,7 +6516,7 @@
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3470" model="account.account.template">
@@ -6525,7 +6525,7 @@
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="True"/>
       <field name="type">payable</field>
-      <field name="user_type" ref="account.account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
     </record>
     
     <record id="chart_skr04_3471" model="account.account.template">
@@ -6534,7 +6534,7 @@
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3475" model="account.account.template">
@@ -6543,7 +6543,7 @@
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3480" model="account.account.template">
@@ -6552,7 +6552,7 @@
       <field name="parent_id" ref="chart_skr04_3450"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP2a" model="account.account.template">
@@ -6569,7 +6569,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3501" model="account.account.template">
@@ -6578,7 +6578,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3504" model="account.account.template">
@@ -6587,7 +6587,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3507" model="account.account.template">
@@ -6596,7 +6596,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3509" model="account.account.template">
@@ -6605,7 +6605,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3510" model="account.account.template">
@@ -6614,7 +6614,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3511" model="account.account.template">
@@ -6623,7 +6623,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3514" model="account.account.template">
@@ -6632,7 +6632,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3517" model="account.account.template">
@@ -6641,7 +6641,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3519" model="account.account.template">
@@ -6650,7 +6650,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3520" model="account.account.template">
@@ -6659,7 +6659,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3521" model="account.account.template">
@@ -6668,7 +6668,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3524" model="account.account.template">
@@ -6677,7 +6677,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3527" model="account.account.template">
@@ -6686,7 +6686,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3530" model="account.account.template">
@@ -6695,7 +6695,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3531" model="account.account.template">
@@ -6704,7 +6704,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3534" model="account.account.template">
@@ -6713,7 +6713,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3537" model="account.account.template">
@@ -6722,7 +6722,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3540" model="account.account.template">
@@ -6731,7 +6731,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3541" model="account.account.template">
@@ -6740,7 +6740,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3544" model="account.account.template">
@@ -6749,7 +6749,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3547" model="account.account.template">
@@ -6758,7 +6758,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3550" model="account.account.template">
@@ -6767,7 +6767,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3551" model="account.account.template">
@@ -6776,7 +6776,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3554" model="account.account.template">
@@ -6785,7 +6785,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3557" model="account.account.template">
@@ -6794,7 +6794,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3560" model="account.account.template">
@@ -6803,7 +6803,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3561" model="account.account.template">
@@ -6812,7 +6812,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3564" model="account.account.template">
@@ -6821,7 +6821,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3567" model="account.account.template">
@@ -6830,7 +6830,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3570" model="account.account.template">
@@ -6839,7 +6839,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3599" model="account.account.template">
@@ -6848,7 +6848,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3600" model="account.account.template">
@@ -6857,7 +6857,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3610" model="account.account.template">
@@ -6866,7 +6866,7 @@
       <field name="parent_id" ref="chart_skr04_3500"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP2b" model="account.account.template">
@@ -6883,7 +6883,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3630" model="account.account.template">
@@ -6892,7 +6892,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="True"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP2c" model="account.account.template">
@@ -6909,7 +6909,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2c"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3700" model="account.account.template">
@@ -6918,7 +6918,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3701" model="account.account.template">
@@ -6927,7 +6927,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3710" model="account.account.template">
@@ -6936,7 +6936,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3715" model="account.account.template">
@@ -6945,7 +6945,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3720" model="account.account.template">
@@ -6954,7 +6954,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3725" model="account.account.template">
@@ -6963,7 +6963,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3726" model="account.account.template">
@@ -6972,7 +6972,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3730" model="account.account.template">
@@ -6981,7 +6981,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3740" model="account.account.template">
@@ -6990,7 +6990,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3741" model="account.account.template">
@@ -6999,7 +6999,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3750" model="account.account.template">
@@ -7008,7 +7008,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3755" model="account.account.template">
@@ -7017,7 +7017,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3759" model="account.account.template">
@@ -7026,7 +7026,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3760" model="account.account.template">
@@ -7035,7 +7035,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3761" model="account.account.template">
@@ -7044,7 +7044,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3770" model="account.account.template">
@@ -7053,7 +7053,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3771" model="account.account.template">
@@ -7062,7 +7062,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3780" model="account.account.template">
@@ -7071,7 +7071,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3785" model="account.account.template">
@@ -7080,7 +7080,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3790" model="account.account.template">
@@ -7089,7 +7089,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3791" model="account.account.template">
@@ -7098,7 +7098,7 @@
       <field name="parent_id" ref="chart_skr04_3790"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3796" model="account.account.template">
@@ -7107,7 +7107,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
      <record id="chart_skr04_3800" model="account.account.template">
@@ -7116,7 +7116,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3801" model="account.account.template">
@@ -7125,7 +7125,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3802" model="account.account.template">
@@ -7134,7 +7134,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3803" model="account.account.template">
@@ -7143,7 +7143,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3804" model="account.account.template">
@@ -7152,7 +7152,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3805" model="account.account.template">
@@ -7161,7 +7161,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3806" model="account.account.template">
@@ -7170,7 +7170,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3807" model="account.account.template">
@@ -7179,7 +7179,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3808" model="account.account.template">
@@ -7188,7 +7188,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3809" model="account.account.template">
@@ -7197,7 +7197,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP2d" model="account.account.template">
@@ -7214,7 +7214,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3811" model="account.account.template">
@@ -7223,7 +7223,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3812" model="account.account.template">
@@ -7232,7 +7232,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3813" model="account.account.template">
@@ -7241,7 +7241,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3814" model="account.account.template">
@@ -7250,7 +7250,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3815" model="account.account.template">
@@ -7259,7 +7259,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3816" model="account.account.template">
@@ -7268,7 +7268,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2d"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3817" model="account.account.template">
@@ -7277,7 +7277,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3818" model="account.account.template">
@@ -7286,7 +7286,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3820" model="account.account.template">
@@ -7295,7 +7295,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3830" model="account.account.template">
@@ -7304,7 +7304,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3832" model="account.account.template">
@@ -7313,7 +7313,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3834" model="account.account.template">
@@ -7322,7 +7322,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3835" model="account.account.template">
@@ -7331,7 +7331,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3836" model="account.account.template">
@@ -7340,7 +7340,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3837" model="account.account.template">
@@ -7349,7 +7349,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3839" model="account.account.template">
@@ -7358,7 +7358,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3840" model="account.account.template">
@@ -7367,7 +7367,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3841" model="account.account.template">
@@ -7376,7 +7376,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3845" model="account.account.template">
@@ -7385,7 +7385,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3850" model="account.account.template">
@@ -7394,7 +7394,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3851" model="account.account.template">
@@ -7403,7 +7403,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_3854" model="account.account.template">
@@ -7412,7 +7412,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP3" model="account.account.template">
@@ -7437,7 +7437,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K3BP32" model="account.account.template">
@@ -7454,7 +7454,7 @@
       <field name="parent_id" ref="chart_skr04_K3BP32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K4GVE1" model="account.account.template">
@@ -7479,7 +7479,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4100" model="account.account.template">
@@ -7488,7 +7488,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4105" model="account.account.template">
@@ -7497,7 +7497,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4110" model="account.account.template">
@@ -7506,7 +7506,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4120" model="account.account.template">
@@ -7515,7 +7515,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4125" model="account.account.template">
@@ -7524,7 +7524,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4130" model="account.account.template">
@@ -7533,7 +7533,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4135" model="account.account.template">
@@ -7542,7 +7542,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4140" model="account.account.template">
@@ -7551,7 +7551,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4150" model="account.account.template">
@@ -7560,7 +7560,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4160" model="account.account.template">
@@ -7569,7 +7569,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4180" model="account.account.template">
@@ -7578,7 +7578,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4185" model="account.account.template">
@@ -7587,7 +7587,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4186" model="account.account.template">
@@ -7596,7 +7596,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4187" model="account.account.template">
@@ -7605,7 +7605,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4200" model="account.account.template">
@@ -7614,7 +7614,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4300" model="account.account.template">
@@ -7623,7 +7623,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4310" model="account.account.template">
@@ -7632,7 +7632,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4315" model="account.account.template">
@@ -7641,7 +7641,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4320" model="account.account.template">
@@ -7650,7 +7650,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4330" model="account.account.template">
@@ -7659,7 +7659,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4337" model="account.account.template">
@@ -7668,7 +7668,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4338" model="account.account.template">
@@ -7677,7 +7677,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4339" model="account.account.template">
@@ -7686,7 +7686,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4340" model="account.account.template">
@@ -7695,7 +7695,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4400" model="account.account.template">
@@ -7704,7 +7704,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4401" model="account.account.template">
@@ -7713,7 +7713,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4402" model="account.account.template">
@@ -7722,7 +7722,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4403" model="account.account.template">
@@ -7731,7 +7731,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4410" model="account.account.template">
@@ -7740,7 +7740,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4499" model="account.account.template">
@@ -7749,7 +7749,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4510" model="account.account.template">
@@ -7758,7 +7758,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4520" model="account.account.template">
@@ -7767,7 +7767,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4560" model="account.account.template">
@@ -7776,7 +7776,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4564" model="account.account.template">
@@ -7785,7 +7785,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4565" model="account.account.template">
@@ -7794,7 +7794,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4566" model="account.account.template">
@@ -7803,7 +7803,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4568" model="account.account.template">
@@ -7812,7 +7812,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4569" model="account.account.template">
@@ -7821,7 +7821,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K4GVE12" model="account.account.template">
@@ -7838,7 +7838,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4574" model="account.account.template">
@@ -7847,7 +7847,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4575" model="account.account.template">
@@ -7856,7 +7856,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4576" model="account.account.template">
@@ -7865,7 +7865,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4578" model="account.account.template">
@@ -7874,7 +7874,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4579" model="account.account.template">
@@ -7883,7 +7883,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K4GVE2" model="account.account.template">
@@ -7908,7 +7908,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4581" model="account.account.template">
@@ -7917,7 +7917,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4582" model="account.account.template">
@@ -7926,7 +7926,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4589" model="account.account.template">
@@ -7935,7 +7935,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4600" model="account.account.template">
@@ -7944,7 +7944,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4605" model="account.account.template">
@@ -7953,7 +7953,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4610" model="account.account.template">
@@ -7962,7 +7962,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4619" model="account.account.template">
@@ -7971,7 +7971,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4620" model="account.account.template">
@@ -7980,7 +7980,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4627" model="account.account.template">
@@ -7989,7 +7989,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K4GVE22" model="account.account.template">
@@ -8006,7 +8006,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4637" model="account.account.template">
@@ -8015,7 +8015,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4638" model="account.account.template">
@@ -8024,7 +8024,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4639" model="account.account.template">
@@ -8033,7 +8033,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4640" model="account.account.template">
@@ -8042,7 +8042,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4645" model="account.account.template">
@@ -8051,7 +8051,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4646" model="account.account.template">
@@ -8060,7 +8060,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4647" model="account.account.template">
@@ -8069,7 +8069,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4648" model="account.account.template">
@@ -8078,7 +8078,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4649" model="account.account.template">
@@ -8087,7 +8087,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4650" model="account.account.template">
@@ -8096,7 +8096,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4659" model="account.account.template">
@@ -8105,7 +8105,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4660" model="account.account.template">
@@ -8114,7 +8114,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4667" model="account.account.template">
@@ -8123,7 +8123,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4670" model="account.account.template">
@@ -8132,7 +8132,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4679" model="account.account.template">
@@ -8141,7 +8141,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4680" model="account.account.template">
@@ -8150,7 +8150,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4685" model="account.account.template">
@@ -8159,7 +8159,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4686" model="account.account.template">
@@ -8168,7 +8168,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4688" model="account.account.template">
@@ -8177,7 +8177,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4689" model="account.account.template">
@@ -8186,7 +8186,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE22"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4690" model="account.account.template">
@@ -8195,7 +8195,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4695" model="account.account.template">
@@ -8204,7 +8204,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4700" model="account.account.template">
@@ -8213,7 +8213,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4705" model="account.account.template">
@@ -8222,7 +8222,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4710" model="account.account.template">
@@ -8231,7 +8231,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4720" model="account.account.template">
@@ -8240,7 +8240,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4723" model="account.account.template">
@@ -8249,7 +8249,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4724" model="account.account.template">
@@ -8258,7 +8258,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4725" model="account.account.template">
@@ -8267,7 +8267,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4726" model="account.account.template">
@@ -8276,7 +8276,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4727" model="account.account.template">
@@ -8285,7 +8285,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4729" model="account.account.template">
@@ -8294,7 +8294,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4730" model="account.account.template">
@@ -8303,7 +8303,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4731" model="account.account.template">
@@ -8312,7 +8312,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4735" model="account.account.template">
@@ -8321,7 +8321,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4736" model="account.account.template">
@@ -8330,7 +8330,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4741" model="account.account.template">
@@ -8339,7 +8339,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4743" model="account.account.template">
@@ -8348,7 +8348,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4745" model="account.account.template">
@@ -8357,7 +8357,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4746" model="account.account.template">
@@ -8366,7 +8366,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4748" model="account.account.template">
@@ -8375,7 +8375,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4749" model="account.account.template">
@@ -8384,7 +8384,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4750" model="account.account.template">
@@ -8393,7 +8393,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4760" model="account.account.template">
@@ -8402,7 +8402,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4762" model="account.account.template">
@@ -8411,7 +8411,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4769" model="account.account.template">
@@ -8420,7 +8420,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4770" model="account.account.template">
@@ -8429,7 +8429,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_4780" model="account.account.template">
@@ -8438,7 +8438,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4790" model="account.account.template">
@@ -8447,7 +8447,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4792" model="account.account.template">
@@ -8456,7 +8456,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K4GVE3" model="account.account.template">
@@ -8481,7 +8481,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4810" model="account.account.template">
@@ -8490,7 +8490,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4815" model="account.account.template">
@@ -8499,7 +8499,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K4GVE32" model="account.account.template">
@@ -8516,7 +8516,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K4GVE33" model="account.account.template">
@@ -8533,7 +8533,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE33"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K4GVE4" model="account.account.template">
@@ -8558,7 +8558,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K4GVE5" model="account.account.template">
@@ -8583,7 +8583,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4834" model="account.account.template">
@@ -8592,7 +8592,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4835" model="account.account.template">
@@ -8601,7 +8601,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4836" model="account.account.template">
@@ -8610,7 +8610,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4837" model="account.account.template">
@@ -8619,7 +8619,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4839" model="account.account.template">
@@ -8628,7 +8628,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4840" model="account.account.template">
@@ -8637,7 +8637,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4843" model="account.account.template">
@@ -8646,7 +8646,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4844" model="account.account.template">
@@ -8655,7 +8655,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4845" model="account.account.template">
@@ -8664,7 +8664,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4846" model="account.account.template">
@@ -8673,7 +8673,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4848" model="account.account.template">
@@ -8682,7 +8682,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4849" model="account.account.template">
@@ -8691,7 +8691,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4850" model="account.account.template">
@@ -8700,7 +8700,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4851" model="account.account.template">
@@ -8709,7 +8709,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4852" model="account.account.template">
@@ -8718,7 +8718,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4855" model="account.account.template">
@@ -8727,7 +8727,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4856" model="account.account.template">
@@ -8736,7 +8736,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4857" model="account.account.template">
@@ -8745,7 +8745,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4858" model="account.account.template">
@@ -8754,7 +8754,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4860" model="account.account.template">
@@ -8763,7 +8763,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4865" model="account.account.template">
@@ -8772,7 +8772,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4866" model="account.account.template">
@@ -8781,7 +8781,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4867" model="account.account.template">
@@ -8790,7 +8790,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4869" model="account.account.template">
@@ -8799,7 +8799,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4871" model="account.account.template">
@@ -8808,7 +8808,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4872" model="account.account.template">
@@ -8817,7 +8817,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4873" model="account.account.template">
@@ -8826,7 +8826,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4874" model="account.account.template">
@@ -8835,7 +8835,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4875" model="account.account.template">
@@ -8844,7 +8844,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4877" model="account.account.template">
@@ -8853,7 +8853,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4878" model="account.account.template">
@@ -8862,7 +8862,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4879" model="account.account.template">
@@ -8871,7 +8871,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4881" model="account.account.template">
@@ -8880,7 +8880,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4882" model="account.account.template">
@@ -8889,7 +8889,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4883" model="account.account.template">
@@ -8898,7 +8898,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4900" model="account.account.template">
@@ -8907,7 +8907,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4901" model="account.account.template">
@@ -8916,7 +8916,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4905" model="account.account.template">
@@ -8925,7 +8925,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4906" model="account.account.template">
@@ -8934,7 +8934,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4910" model="account.account.template">
@@ -8943,7 +8943,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4911" model="account.account.template">
@@ -8952,7 +8952,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4912" model="account.account.template">
@@ -8961,7 +8961,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4913" model="account.account.template">
@@ -8970,7 +8970,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4914" model="account.account.template">
@@ -8979,7 +8979,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4915" model="account.account.template">
@@ -8988,7 +8988,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4916" model="account.account.template">
@@ -8997,7 +8997,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4920" model="account.account.template">
@@ -9006,7 +9006,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4923" model="account.account.template">
@@ -9015,7 +9015,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4925" model="account.account.template">
@@ -9024,7 +9024,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4930" model="account.account.template">
@@ -9033,7 +9033,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4932" model="account.account.template">
@@ -9042,7 +9042,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4933" model="account.account.template">
@@ -9051,7 +9051,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4934" model="account.account.template">
@@ -9060,7 +9060,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4935" model="account.account.template">
@@ -9069,7 +9069,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4936" model="account.account.template">
@@ -9078,7 +9078,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4937" model="account.account.template">
@@ -9087,7 +9087,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4938" model="account.account.template">
@@ -9096,7 +9096,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4939" model="account.account.template">
@@ -9105,7 +9105,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4940" model="account.account.template">
@@ -9114,7 +9114,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4941" model="account.account.template">
@@ -9123,7 +9123,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4944" model="account.account.template">
@@ -9132,7 +9132,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4945" model="account.account.template">
@@ -9141,7 +9141,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4946" model="account.account.template">
@@ -9150,7 +9150,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4947" model="account.account.template">
@@ -9159,7 +9159,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4948" model="account.account.template">
@@ -9168,7 +9168,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4949" model="account.account.template">
@@ -9177,7 +9177,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4960" model="account.account.template">
@@ -9186,7 +9186,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4970" model="account.account.template">
@@ -9195,7 +9195,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4975" model="account.account.template">
@@ -9204,7 +9204,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4980" model="account.account.template">
@@ -9213,7 +9213,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4981" model="account.account.template">
@@ -9222,7 +9222,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_4982" model="account.account.template">
@@ -9231,7 +9231,7 @@
       <field name="parent_id" ref="chart_skr04_K4GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K5GVA1" model="account.account.template">
@@ -9256,7 +9256,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K5GVA2" model="account.account.template">
@@ -9281,7 +9281,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5190" model="account.account.template">
@@ -9290,7 +9290,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5200" model="account.account.template">
@@ -9299,7 +9299,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5300" model="account.account.template">
@@ -9308,7 +9308,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5340" model="account.account.template">
@@ -9317,7 +9317,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5400" model="account.account.template">
@@ -9326,7 +9326,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5401" model="account.account.template">
@@ -9335,7 +9335,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5402" model="account.account.template">
@@ -9344,7 +9344,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5403" model="account.account.template">
@@ -9353,7 +9353,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5420" model="account.account.template">
@@ -9362,7 +9362,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5425" model="account.account.template">
@@ -9371,7 +9371,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5430" model="account.account.template">
@@ -9380,7 +9380,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5433" model="account.account.template">
@@ -9389,7 +9389,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5435" model="account.account.template">
@@ -9398,7 +9398,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5436" model="account.account.template">
@@ -9407,7 +9407,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5440" model="account.account.template">
@@ -9416,7 +9416,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5441" model="account.account.template">
@@ -9425,7 +9425,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5500" model="account.account.template">
@@ -9434,7 +9434,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5505" model="account.account.template">
@@ -9443,7 +9443,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5530" model="account.account.template">
@@ -9452,7 +9452,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5540" model="account.account.template">
@@ -9461,7 +9461,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5550" model="account.account.template">
@@ -9470,7 +9470,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5559" model="account.account.template">
@@ -9479,7 +9479,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5560" model="account.account.template">
@@ -9488,7 +9488,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5565" model="account.account.template">
@@ -9497,7 +9497,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5566" model="account.account.template">
@@ -9506,7 +9506,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5600" model="account.account.template">
@@ -9515,7 +9515,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5610" model="account.account.template">
@@ -9524,7 +9524,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5650" model="account.account.template">
@@ -9533,7 +9533,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5660" model="account.account.template">
@@ -9542,7 +9542,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5700" model="account.account.template">
@@ -9551,7 +9551,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5710" model="account.account.template">
@@ -9560,7 +9560,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5720" model="account.account.template">
@@ -9569,7 +9569,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5722" model="account.account.template">
@@ -9578,7 +9578,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5723" model="account.account.template">
@@ -9587,7 +9587,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5724" model="account.account.template">
@@ -9596,7 +9596,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5725" model="account.account.template">
@@ -9605,7 +9605,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5726" model="account.account.template">
@@ -9614,7 +9614,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5727" model="account.account.template">
@@ -9623,7 +9623,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5730" model="account.account.template">
@@ -9632,7 +9632,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5731" model="account.account.template">
@@ -9641,7 +9641,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5735" model="account.account.template">
@@ -9650,7 +9650,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5736" model="account.account.template">
@@ -9659,7 +9659,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5745" model="account.account.template">
@@ -9668,7 +9668,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5746" model="account.account.template">
@@ -9677,7 +9677,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5748" model="account.account.template">
@@ -9686,7 +9686,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5749" model="account.account.template">
@@ -9695,7 +9695,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5750" model="account.account.template">
@@ -9704,7 +9704,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5760" model="account.account.template">
@@ -9713,7 +9713,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5764" model="account.account.template">
@@ -9722,7 +9722,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5769" model="account.account.template">
@@ -9731,7 +9731,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5770" model="account.account.template">
@@ -9740,7 +9740,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5780" model="account.account.template">
@@ -9749,7 +9749,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5790" model="account.account.template">
@@ -9758,7 +9758,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5794" model="account.account.template">
@@ -9767,7 +9767,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5800" model="account.account.template">
@@ -9776,7 +9776,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5820" model="account.account.template">
@@ -9785,7 +9785,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5840" model="account.account.template">
@@ -9794,7 +9794,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5860" model="account.account.template">
@@ -9803,7 +9803,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5880" model="account.account.template">
@@ -9812,7 +9812,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K5GVA3" model="account.account.template">
@@ -9837,7 +9837,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K5GVA4" model="account.account.template">
@@ -9862,7 +9862,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5915" model="account.account.template">
@@ -9871,7 +9871,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5920" model="account.account.template">
@@ -9880,7 +9880,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5922" model="account.account.template">
@@ -9889,7 +9889,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5925" model="account.account.template">
@@ -9898,7 +9898,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5927" model="account.account.template">
@@ -9907,7 +9907,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5930" model="account.account.template">
@@ -9916,7 +9916,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5935" model="account.account.template">
@@ -9925,7 +9925,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5940" model="account.account.template">
@@ -9934,7 +9934,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5942" model="account.account.template">
@@ -9943,7 +9943,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5945" model="account.account.template">
@@ -9952,7 +9952,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5947" model="account.account.template">
@@ -9961,7 +9961,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5950" model="account.account.template">
@@ -9970,7 +9970,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5951" model="account.account.template">
@@ -9979,7 +9979,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5952" model="account.account.template">
@@ -9988,7 +9988,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_5953" model="account.account.template">
@@ -9997,7 +9997,7 @@
       <field name="parent_id" ref="chart_skr04_K5GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K6GVA1" model="account.account.template">
@@ -10022,7 +10022,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6010" model="account.account.template">
@@ -10031,7 +10031,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6020" model="account.account.template">
@@ -10040,7 +10040,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6024" model="account.account.template">
@@ -10049,7 +10049,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6026" model="account.account.template">
@@ -10058,7 +10058,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6027" model="account.account.template">
@@ -10067,7 +10067,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6028" model="account.account.template">
@@ -10076,7 +10076,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6030" model="account.account.template">
@@ -10085,7 +10085,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6040" model="account.account.template">
@@ -10094,7 +10094,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6045" model="account.account.template">
@@ -10103,7 +10103,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6050" model="account.account.template">
@@ -10112,7 +10112,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6060" model="account.account.template">
@@ -10121,7 +10121,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6069" model="account.account.template">
@@ -10130,7 +10130,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6070" model="account.account.template">
@@ -10139,7 +10139,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6075" model="account.account.template">
@@ -10148,7 +10148,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6080" model="account.account.template">
@@ -10157,7 +10157,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6090" model="account.account.template">
@@ -10166,7 +10166,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K6GVA12" model="account.account.template">
@@ -10183,7 +10183,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA12"/>
       <field name="reconcile" eval="False"/>
       <field name="type">view</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6110" model="account.account.template">
@@ -10192,7 +10192,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6118" model="account.account.template">
@@ -10201,7 +10201,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6120" model="account.account.template">
@@ -10210,7 +10210,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6130" model="account.account.template">
@@ -10219,7 +10219,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6140" model="account.account.template">
@@ -10228,7 +10228,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6147" model="account.account.template">
@@ -10237,7 +10237,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6148" model="account.account.template">
@@ -10246,7 +10246,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6150" model="account.account.template">
@@ -10255,7 +10255,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6160" model="account.account.template">
@@ -10264,7 +10264,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6170" model="account.account.template">
@@ -10273,7 +10273,7 @@
       <field name="parent_id" ref="chart_skr04_6100"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K6GVA2" model="account.account.template">
@@ -10298,7 +10298,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6205" model="account.account.template">
@@ -10307,7 +10307,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6210" model="account.account.template">
@@ -10316,7 +10316,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6220" model="account.account.template">
@@ -10325,7 +10325,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6221" model="account.account.template">
@@ -10334,7 +10334,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6222" model="account.account.template">
@@ -10343,7 +10343,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6223" model="account.account.template">
@@ -10352,7 +10352,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6230" model="account.account.template">
@@ -10361,7 +10361,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6231" model="account.account.template">
@@ -10370,7 +10370,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6232" model="account.account.template">
@@ -10379,7 +10379,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6233" model="account.account.template">
@@ -10388,7 +10388,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6240" model="account.account.template">
@@ -10397,7 +10397,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6241" model="account.account.template">
@@ -10406,7 +10406,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6242" model="account.account.template">
@@ -10415,7 +10415,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6250" model="account.account.template">
@@ -10424,7 +10424,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6260" model="account.account.template">
@@ -10433,7 +10433,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6262" model="account.account.template">
@@ -10442,7 +10442,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6266" model="account.account.template">
@@ -10451,7 +10451,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6268" model="account.account.template">
@@ -10460,7 +10460,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6269" model="account.account.template">
@@ -10469,7 +10469,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K6GVA3" model="account.account.template">
@@ -10494,7 +10494,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6272" model="account.account.template">
@@ -10503,7 +10503,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6275" model="account.account.template">
@@ -10512,7 +10512,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6280" model="account.account.template">
@@ -10521,7 +10521,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6281" model="account.account.template">
@@ -10530,7 +10530,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6285" model="account.account.template">
@@ -10539,7 +10539,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6286" model="account.account.template">
@@ -10548,7 +10548,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6287" model="account.account.template">
@@ -10557,7 +10557,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K6GVA4" model="account.account.template">
@@ -10582,7 +10582,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6303" model="account.account.template">
@@ -10591,7 +10591,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6304" model="account.account.template">
@@ -10600,7 +10600,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6305" model="account.account.template">
@@ -10609,7 +10609,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6310" model="account.account.template">
@@ -10618,7 +10618,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6313" model="account.account.template">
@@ -10627,7 +10627,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6314" model="account.account.template">
@@ -10636,7 +10636,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6315" model="account.account.template">
@@ -10645,7 +10645,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6318" model="account.account.template">
@@ -10654,7 +10654,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6319" model="account.account.template">
@@ -10663,7 +10663,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6320" model="account.account.template">
@@ -10672,7 +10672,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6325" model="account.account.template">
@@ -10681,7 +10681,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6330" model="account.account.template">
@@ -10690,7 +10690,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6335" model="account.account.template">
@@ -10699,7 +10699,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6340" model="account.account.template">
@@ -10708,7 +10708,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6345" model="account.account.template">
@@ -10717,7 +10717,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6348" model="account.account.template">
@@ -10726,7 +10726,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6349" model="account.account.template">
@@ -10735,7 +10735,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6350" model="account.account.template">
@@ -10744,7 +10744,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6352" model="account.account.template">
@@ -10753,7 +10753,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6390" model="account.account.template">
@@ -10762,7 +10762,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6391" model="account.account.template">
@@ -10771,7 +10771,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6392" model="account.account.template">
@@ -10780,7 +10780,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6393" model="account.account.template">
@@ -10789,7 +10789,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6394" model="account.account.template">
@@ -10798,7 +10798,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6395" model="account.account.template">
@@ -10807,7 +10807,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6396" model="account.account.template">
@@ -10816,7 +10816,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6397" model="account.account.template">
@@ -10825,7 +10825,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6398" model="account.account.template">
@@ -10834,7 +10834,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6400" model="account.account.template">
@@ -10843,7 +10843,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6405" model="account.account.template">
@@ -10852,7 +10852,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6410" model="account.account.template">
@@ -10861,7 +10861,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6420" model="account.account.template">
@@ -10870,7 +10870,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6430" model="account.account.template">
@@ -10879,7 +10879,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6436" model="account.account.template">
@@ -10888,7 +10888,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6437" model="account.account.template">
@@ -10897,7 +10897,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6440" model="account.account.template">
@@ -10906,7 +10906,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6450" model="account.account.template">
@@ -10915,7 +10915,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6460" model="account.account.template">
@@ -10924,7 +10924,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6470" model="account.account.template">
@@ -10933,7 +10933,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6485" model="account.account.template">
@@ -10942,7 +10942,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6490" model="account.account.template">
@@ -10951,7 +10951,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6495" model="account.account.template">
@@ -10960,7 +10960,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6498" model="account.account.template">
@@ -10969,7 +10969,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6499" model="account.account.template">
@@ -10978,7 +10978,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6500" model="account.account.template">
@@ -10987,7 +10987,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6520" model="account.account.template">
@@ -10996,7 +10996,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6530" model="account.account.template">
@@ -11005,7 +11005,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6540" model="account.account.template">
@@ -11014,7 +11014,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6550" model="account.account.template">
@@ -11023,7 +11023,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6560" model="account.account.template">
@@ -11032,7 +11032,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6570" model="account.account.template">
@@ -11041,7 +11041,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6580" model="account.account.template">
@@ -11050,7 +11050,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6590" model="account.account.template">
@@ -11059,7 +11059,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6595" model="account.account.template">
@@ -11068,7 +11068,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6600" model="account.account.template">
@@ -11077,7 +11077,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6610" model="account.account.template">
@@ -11086,7 +11086,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6620" model="account.account.template">
@@ -11095,7 +11095,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6625" model="account.account.template">
@@ -11104,7 +11104,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6630" model="account.account.template">
@@ -11113,7 +11113,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6640" model="account.account.template">
@@ -11122,7 +11122,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6641" model="account.account.template">
@@ -11131,7 +11131,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6642" model="account.account.template">
@@ -11140,7 +11140,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6643" model="account.account.template">
@@ -11149,7 +11149,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6644" model="account.account.template">
@@ -11158,7 +11158,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6645" model="account.account.template">
@@ -11167,7 +11167,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6650" model="account.account.template">
@@ -11176,7 +11176,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6652" model="account.account.template">
@@ -11185,7 +11185,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6660" model="account.account.template">
@@ -11194,7 +11194,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6663" model="account.account.template">
@@ -11203,7 +11203,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6664" model="account.account.template">
@@ -11212,7 +11212,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6668" model="account.account.template">
@@ -11221,7 +11221,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6670" model="account.account.template">
@@ -11230,7 +11230,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6672" model="account.account.template">
@@ -11239,7 +11239,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6673" model="account.account.template">
@@ -11248,7 +11248,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6674" model="account.account.template">
@@ -11257,7 +11257,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6680" model="account.account.template">
@@ -11266,7 +11266,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6688" model="account.account.template">
@@ -11275,7 +11275,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6689" model="account.account.template">
@@ -11284,7 +11284,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6690" model="account.account.template">
@@ -11293,7 +11293,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6700" model="account.account.template">
@@ -11302,7 +11302,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6710" model="account.account.template">
@@ -11311,7 +11311,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6740" model="account.account.template">
@@ -11320,7 +11320,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6760" model="account.account.template">
@@ -11329,7 +11329,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6770" model="account.account.template">
@@ -11338,7 +11338,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6780" model="account.account.template">
@@ -11347,7 +11347,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6790" model="account.account.template">
@@ -11356,7 +11356,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6800" model="account.account.template">
@@ -11365,7 +11365,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6805" model="account.account.template">
@@ -11374,7 +11374,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6810" model="account.account.template">
@@ -11383,7 +11383,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6815" model="account.account.template">
@@ -11392,7 +11392,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6820" model="account.account.template">
@@ -11401,7 +11401,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6821" model="account.account.template">
@@ -11410,7 +11410,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6822" model="account.account.template">
@@ -11419,7 +11419,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6823" model="account.account.template">
@@ -11428,7 +11428,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6824" model="account.account.template">
@@ -11437,7 +11437,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6825" model="account.account.template">
@@ -11446,7 +11446,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6827" model="account.account.template">
@@ -11455,7 +11455,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6830" model="account.account.template">
@@ -11464,7 +11464,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6835" model="account.account.template">
@@ -11473,7 +11473,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6839" model="account.account.template">
@@ -11482,7 +11482,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6840" model="account.account.template">
@@ -11491,7 +11491,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6844" model="account.account.template">
@@ -11500,7 +11500,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6845" model="account.account.template">
@@ -11509,7 +11509,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6850" model="account.account.template">
@@ -11518,7 +11518,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6855" model="account.account.template">
@@ -11527,7 +11527,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6856" model="account.account.template">
@@ -11536,7 +11536,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6857" model="account.account.template">
@@ -11545,7 +11545,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6859" model="account.account.template">
@@ -11554,7 +11554,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6860" model="account.account.template">
@@ -11563,7 +11563,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6865" model="account.account.template">
@@ -11572,7 +11572,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6870" model="account.account.template">
@@ -11581,7 +11581,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6871" model="account.account.template">
@@ -11590,7 +11590,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6875" model="account.account.template">
@@ -11599,7 +11599,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6876" model="account.account.template">
@@ -11608,7 +11608,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6880" model="account.account.template">
@@ -11617,7 +11617,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6883" model="account.account.template">
@@ -11626,7 +11626,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6884" model="account.account.template">
@@ -11635,7 +11635,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6885" model="account.account.template">
@@ -11644,7 +11644,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6886" model="account.account.template">
@@ -11653,7 +11653,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6888" model="account.account.template">
@@ -11662,7 +11662,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6889" model="account.account.template">
@@ -11671,7 +11671,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6890" model="account.account.template">
@@ -11680,7 +11680,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6891" model="account.account.template">
@@ -11689,7 +11689,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6892" model="account.account.template">
@@ -11698,7 +11698,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6895" model="account.account.template">
@@ -11707,7 +11707,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6896" model="account.account.template">
@@ -11716,7 +11716,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6897" model="account.account.template">
@@ -11725,7 +11725,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6898" model="account.account.template">
@@ -11734,7 +11734,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6900" model="account.account.template">
@@ -11743,7 +11743,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6903" model="account.account.template">
@@ -11752,7 +11752,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6905" model="account.account.template">
@@ -11761,7 +11761,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6906" model="account.account.template">
@@ -11770,7 +11770,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6907" model="account.account.template">
@@ -11779,7 +11779,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6908" model="account.account.template">
@@ -11788,7 +11788,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6910" model="account.account.template">
@@ -11797,7 +11797,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6912" model="account.account.template">
@@ -11806,7 +11806,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6915" model="account.account.template">
@@ -11815,7 +11815,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6916" model="account.account.template">
@@ -11824,7 +11824,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6917" model="account.account.template">
@@ -11833,7 +11833,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6920" model="account.account.template">
@@ -11842,7 +11842,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6923" model="account.account.template">
@@ -11851,7 +11851,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6925" model="account.account.template">
@@ -11860,7 +11860,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6926" model="account.account.template">
@@ -11869,7 +11869,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6927" model="account.account.template">
@@ -11878,7 +11878,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6928" model="account.account.template">
@@ -11887,7 +11887,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6929" model="account.account.template">
@@ -11896,7 +11896,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6930" model="account.account.template">
@@ -11905,7 +11905,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6931" model="account.account.template">
@@ -11914,7 +11914,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6932" model="account.account.template">
@@ -11923,7 +11923,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6933" model="account.account.template">
@@ -11932,7 +11932,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6934" model="account.account.template">
@@ -11941,7 +11941,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6935" model="account.account.template">
@@ -11950,7 +11950,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6936" model="account.account.template">
@@ -11959,7 +11959,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6937" model="account.account.template">
@@ -11968,7 +11968,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6938" model="account.account.template">
@@ -11977,7 +11977,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6939" model="account.account.template">
@@ -11986,7 +11986,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6960" model="account.account.template">
@@ -11995,7 +11995,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6967" model="account.account.template">
@@ -12004,7 +12004,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6969" model="account.account.template">
@@ -12013,7 +12013,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K6GVA5" model="account.account.template">
@@ -12038,7 +12038,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6972" model="account.account.template">
@@ -12047,7 +12047,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6974" model="account.account.template">
@@ -12056,7 +12056,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6976" model="account.account.template">
@@ -12065,7 +12065,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6978" model="account.account.template">
@@ -12074,7 +12074,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6979" model="account.account.template">
@@ -12083,7 +12083,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6980" model="account.account.template">
@@ -12092,7 +12092,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6982" model="account.account.template">
@@ -12101,7 +12101,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6984" model="account.account.template">
@@ -12110,7 +12110,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6986" model="account.account.template">
@@ -12119,7 +12119,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6988" model="account.account.template">
@@ -12128,7 +12128,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6989" model="account.account.template">
@@ -12137,7 +12137,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K6GVA6" model="account.account.template">
@@ -12162,7 +12162,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6992" model="account.account.template">
@@ -12171,7 +12171,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6994" model="account.account.template">
@@ -12180,7 +12180,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_6999" model="account.account.template">
@@ -12189,7 +12189,7 @@
       <field name="parent_id" ref="chart_skr04_K6GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K7GVE1" model="account.account.template">
@@ -12214,7 +12214,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7005" model="account.account.template">
@@ -12223,7 +12223,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7006" model="account.account.template">
@@ -12232,7 +12232,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7007" model="account.account.template">
@@ -12241,7 +12241,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7008" model="account.account.template">
@@ -12250,7 +12250,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7009" model="account.account.template">
@@ -12259,7 +12259,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE2" model="account.account.template">
@@ -12284,7 +12284,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7014" model="account.account.template">
@@ -12293,7 +12293,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7015" model="account.account.template">
@@ -12302,7 +12302,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7019" model="account.account.template">
@@ -12311,7 +12311,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE3" model="account.account.template">
@@ -12336,7 +12336,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7102" model="account.account.template">
@@ -12345,7 +12345,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7103" model="account.account.template">
@@ -12354,7 +12354,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7104" model="account.account.template">
@@ -12363,7 +12363,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7105" model="account.account.template">
@@ -12372,7 +12372,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7106" model="account.account.template">
@@ -12381,7 +12381,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7109" model="account.account.template">
@@ -12390,7 +12390,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7110" model="account.account.template">
@@ -12399,7 +12399,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7119" model="account.account.template">
@@ -12408,7 +12408,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7120" model="account.account.template">
@@ -12417,7 +12417,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7129" model="account.account.template">
@@ -12426,7 +12426,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7130" model="account.account.template">
@@ -12435,7 +12435,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7139" model="account.account.template">
@@ -12444,7 +12444,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE4" model="account.account.template">
@@ -12469,7 +12469,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE42" model="account.account.template">
@@ -12486,7 +12486,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7194" model="account.account.template">
@@ -12495,7 +12495,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE42"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA1" model="account.account.template">
@@ -12520,7 +12520,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7204" model="account.account.template">
@@ -12529,7 +12529,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7208" model="account.account.template">
@@ -12538,7 +12538,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7210" model="account.account.template">
@@ -12547,7 +12547,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7214" model="account.account.template">
@@ -12556,7 +12556,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7250" model="account.account.template">
@@ -12565,7 +12565,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7255" model="account.account.template">
@@ -12574,7 +12574,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7260" model="account.account.template">
@@ -12583,7 +12583,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA11"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K7GVA2" model="account.account.template">
@@ -12608,7 +12608,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7303" model="account.account.template">
@@ -12617,7 +12617,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7304" model="account.account.template">
@@ -12626,7 +12626,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7305" model="account.account.template">
@@ -12635,7 +12635,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7306" model="account.account.template">
@@ -12644,7 +12644,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7309" model="account.account.template">
@@ -12653,7 +12653,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7310" model="account.account.template">
@@ -12662,7 +12662,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7313" model="account.account.template">
@@ -12671,7 +12671,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7318" model="account.account.template">
@@ -12680,7 +12680,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7319" model="account.account.template">
@@ -12689,7 +12689,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7320" model="account.account.template">
@@ -12698,7 +12698,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7325" model="account.account.template">
@@ -12707,7 +12707,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7326" model="account.account.template">
@@ -12716,7 +12716,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7327" model="account.account.template">
@@ -12725,7 +12725,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7328" model="account.account.template">
@@ -12734,7 +12734,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7329" model="account.account.template">
@@ -12743,7 +12743,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7330" model="account.account.template">
@@ -12752,7 +12752,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7339" model="account.account.template">
@@ -12761,7 +12761,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7340" model="account.account.template">
@@ -12770,7 +12770,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7349" model="account.account.template">
@@ -12779,7 +12779,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7350" model="account.account.template">
@@ -12788,7 +12788,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7351" model="account.account.template">
@@ -12797,7 +12797,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA21"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K7GVA3" model="account.account.template">
@@ -12822,7 +12822,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA31"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K7GVA32" model="account.account.template">
@@ -12839,7 +12839,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7394" model="account.account.template">
@@ -12848,7 +12848,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7399" model="account.account.template">
@@ -12857,7 +12857,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA32"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K7GVE5" model="account.account.template">
@@ -12882,7 +12882,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7401" model="account.account.template">
@@ -12891,7 +12891,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_7450" model="account.account.template">
@@ -12900,7 +12900,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA4" model="account.account.template">
@@ -12925,7 +12925,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7501" model="account.account.template">
@@ -12934,7 +12934,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7550" model="account.account.template">
@@ -12943,7 +12943,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA41"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K7GVA5" model="account.account.template">
@@ -12968,7 +12968,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7603" model="account.account.template">
@@ -12977,7 +12977,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7604" model="account.account.template">
@@ -12986,7 +12986,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7605" model="account.account.template">
@@ -12995,7 +12995,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7607" model="account.account.template">
@@ -13004,7 +13004,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7608" model="account.account.template">
@@ -13013,7 +13013,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7609" model="account.account.template">
@@ -13022,7 +13022,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7610" model="account.account.template">
@@ -13031,7 +13031,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7630" model="account.account.template">
@@ -13040,7 +13040,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7632" model="account.account.template">
@@ -13049,7 +13049,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7633" model="account.account.template">
@@ -13058,7 +13058,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7634" model="account.account.template">
@@ -13067,7 +13067,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7635" model="account.account.template">
@@ -13076,7 +13076,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7368" model="account.account.template">
@@ -13085,7 +13085,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7639" model="account.account.template">
@@ -13094,7 +13094,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7640" model="account.account.template">
@@ -13103,7 +13103,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7642" model="account.account.template">
@@ -13112,7 +13112,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7644" model="account.account.template">
@@ -13121,7 +13121,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA51"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K7GVA6" model="account.account.template">
@@ -13146,7 +13146,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7675" model="account.account.template">
@@ -13155,7 +13155,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7678" model="account.account.template">
@@ -13164,7 +13164,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7680" model="account.account.template">
@@ -13173,7 +13173,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7685" model="account.account.template">
@@ -13182,7 +13182,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7690" model="account.account.template">
@@ -13191,7 +13191,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7692" model="account.account.template">
@@ -13200,7 +13200,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_7694" model="account.account.template">
@@ -13209,7 +13209,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA61"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE6" model="account.account.template">
@@ -13226,7 +13226,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE6"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_liability"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
     </record>
     
     <record id="chart_skr04_K7GVA7" model="account.account.template">
@@ -13243,7 +13243,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA7"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE7" model="account.account.template">
@@ -13260,7 +13260,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE7"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE8" model="account.account.template">
@@ -13285,7 +13285,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE81"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE82" model="account.account.template">
@@ -13302,7 +13302,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE82"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE83" model="account.account.template">
@@ -13319,7 +13319,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE83"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE84" model="account.account.template">
@@ -13336,7 +13336,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE84"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE85" model="account.account.template">
@@ -13353,7 +13353,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE85"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVE86" model="account.account.template">
@@ -13370,7 +13370,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVE86"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA8" model="account.account.template">
@@ -13395,7 +13395,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA81"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA82" model="account.account.template">
@@ -13412,7 +13412,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA82"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA83" model="account.account.template">
@@ -13429,7 +13429,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA83"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA84" model="account.account.template">
@@ -13446,7 +13446,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA84"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA85" model="account.account.template">
@@ -13463,7 +13463,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA85"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA86" model="account.account.template">
@@ -13480,7 +13480,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA86"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
     </record>
     
     <record id="chart_skr04_K7GVA87" model="account.account.template">
@@ -13497,7 +13497,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA87"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K7GVA88" model="account.account.template">
@@ -13514,7 +13514,7 @@
       <field name="parent_id" ref="chart_skr04_K7GVA88"/>
       <field name="reconcile" eval="False"/>
       <field name="type">other</field>
-      <field name="user_type" ref="account.account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
     </record>
     
     <record id="chart_skr04_K9VKS1" model="account.account.template">
diff --git a/addons/l10n_de/account_types_skr03.xml b/addons/l10n_de/account_types_skr03.xml
index 5967999b601..3c3da6eb67f 100644
--- a/addons/l10n_de/account_types_skr03.xml
+++ b/addons/l10n_de/account_types_skr03.xml
@@ -8,28 +8,28 @@
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_income" >
+	    <record model="account.account.type" id="account.data_account_type_income" >
 	      <field name="name">Erfolgskonten - Erlöse</field>
 	      <field name="code">income</field>
               <field name="report_type">income</field>
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_expense">
+	    <record model="account.account.type" id="account.data_account_type_expense">
 	      <field name="name">Erfolgskonten - Aufwendungen</field>
 	      <field name="code">expense</field>
               <field name="report_type">expense</field>
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_asset">
+	    <record model="account.account.type" id="account.data_account_type_asset">
 	      <field name="name">Bilanzkonten - Aktiva - Vermögenskonten</field>
 	      <field name="code">balance asset</field>
               <field name="report_type">asset</field>
 	      <field name="close_method">balance</field>
 	    </record>
 
-	   <record model="account.account.type" id="account.account_type_liability">
+	   <record model="account.account.type" id="account.data_account_type_liability">
 	      <field name="name">Bilanzkonten - Passiva - Kapitalkonten</field>
 	      <field name="code">balance liability</field>
               <field name="report_type">liability</field>
diff --git a/addons/l10n_de/account_types_skr04.xml b/addons/l10n_de/account_types_skr04.xml
index 5967999b601..3c3da6eb67f 100644
--- a/addons/l10n_de/account_types_skr04.xml
+++ b/addons/l10n_de/account_types_skr04.xml
@@ -8,28 +8,28 @@
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_income" >
+	    <record model="account.account.type" id="account.data_account_type_income" >
 	      <field name="name">Erfolgskonten - Erlöse</field>
 	      <field name="code">income</field>
               <field name="report_type">income</field>
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_expense">
+	    <record model="account.account.type" id="account.data_account_type_expense">
 	      <field name="name">Erfolgskonten - Aufwendungen</field>
 	      <field name="code">expense</field>
               <field name="report_type">expense</field>
 	      <field name="close_method">none</field>
 	    </record>
 
-	    <record model="account.account.type" id="account.account_type_asset">
+	    <record model="account.account.type" id="account.data_account_type_asset">
 	      <field name="name">Bilanzkonten - Aktiva - Vermögenskonten</field>
 	      <field name="code">balance asset</field>
               <field name="report_type">asset</field>
 	      <field name="close_method">balance</field>
 	    </record>
 
-	   <record model="account.account.type" id="account.account_type_liability">
+	   <record model="account.account.type" id="account.data_account_type_liability">
 	      <field name="name">Bilanzkonten - Passiva - Kapitalkonten</field>
 	      <field name="code">balance liability</field>
               <field name="report_type">liability</field>
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 71f18c1e6f3..9dd81606036 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -20,7 +20,7 @@
 {
     'name': 'Ecuador - Accounting',
     'version': '1.1',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Ecuador in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index d68a465969e..4da526f4b76 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -26,7 +26,7 @@
     "version" : "3.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index a7f5eea650d..d4b4f91d911 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -30,7 +30,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index 4ab134e18b9..0ad042b3b28 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "0.2",
     "author" : "P. Christeas, OpenERP SA.",
     "website": "http://openerp.hellug.gr/",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index c4f9ff0f0a4..f05bbdaaff1 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -35,7 +35,7 @@
 {
     'name': 'Guatemala - Accounting',
     'version': '3.0',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Guatemala.
 =====================================================================
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
index 157d396a6ae..af8bb4cfa1d 100644
--- a/addons/l10n_hn/__openerp__.py
+++ b/addons/l10n_hn/__openerp__.py
@@ -35,7 +35,7 @@
 {
     'name': 'Honduras - Accounting',
     'version': '0.1',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras.  It also includes taxes and the Lempira currency""",
     'author': 'Salvatore Josue Trimarchi Pinto',
     'website': 'http://trimarchi.co.cc',
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 6578eb2242a..2c54ca256fc 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -29,7 +29,7 @@ Indian Accounting : Chart of Account.
 Indian accounting chart and localization.
     """,
     "author": ['OpenERP SA', 'Axelor'],
-    "category": "Localization",
+    "category": "Localization/Account Charts",
     "depends": [
         "account",
         "account_chart"
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 5376896cf06..b531db26c99 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -39,7 +39,7 @@ Piano dei conti italiano di un'impresa generica.
 Italian accounting chart and localization.
     """,
     "license": "AGPL-3",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     'website': 'http://www.openerp-italia.org/',
     'init_xml': [
         ],
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index fdb9240c63c..68c2e7ac76b 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Luxembourg - Accounting',
     'version': '1.0',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Luxembourg.
 ======================================================================
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index d1d2c5900c9..69fd801e1dc 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Maroc - Accounting",
     "version" : "1.0",
     "author" : "kazacube",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 1e8c3bdc9c8..aa21d1a6356 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Mexico - Accounting",
     "version" : "1.0",
     "author" : "RelTek Mexico",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Mexico in OpenERP.
 ========================================================================
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 951a8e45c68..562fd0ab876 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -88,7 +88,7 @@
 {
     "name" : "Netherlands - Accounting",
     "version" : "1.5",
-    "category": "Localization",
+    "category": "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
 =============================================================================
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index f9acc28db9e..de1784009b5 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "Grzegorz Grzelak (Cirrus)",
     "website": "http://www.cirrus.pl",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart and taxes for Poland in OpenERP.
 ==================================================================================
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 69886777879..df441869d72 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.1",
     "author" : "filsys",
     "website": "http://www.filsystem.ro",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": """
 This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 197199092c9..7b258a04507 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "OHADA - Accounting",
     "version" : "1.0",
     "author" : "Baamtu Senegal",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """This module implements the accounting chart for OHADA area.
     It allows any company or association to manage its financial accounting.
     Countries that use OHADA are the following:
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index ea29b7cde13..c1534787721 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Thailand - Accounting',
     'version': '1.0',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of Accounts for Thailand.
 ===============================
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index 1e205759a8b..f6e8212aed0 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'UK - Accounting',
     'version': '1.0',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with:
     - a CT600-ready chart of accounts
     - VAT100-ready tax structure
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index 06c1ce9747e..ce44be32771 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -26,7 +26,7 @@
     "name" : "Venezuela - Accounting",
     "version" : "1.0",
     "author" : ['OpenERP SA', "Netquatro"],
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description":
 '''
 This is the module to manage the accounting chart for Venezuela in OpenERP.
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index e84cdb41c0d..7d665c96435 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
     </record>
 
diff --git a/addons/lunch/static/src/img/icon.png b/addons/lunch/static/src/img/icon.png
new file mode 100644
index 00000000000..7493a3c7f4e
Binary files /dev/null and b/addons/lunch/static/src/img/icon.png differ
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 344e562eb67..d04473da8bf 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -2,11 +2,13 @@
 <openerp>
 <data>
     <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
     </record>
 
     <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
         <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
     </record>
 
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 44a2f1e30bd..44646a07ead 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -58,7 +58,11 @@ Note: If you need demo data, you can install the marketing_campaign_crm_demo mod
         "security/ir.model.access.csv"
     ],
     'demo_xml': [
+        'marketing_campaign_demo.xml',
     ],
+    'test': [
+        'test/marketing_campaign.yml',
+     ],
     'installable': True,
     'active': False,
     'certificate' : '00421723279617928365',
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 82832134c27..4e6f6a5227e 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -164,11 +164,12 @@ Normal - the campaign runs normally and automatically sends all emails and repor
         self.write(cr, uid, ids, {'state': 'cancelled'})
         return True
 
-
+    # dead code
     def signal(self, cr, uid, model, res_id, signal, run_existing=True, context=None):
         record = self.pool.get(model).browse(cr, uid, res_id, context)
         return self._signal(cr, uid, record, signal, run_existing, context)
 
+    #dead code
     def _signal(self, cr, uid, record, signal, run_existing=True, context=None):
         if not signal:
             raise ValueError('signal cannot be False')
@@ -461,6 +462,7 @@ class marketing_campaign_activity(osv.osv):
         return super(marketing_campaign_activity, self).search(cr, uid, args,
                                            offset, limit, order, context, count)
 
+    #dead code
     def _process_wi_report(self, cr, uid, activity, workitem, context=None):
         service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
         (report_data, format) = service.create(cr, uid, [], {}, {})
@@ -481,6 +483,7 @@ class marketing_campaign_activity(osv.osv):
                                             activity.email_template_id.id,
                                             workitem.res_id, context=context)
 
+    #dead code
     def _process_wi_action(self, cr, uid, activity, workitem, context=None):
         if context is None:
             context = {}
@@ -670,7 +673,7 @@ class marketing_campaign_workitem(osv.osv):
 
     def _process_one(self, cr, uid, workitem, context=None):
         if workitem.state != 'todo':
-            return
+            return False
 
         activity = workitem.activity_id
         proxy = self.pool.get(workitem.object_id.model)
@@ -707,7 +710,7 @@ class marketing_campaign_workitem(osv.osv):
 
             if result:
                 # process _chain
-                workitem = workitem.browse(context)[0] # reload
+                workitem = workitem.browse(context=context)[0] # reload
                 date = datetime.strptime(workitem.date, DT_FMT)
 
                 for transition in activity.to_ids:
@@ -784,11 +787,7 @@ class marketing_campaign_workitem(osv.osv):
         res = {}
         wi_obj = self.browse(cr, uid, ids[0], context=context)
         if wi_obj.activity_id.type == 'email':
-            data_obj = self.pool.get('ir.model.data')
-            data_id = data_obj._get_id(cr, uid, 'email_template', 'email_template_preview_form')
-            view_id = 0
-            if data_id:
-                view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+            view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'email_template', 'email_template_preview_form')
             res = {
                 'name': _('Email Preview'),
                 'view_type': 'form',
@@ -796,7 +795,7 @@ class marketing_campaign_workitem(osv.osv):
                 'res_model': 'email_template.preview',
                 'view_id': False,
                 'context': context,
-                'views': [(view_id, 'form')],
+                'views': [(view_id and view_id[1] or 0, 'form')],
                 'type': 'ir.actions.act_window',
                 'target': 'new',
                 'nodestroy':True,
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
new file mode 100644
index 00000000000..aaf5a98c6bc
--- /dev/null
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <!-- Email tempalte -->
+        <record id="email_template_1" model="email.template">
+            <field name="name">Template for New Partner</field>
+            <field name="email_from">info@tinyerp.com</field>
+            <field name="subject">Welcome in OpenERP Partner Channel!</field>
+            <field name="email_to">${object.email or ''}</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="body_text">Hello, We are very happy to send Welcome message.</field>
+        </record>
+        <record id="email_template_2" model="email.template">
+            <field name="name">Template for Silver Partner</field>
+            <field name="email_from">info@tinyerp.com</field>
+            <field name="subject">Congratulation! You become now our Silver Partner.</field>
+            <field name="email_to">${object.email or ''}</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="body_text">Hello, We are happy to announce that you now become our Silver Partner.</field>
+        </record>
+
+        <record id="email_template_3" model="email.template">
+            <field name="name">Template for Gold Partner</field>
+            <field name="email_from">info@tinyerp.com</field>
+            <field name="subject">Congratulation! You become our Gold Partner.</field>
+            <field name="email_to">${object.email or ''}</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="body_text">Hello, We are happy to announce that you become our Gold Partner.</field>
+        </record>
+
+
+
+    <!-- Campaign -->
+        <record id="marketing_campaign_openerppartnerchannel" model="marketing.campaign">
+            <field name="name">OpenERP Partner Channel</field>
+            <field name="object_id" ref="base.model_res_partner"/>
+            <field name="mode">active</field>
+        </record>
+
+            <!-- Activity -->
+
+        <record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
+            <field name="name">New Partner</field>
+            <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+            <field name="email_template_id" ref="email_template_1"/>
+            <field name="condition">object.credit_limit &lt; 10000</field>
+            <field name="keep_if_condition_not_met">True</field>
+            <field eval="1" name="start"/>
+        </record>
+        <record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
+            <field name="name">Silver Partner</field>
+            <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+            <field name="condition">object.credit_limit &gt;= 10000 and object.credit_limit &lt; 50000</field>
+            <field name="keep_if_condition_not_met">True</field>
+            <field name="email_template_id" ref="email_template_2"/>
+        </record>
+
+        <record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
+            <field name="name">Gold Partner</field>
+            <field name="condition">object.credit_limit &gt;= 100000</field>
+            <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+            <field name="keep_if_condition_not_met">True</field>
+            <field name="email_template_id" ref="email_template_3"/>
+        </record>
+
+
+    <!-- Tranisition -->
+        <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+        </record>
+
+        <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_1"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+        </record>
+
+    <!-- Segment -->
+        <record id="filter0" model="ir.filters">
+            <field name="name">Partners</field>
+            <field name="domain">[('name','like','Agrolait')]</field>
+            <field name="model_id">res.partner</field>
+        </record>
+        <record id="marketing_campaign_segment0" model="marketing.campaign.segment">
+            <field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
+            <field name="name">OpenERP Partner</field>
+            <field name="sync_mode">create_date</field>
+            <field name="ir_filter_id" ref="filter0"></field>
+            <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/marketing_campaign/test/marketing_campaign.yml b/addons/marketing_campaign/test/marketing_campaign.yml
new file mode 100644
index 00000000000..1b7a7fa2ae3
--- /dev/null
+++ b/addons/marketing_campaign/test/marketing_campaign.yml
@@ -0,0 +1,151 @@
+-
+  In order to test process of compaign, I start compaign.
+-
+  !workflow {model: marketing.campaign, action: state_running_set, ref: marketing_campaign_openerppartnerchannel}
+-
+  I check the campaign on Running mode after started.
+-
+  !assert {model: marketing.campaign, id: marketing_campaign_openerppartnerchannel}:
+    - state == 'running'
+-
+  I start this segment after assinged campaign.
+-
+  !workflow {model: marketing.campaign.segment, action: state_running_set, ref: marketing_campaign_segment0}
+-
+  I check the segment on Running mode after started.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+    - state == 'running'
+-
+  I synchronized segment manually to see all step of activity and process covered on this campaign.
+-
+  !python {model: marketing.campaign.segment}: |
+    segment_id = self.browse(cr ,uid ,ref("marketing_campaign_segment0") ,context)
+    assert segment_id.date_next_sync, 'Next Synchronization date is not calculated.'
+    self.synchroniz(cr, uid, [ref("marketing_campaign_segment0")])
+-
+  I cancel Marketing Workitems.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel'))])
+    self.button_cancel(cr, uid, ids)
+    record = self.browse(cr, uid, ids[0])
+    assert record.state == 'cancelled' or record.state == 'done' , 'Marketing Workitem shoud be in cancel state.'
+-
+  I set Marketing Workitems in draft state.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel'))])
+    self.button_draft(cr, uid, ids)
+    record = self.browse(cr, uid, ids[0])
+    assert record.state == 'todo' or record.state == 'done' , 'Marketing Workitem shoud be in draft state.'
+-
+  I check followup detail of first activity.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
+    assert ids, 'Followup item is not created for first activity.'
+    work_item_id = self.browse(cr ,uid ,ids[0] ,context)
+    assert work_item_id.res_name, 'Resource Name is not defined.'
+-
+  I process followup of first activity.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
+    self.process(cr, uid, ids)
+    record = self.browse(cr, uid, ids)[0]
+    assert record.state == "done", "Followup item should be closed after process."
+-
+  I check followup detail of second activity after process of first activity.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_1'))])
+    assert ids, 'Followup item is not created for second activity.'
+-
+  Now I increase credit limit of customer
+-
+  !python {model: res.partner}: |
+    self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':41000}, context=context)
+-
+  I process followup of second activity after set draft.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_1'))])
+    self.button_draft(cr, uid, ids, context=context)
+    self.process(cr, uid, ids, context=context)
+    record = self.browse(cr, uid, ids[0], context=context)
+    assert record.state == "done", "Followup item should be closed after process."
+-
+  I check followup detail of third activity after process of second activity.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+    assert ids, 'Followup item is not created for third activity.'
+-
+  Now I increase credit limit of customer
+-
+  !python {model: res.partner}: |
+    self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':151000}, context=context)
+-
+  I process followup of third activity after set draft.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+    self.button_draft(cr, uid, ids, context=context)
+    self.process(cr, uid, ids, context=context)
+    record = self.browse(cr, uid, ids[0], context=context)
+    assert record.state == "done", "Followup item should be closed after process."
+-
+  I print workitem report.
+-
+  !python {model: marketing.campaign.workitem}: |
+    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+    self.preview(cr, uid, ids)
+-
+  I cancel segmentation because of some activity.
+-
+  !workflow {model: marketing.campaign.segment, action: state_cancel_set, ref: marketing_campaign_segment0}
+-
+  I check the segmentation is canceled.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+    - state == 'cancelled'
+-
+  I reopen the segmentation.
+-
+  !workflow {model: marketing.campaign.segment, action: state_draft_set, ref: marketing_campaign_segment0}
+-
+  !workflow {model: marketing.campaign.segment, action: state_running_set, ref: marketing_campaign_segment0}
+-
+  I check the segment on Running mode after started.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+    - state == 'running'
+-
+  I close segmentation After completion of all activity.
+-
+  !workflow {model: marketing.campaign.segment, action: state_done_set, ref: marketing_campaign_segment0}
+-
+  I check the segmentation is done.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+    - state == 'done'
+-
+  I close this campaing.
+-
+  !workflow {model: marketing.campaign.segment, action: state_done_set, ref: marketing_campaign_openerppartnerchannel}
+-
+  I check the campaing is done.
+-
+  !assert {model: marketing.campaign.segment, id: marketing_campaign_openerppartnerchannel}:
+    - state == 'done'
+
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index abf29f2c011..989d11e6ffd 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -58,7 +58,7 @@
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
-            <record id="email_template_3" model="email.template">
+        <record id="email_template_3" model="email.template">
             <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
             <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
@@ -72,7 +72,7 @@
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
-             <record id="email_template_4" model="email.template">
+        <record id="email_template_4" model="email.template">
             <field name="subject">Thanks for buying the OpenERP book</field>
             <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
@@ -91,7 +91,6 @@
             <field name="email_to">info@tinyerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-            <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
             <field name="body_text">Hello, We have very good offer that might suit you.
             For our gold partners,We are arranging free technical training on june,2010.
@@ -157,6 +156,7 @@
         <record id="marketing_campaign_openerpondemandfreetrial0" model="marketing.campaign">
             <field name="name">OpenERP OnDemand Free Trial 2010</field>
             <field name="object_id" ref="crm.model_crm_lead"/>
+            <field name="mode">active</field>
             <field name="partner_field_id" ref="crm.field_crm_lead_partner_id"/>
         </record>
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index dafe399b583..eb1070ac941 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -522,6 +522,7 @@
             <field name="res_model">mrp.bom</field>
             <field name="domain">[('id','=',active_id)]</field>
             <field name="view_type">tree</field>
+            <field name="view_mode">tree</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
         <record id="ir_BOM_structure" model="ir.values">
@@ -776,7 +777,7 @@
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
-                            <field name="user_id"/> 
+                            <field name="user_id"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
@@ -972,7 +973,7 @@
                </data>
             </field>
         </record>
-        
+
         <act_window
             context="{'search_default_product_id': [active_id]}"
             id="act_product_manufacturing_open"
@@ -980,13 +981,14 @@
             view_id="mrp_production_tree_view"
             res_model="mrp.production"
             src_model="product.product"/>
-            
+
         <act_window
             id="action_product_bom_structure"
             name="Product BoM Structure"
             domain="[('product_id', '=', active_id),('bom_id','=',False)]"
             context="{'default_product_id': active_id}"
             view_type="tree"
+            view_mode="tree"
             view_id="mrp_bom_tree_view"
             res_model="mrp.bom"
             src_model="product.product"
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index fb83f8c4a62..b4b79d6f606 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record id="group_mrp_user" model="res.groups">
-        <field name="name">Manufacturing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_manufacturing"/>
     </record>
     <record id="group_mrp_manager" model="res.groups">
-        <field name="name">Manufacturing / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_manufacturing"/>
         <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/>
     </record>
 
diff --git a/addons/mrp/static/src/img/icon.png b/addons/mrp/static/src/img/icon.png
index 600104af507..89f504a656a 100644
Binary files a/addons/mrp/static/src/img/icon.png and b/addons/mrp/static/src/img/icon.png differ
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index ee95e5d0835..2d9345ffd83 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -16,7 +16,7 @@
                     <group col="7" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}"/>
                         <button name="invoice" string="Invoice" icon="gtk-apply" type="workflow" states="paid" attrs="{'invisible': ['|',('partner_id','=',False),('state','&lt;&gt;','paid')]}"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 09f1e8860fd..640a33d325b 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="1">
 
     <record id="group_pos_user" model="res.groups">
-        <field name="name">Point of Sale / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_point_of_sale"/>
     </record>
     <record id="group_pos_manager" model="res.groups">
-        <field name="name">Point of Sale / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_point_of_sale"/>
         <field name="implied_ids" eval="[(4, ref('group_pos_user')), (4, ref('stock.group_stock_user'))]"/>
     </record>
 
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 24eb704b7dc..afb6d19898f 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -478,3 +478,34 @@
 .point-of-sale .pos-receipt-container {
     font-size: 0.75em;
 }
+
+.point-of-sale .oe_pos_synch-notification-button {
+    color: white;
+    border: 1px solid black;
+    border-radius: 3px;
+    padding: 2px 3px 2px 3px;
+    background-color: #D92A2A;
+}
+
+@media print {
+    #oe_header, #oe_menu, .point-of-sale #topheader, .point-of-sale #leftpane {
+        display: none;
+    }
+    .point-of-sale #content {
+        top: 0px;
+    }
+    .point-of-sale #rigthpane {
+        left: 0px;
+        background-color: white;
+    }
+    #receipt-screen header, #pos-finish-order {
+        display: none;
+    }
+    #receipt-screen {
+        text-align: left;
+    }
+    .pos-sale-ticket {
+        margin: 0;
+    }
+}
+
diff --git a/addons/point_of_sale/static/src/img/icon.png b/addons/point_of_sale/static/src/img/icon.png
new file mode 100644
index 00000000000..ada5b10f23c
Binary files /dev/null and b/addons/point_of_sale/static/src/img/icon.png differ
diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 05adcaf458a..173793c3251 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -22,62 +22,122 @@ openerp.point_of_sale = function(db) {
     QWeb.add_template("/point_of_sale/static/src/xml/pos.xml");
     var qweb_template = function(template) {
         return function(ctx) {
-            return QWeb.render(template, ctx);
+            return QWeb.render(template, _.extend({}, ctx,{
+                'currency': pos.get('currency'),
+                'format_amount': function(amount) {
+                    if (pos.get('currency').position == 'after') {
+                        return amount + ' ' + pos.get('currency').symbol;
+                    } else {
+                        return pos.get('currency').symbol + ' ' + amount;
+                    }
+                },
+                }));
         };
     };
+    var _t = db.web._t;
 
     /*
      Local store access. Read once from localStorage upon construction and persist on every change.
      There should only be one store active at any given time to ensure data consistency.
      */
-    var Store = (function() {
-        function Store() {
-            var store;
-            store = localStorage['pos'];
-            this.data = (store && JSON.parse(store)) || {};
-        }
-
-        Store.prototype.get = function(key) {
+    var Store = db.web.Class.extend({
+        init: function() {
+            this.data = {};
+        },
+        get: function(key, _default) {
+            if (this.data[key] === undefined) {
+                var stored = localStorage['oe_pos_' + key];
+                if (stored)
+                    this.data[key] = JSON.parse(stored);
+                else
+                    return _default;
+            }
             return this.data[key];
-        };
-        Store.prototype.set = function(key, value) {
+        },
+        set: function(key, value) {
             this.data[key] = value;
-            return localStorage['pos'] = JSON.stringify(this.data);
-        };
-        return Store;
-    })();
+            localStorage['oe_pos_' + key] = JSON.stringify(value);
+        },
+    });
     /*
      Gets all the necessary data from the OpenERP web client (session, shop data etc.)
      */
-    var Pos = (function() {
-        function Pos(session) {
+    var Pos = Backbone.Model.extend({
+        initialize: function(session, attributes) {
+            Backbone.Model.prototype.initialize.call(this, attributes);
+            this.store = new Store();
+            this.ready = $.Deferred();
+            this.flush_mutex = new $.Mutex();
             this.build_tree = _.bind(this.build_tree, this);
             this.session = session;
+            this.set({'pending_operations': this.store.get('pending_operations', [])});
+            this.bind('change:pending_operations', _.bind(function(unused, val) {
+                this.store.set('pending_operations', val);
+            }, this));
+            this.set({'currency': this.store.get('currency', {symbol: '$', position: 'after'})});
+            this.bind('change:currency', _.bind(function(unused, val) {
+                this.store.set('currency', val);
+            }, this));
             $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']),
                 this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img'], [['pos_categ_id', '!=', 'false']]),
-                this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name']),
-                this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']))
+                this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'], [['state', '=', 'open']]),
+                this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']),
+                this.get_currency())
                 .then(this.build_tree);
-        }
-
-        Pos.prototype.ready = $.Deferred();
-        Pos.prototype.store = new Store;
-        Pos.prototype.fetch = function(osvModel, fields, domain) {
+        },
+        fetch: function(osvModel, fields, domain) {
             var dataSetSearch;
             var self = this;
-            var callback = function(result) {
-                return self.store.set(osvModel, result);
-            };
             dataSetSearch = new db.web.DataSetSearch(this, osvModel, {}, domain);
-            return dataSetSearch.read_slice(fields, 0).then(callback);
-        };
-        Pos.prototype.push = function(osvModel, record, callback, errorCallback) {
-            var dataSet;
-            dataSet = new db.web.DataSet(this, osvModel, null);
-            return dataSet.create(record, callback, errorCallback);
-        };
-        Pos.prototype.categories = {};
-        Pos.prototype.build_tree = function() {
+            return dataSetSearch.read_slice(fields, 0).then(function(result) {
+                return self.store.set(osvModel, result);
+            });
+        },
+        get_currency: function() {
+            return new db.web.Model("sale.shop").get_func("search_read")([]).pipe(function(result) {
+                var company_id = result[0]['company_id'][0];
+                return new db.web.Model("res.company").get_func("read")(company_id, ['currency_id']).pipe(function(result) {
+                    var currency_id = result['currency_id'][0]
+                    return new db.web.Model("res.currency").get_func("read")([currency_id],
+                            ['symbol', 'position']).pipe(function(result) {
+                        return result[0];
+                    });
+                });
+            }).then(_.bind(function(currency) {
+                this.set({'currency': currency});
+            }, this));
+        },
+        push: function(osvModel, record) {
+            var ops = _.clone(this.get('pending_operations'));
+            ops.push({model: osvModel, record: record});
+            this.set({pending_operations: ops});
+            return this.flush();
+        },
+        flush: function() {
+            return this.flush_mutex.exec(_.bind(function() {
+                return this._int_flush();
+            }, this));
+        },
+        _int_flush : function() {
+            var ops = this.get('pending_operations');
+            if (ops.length === 0)
+                return $.when();
+            var op = ops[0];
+            var dataSet = new db.web.DataSet(this, op.model, null);
+            /* we prevent the default error handler and assume errors
+             * are a normal use case, except we stop the current iteration
+             */
+            return dataSet.create(op.record).fail(function(unused, event) {
+                event.preventDefault();
+            }).pipe(_.bind(function() {
+                console.debug('saved 1 record');
+                var ops2 = this.get('pending_operations');
+                this.set({'pending_operations': _.without(ops2, op)});
+                return this._int_flush();
+            }, this), function() {return $.when()});
+        },
+        categories: {},
+        build_tree: function() {
             var c, id, _i, _len, _ref, _ref2;
             _ref = this.store.get('pos.category');
             for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -124,14 +184,14 @@ openerp.point_of_sale = function(db) {
                 }).call(this)
             };
             return this.ready.resolve();
-        };
-        Pos.prototype.build_ancestors = function(parent) {
+        },
+        build_ancestors: function(parent) {
             if (parent != null) {
                 this.current_category.ancestors.unshift(parent);
                 return this.build_ancestors(this.categories[parent].parent);
             }
-        };
-        Pos.prototype.build_subtree = function(category) {
+        },
+        build_subtree: function(category) {
             var c, _i, _len, _ref, _results;
             _ref = category.children;
             _results = [];
@@ -141,9 +201,8 @@ openerp.point_of_sale = function(db) {
                 _results.push(this.build_subtree(this.categories[c]));
             }
             return _results;
-        };
-        return Pos;
-    })();
+        }
+    });
 
     /* global variable */
     var pos;
@@ -210,26 +269,28 @@ openerp.point_of_sale = function(db) {
      To add more of the same product, just update the quantity accordingly.
      The Order also contains payment information.
      */
-    var Orderline = (function() {
-        __extends(Orderline, Backbone.Model);
-        function Orderline() {
-            Orderline.__super__.constructor.apply(this, arguments);
-        }
-
-        Orderline.prototype.defaults = {
+    var Orderline = Backbone.Model.extend({
+        defaults: {
             quantity: 1,
             list_price: 0,
             discount: 0
-        };
-        Orderline.prototype.incrementQuantity = function() {
+        },
+        initialize: function(attributes) {
+            Backbone.Model.prototype.initialize.apply(this, arguments);
+            this.bind('change:quantity', function(unused, qty) {
+                if (qty == 0)
+                    this.trigger('killme');
+            }, this);
+        },
+        incrementQuantity: function() {
             return this.set({
                 quantity: (this.get('quantity')) + 1
             });
-        };
-        Orderline.prototype.getTotal = function() {
+        },
+        getTotal: function() {
             return (this.get('quantity')) * (this.get('list_price')) * (1 - (this.get('discount')) / 100);
-        };
-        Orderline.prototype.exportAsJSON = function() {
+        },
+        exportAsJSON: function() {
             var result;
             result = {
                 qty: this.get('quantity'),
@@ -238,18 +299,11 @@ openerp.point_of_sale = function(db) {
                 product_id: this.get('id')
             };
             return result;
-        };
-        return Orderline;
-    })();
-    var OrderlineCollection = (function() {
-        __extends(OrderlineCollection, Backbone.Collection);
-        function OrderlineCollection() {
-            OrderlineCollection.__super__.constructor.apply(this, arguments);
-        }
-
-        OrderlineCollection.prototype.model = Orderline;
-        return OrderlineCollection;
-    })();
+        },
+    });
+    var OrderlineCollection = Backbone.Collection.extend({
+        model: Orderline,
+    });
     /*
      Every PaymentLine has all the attributes of the corresponding CashRegister.
      */
@@ -268,7 +322,7 @@ openerp.point_of_sale = function(db) {
         Paymentline.prototype.exportAsJSON = function() {
             var result;
             result = {
-                name: "Payment line",
+                name: db.web.datetime_to_str(new Date()),
                 statement_id: this.get('id'),
                 account_id: (this.get('account_id'))[0],
                 journal_id: (this.get('journal_id'))[0],
@@ -324,9 +378,13 @@ openerp.point_of_sale = function(db) {
             var existing;
             existing = (this.get('orderLines')).get(product.id);
             if (existing != null) {
-                return existing.incrementQuantity();
+                existing.incrementQuantity();
             } else {
-                return (this.get('orderLines')).add(new Orderline(product.toJSON()));
+                var line = new Orderline(product.toJSON());
+                this.get('orderLines').add(line);
+                line.bind('killme', function() {
+                    this.get('orderLines').remove(line);
+                }, this);
             }
         };
         Order.prototype.addPaymentLine = function(cashRegister) {
@@ -617,7 +675,7 @@ openerp.point_of_sale = function(db) {
      Shopping carts.
      */
     var OrderlineWidget = db.web.Widget.extend({
-        tagName: 'tr',
+        tag_name: 'tr',
         template_fct: qweb_template('pos-orderline-template'),
         init: function(parent, options) {
             this._super(parent);
@@ -662,13 +720,12 @@ openerp.point_of_sale = function(db) {
         changeSelectedOrder: function() {
             this.currentOrderLines.unbind();
             this.bindOrderLineEvents();
-            return this.render_element();
+            this.render_element();
         },
         bindOrderLineEvents: function() {
             this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines');
             this.currentOrderLines.bind('add', this.addLine, this);
-            this.currentOrderLines.bind('change', this.render_element, this);
-            return this.currentOrderLines.bind('remove', this.render, this);
+            this.currentOrderLines.bind('remove', this.render_element, this);
         },
         addLine: function(newLine) {
             var line = new OrderlineWidget(null, {
@@ -677,7 +734,7 @@ openerp.point_of_sale = function(db) {
                     numpadState: this.numpadState
             });
             line.appendTo(this.$element);
-            return this.updateSummary();
+            this.updateSummary();
         },
         render_element: function() {
             this.$element.empty();
@@ -689,7 +746,7 @@ openerp.point_of_sale = function(db) {
                 });
                 line.appendTo(this.$element);
             }, this));
-            return this.updateSummary();
+            this.updateSummary();
         },
         updateSummary: function() {
             var currentOrder, tax, total, totalTaxExcluded;
@@ -699,7 +756,7 @@ openerp.point_of_sale = function(db) {
             tax = currentOrder.getTax();
             $('#subtotal').html(totalTaxExcluded.toFixed(2)).hide().fadeIn();
             $('#tax').html(tax.toFixed(2)).hide().fadeIn();
-            return $('#total').html(total.toFixed(2)).hide().fadeIn();
+            $('#total').html(total.toFixed(2)).hide().fadeIn();
         },
     });
     /*
@@ -831,12 +888,13 @@ openerp.point_of_sale = function(db) {
         validateCurrentOrder: function() {
             var callback, currentOrder;
             currentOrder = this.shop.get('selectedOrder');
-            callback = _.bind(function() {
+            $('button#validate-order', this.$element).attr('disabled', 'disabled');
+            pos.push('pos.order', currentOrder.exportAsJSON()).then(_.bind(function() {
+                $('button#validate-order', this.$element).removeAttr('disabled');
                 return currentOrder.set({
                     validated: true
                 });
-            }, this);
-            pos.push('pos.order', currentOrder.exportAsJSON(), callback);
+            }, this));
         },
         bindPaymentLineEvents: function() {
             this.currentPaymentLines = (this.shop.get('selectedOrder')).get('paymentLines');
@@ -1103,7 +1161,7 @@ openerp.point_of_sale = function(db) {
                 s = $(this).val().toLowerCase();
                 if (s) {
                     m = products.filter( function(p) {
-                        return p.name.toLowerCase().indexOf(s);
+                        return p.name.toLowerCase().indexOf(s) != -1;
                     });
                     $('.search-clear').fadeIn();
                 } else {
@@ -1120,29 +1178,109 @@ openerp.point_of_sale = function(db) {
         };
         return App;
     })();
+    
+    db.point_of_sale.SynchNotification = db.web.Widget.extend({
+        template: "pos-synch-notification",
+        init: function() {
+            this._super.apply(this, arguments);
+            this.nbr_pending = 0;
+        },
+        render_element: function() {
+            this._super.apply(this, arguments);
+            $('.oe_pos_synch-notification-button', this.$element).click(this.on_synch);
+        },
+        on_change_nbr_pending: function(nbr_pending) {
+            this.nbr_pending = nbr_pending;
+            this.render_element();
+        },
+        on_synch: function() {}
+    });
 
     db.web.client_actions.add('pos.ui', 'db.point_of_sale.PointOfSale');
     db.point_of_sale.PointOfSale = db.web.Widget.extend({
-        template: "PointOfSale",
-        start: function() {
-            var self = this;
-            this.$element.find("#loggedas button").click(function() {
-                self.stop();
-            });
+        init: function() {
+            this._super.apply(this, arguments);
 
             if (pos)
                 throw "It is not possible to instantiate multiple instances "+
                     "of the point of sale at the same time.";
             pos = new Pos(this.session);
+        },
+        start: function() {
+            var self = this;
+            return pos.ready.then(_.bind(function() {
+                this.render_element();
+                this.synch_notification = new db.point_of_sale.SynchNotification(this);
+                this.synch_notification.replace($('.oe_pos_synch-notification', this.$element));
+                this.synch_notification.on_synch.add(_.bind(pos.flush, pos));
+                
+                pos.bind('change:pending_operations', this.changed_pending_operations, this);
+                this.changed_pending_operations();
+                
+                this.$element.find("#loggedas button").click(function() {
+                    self.try_close();
+                });
+    
+                this.$element.find('#steps').buttonset();
 
-            this.$element.find('#steps').buttonset();
-            
-            $('.oe_toggle_secondary_menu').hide();
-            $('.oe_footer').hide();
-
-            return pos.ready.then( function() {
                 pos.app = new App(self.$element);
-            });
+                $('.oe_toggle_secondary_menu').hide();
+                $('.oe_footer').hide();
+                
+                if (pos.store.get('account.bank.statement').length === 0)
+                    return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_open_statement']], ['res_id']).pipe(
+                            _.bind(function(res) {
+                        return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
+                            var action = result.result;
+                            this.do_action(action);
+                        }, this));
+                    }, this));
+            }, this));
+        },
+        render: function() {
+            return qweb_template("PointOfSale")();
+        },
+        changed_pending_operations: function () {
+            this.synch_notification.on_change_nbr_pending(pos.get('pending_operations').length);
+        },
+        try_close: function() {
+            pos.flush().then(_.bind(function() {
+                var close = _.bind(this.close, this);
+                if (pos.get('pending_operations').length > 0) {
+                    var confirm = false;
+                    $(QWeb.render('pos-close-warning')).dialog({
+                        resizable: false,
+                        height:160,
+                        modal: true,
+                        title: "Warning",
+                        buttons: {
+                            "Yes": function() {
+                                confirm = true;
+                                $( this ).dialog( "close" );
+                            },
+                            "No": function() {
+                                $( this ).dialog( "close" );
+                            }
+                        },
+                        close: function() {
+                            if (confirm)
+                                close();
+                        }
+                    });
+                } else {
+                    close();
+                }
+            }, this));
+        },
+        close: function() {
+            return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_close_statement']], ['res_id']).pipe(
+                    _.bind(function(res) {
+                return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
+                    var action = result.result;
+                    action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'default_home'}});
+                    this.do_action(action);
+                }, this));
+            }, this));
         },
         stop: function() {
             $('.oe_footer').show();
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 74ff2229729..662217ff485 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -25,7 +25,8 @@
                 </div>
             </div>
             <div id="loggedas">
-                <button>Back</button>
+                <span class="oe_pos_synch-notification"></span>
+                <button>Close</button>
             </div>
         </div>
         <div id="content">
@@ -49,15 +50,15 @@
                     <ul id="amounts">
                         <li>
                             Subtotal:
-                            <span id="subtotal">0</span> €
+                            <t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <span id="subtotal">0</span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
                         </li>
                         <li>
                             Tax:
-                            <span id="tax">0</span> €
+                            <t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <span id="tax">0</span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
                         </li>
                         <li>
                             Total:
-                            <span id="total">0</span> €
+                            <t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <span id="total">0</span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
                         </li>
                     </ul>
                     <div id="paypad"></div>
@@ -102,11 +103,11 @@
                             <table>
                                 <tr>
                                     <td class="paymentline-type">Paid:</td>
-                                    <td class="paymentline-amount pos-rigth-align"><span id="payment-paid-total"></span> €</td>
+                                    <t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <td class="paymentline-amount pos-rigth-align"><span id="payment-paid-total"></span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/></td>
                                 </tr>
                                 <tr>
                                     <td class="paymentline-type">Change:</td>
-                                    <td class="paymentline-amount pos-rigth-align"><span id="payment-remaining"></span> €</td>
+                                    <t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <td class="paymentline-amount pos-rigth-align"><span id="payment-remaining"></span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/></td>
                                 </tr>
                             </table>
                         </div>
@@ -122,6 +123,16 @@
         </div>
     </div>
     </t>
+    <t t-name="pos-synch-notification">
+        <span>
+        <a t-if="widget.nbr_pending &gt; 0" href="javascript:void(0)" class="oe_pos_synch-notification-button">
+            <t t-esc="widget.nbr_pending"/> pending orders
+        </a>
+        </span>
+    </t>
+    <t t-name="pos-close-warning">
+        <div>There are pending operations that could not be saved into the database, are you sure you want to exit?</div>
+    </t>
     <t t-name="pos-category-template">
         <header>
             <ol class="breadcrumb">
@@ -162,8 +173,7 @@
             <div class="product-img">
                 <img t-att-src="'data:image/gif;base64,'+ img" />
                 <span class="price-tag">
-                    <t t-esc="list_price"/>
-                    €
+                    <t t-esc="format_amount(list_price)"/>
                 </span>
             </div>
             <div class="product-name">
@@ -176,8 +186,7 @@
             <t t-esc="name"/>
         </td>
         <td>
-            <t t-esc="list_price.toFixed(2)"/>
-            €
+            <t t-esc="format_amount(list_price.toFixed(2))"/>
         </td>
         <td>
             <t t-esc="discount.toFixed(2)"/>
@@ -186,8 +195,7 @@
             <t t-esc="quantity.toFixed(0)"/>
         </td>
         <td>
-            <t t-esc="(list_price * (1 - discount/100) * quantity).toFixed(2)"/>
-            €
+            <t t-esc="format_amount((list_price * (1 - discount/100) * quantity).toFixed(2))"/>
         </td>
     </t>
     <t t-name="pos-paymentline-template">
@@ -206,7 +214,7 @@
             <t t-esc="name"/>
         </td>
         <td class="receiptline-amount">
-            <t t-esc="(list_price * (1 - discount/100) * quantity).toFixed(2)"/> €
+            <t t-esc="format_amount((list_price * (1 - discount/100) * quantity).toFixed(2))"/>
         </td>
     </t>
     <t t-name="pos-payment-button-template">
@@ -233,9 +241,21 @@
                         <table id="receiptlines"></table>
                         <br />
                         <table>
-                            <tr><td>Total:</td><td class="pos-rigth-align"><span id="receipt-summary-total"></span> €</td></tr>
-                            <tr><td>Tax:</td><td class="pos-rigth-align"><span id="receipt-summary-tax"></span> €</td></tr>
-                            <tr><td>Change:</td><td class="pos-rigth-align"><span id="receipt-summary-change"></span> €</td></tr>
+                            <tr><td>Total:</td><td class="pos-rigth-align">
+                                <t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
+                                <span id="receipt-summary-total"></span>
+                                <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
+                                </td></tr>
+                            <tr><td>Tax:</td><td class="pos-rigth-align">
+                                <t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
+                                <span id="receipt-summary-tax"></span>
+                                <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
+                                </td></tr>
+                            <tr><td>Change:</td><td class="pos-rigth-align">
+                                <t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
+                                <span id="receipt-summary-change"></span>
+                                <t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
+                                </td></tr>
                         </table>
                     </div>
                 </div>
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index 46f710c7882..7e255d30e76 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -75,7 +75,7 @@ class pos_box_out(osv.osv_memory):
         res_obj = self.pool.get('res.users')
         for data in  self.read(cr, uid, ids, context=context):
             curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id
-            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
+            statement_ids = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
             monday = (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
             sunday = (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')
             done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)], context=context)
@@ -85,21 +85,11 @@ class pos_box_out(osv.osv_memory):
             acc_id = product.property_account_income
             if not acc_id:
                 raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product.name))
-            if not statement_id:
+            if not statement_ids:
                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
-            if statement_id:
-                statement_id = statement_id[0]
-            if not statement_id:
-                statement_id = statement_obj.create(cr, uid, {
-                                    'date': time.strftime('%Y-%m-%d 00:00:00'),
-                                    'journal_id': data['journal_id'],
-                                    'company_id': curr_company,
-                                    'user_id': uid,
-                                }, context=context)
-            vals['statement_id'] = statement_id
+            vals['statement_id'] = statement_ids[0]
             vals['journal_id'] = data['journal_id']
-            if acc_id:
-                vals['account_id'] = acc_id.id
+            vals['account_id'] = acc_id.id
             amount = data['amount'] or 0.0
             if data['amount'] > 0:
                 amount = -data['amount']
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index 92dee2f8e4c..08f51113d8d 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -25,6 +25,10 @@ from tools.translate import _
 class pos_close_statement(osv.osv_memory):
     _name = 'pos.close.statement'
     _description = 'Close Statements'
+    
+    def cancel_wizard(self, cr, uid, ids, context=None):
+        if context.get('cancel_action'):
+            return context['cancel_action']
 
     def close_statement(self, cr, uid, ids, context=None):
         """
@@ -35,6 +39,7 @@ class pos_close_statement(osv.osv_memory):
              @param context: A standard dictionary
              @return : Blank Dictionary
         """
+        context = context or {}
         mod_obj = self.pool.get('ir.model.data')
         statement_obj = self.pool.get('account.bank.statement')
         journal_obj = self.pool.get('account.journal')
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 61c984c873e..9c11ad02e39 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -15,7 +15,9 @@
                     <group col="4" colspan="4">
                         <group col="2" colspan="2"/>
                         <button icon='gtk-stop' special="cancel"
-                            string="No" />
+                            string="No" invisible="context.get('cancel_action')"/>
+                        <button icon='gtk-stop' type="object" name="cancel_wizard"
+                            string="No" invisible="not context.get('cancel_action')"/>
                         <button name="close_statement" string="Yes"
                              type="object" icon="gtk-ok"/>
                    </group>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 47c5348943b..11ca75401a4 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -75,16 +75,9 @@ class pos_open_statement(osv.osv_memory):
         form_id = form_res and form_res[1] or False
         search_id = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter')
 
-        return {
-            'domain': "[('id', 'in',[ "+','.join(map(str,st_ids))+"])]",
-            'name': _('Open Cash Registers'),
-            'view_type': 'form',
-            'view_mode': 'tree, form',
-            'search_view_id': search_id and search_id[1] or False ,
-            'res_model': 'account.bank.statement',
-            'views': [(tree_id, 'tree'), (form_id, 'form')],
-            'context': {},
-            'type': 'ir.actions.act_window'
+        return  {
+            'type': 'ir.actions.client',
+            'tag': 'pos.ui',
         }
 pos_open_statement()
 
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4850cb7805b..4b73db5cdcc 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="ir.module.category" id="module_category_portal">
+            <field name="name">Portal</field>
+            <field name="parent_id" ref="base.module_category_tools"/>
+            <field name="sequence">25</field>
+        </record>
+
         <record id="group_portal_officer" model="res.groups">
-            <field name="name">Portal / Officer</field>
+            <field name="name">Officer</field>
             <field name="comment">Portal officers can create new portal users with the portal wizard.</field>
+            <field name="category_id" ref="module_category_portal"/>
         </record>
         <record id="group_portal_manager" model="res.groups">
-            <field name="name">Portal / Manager</field>
+            <field name="name">Manager</field>
             <field name="comment">Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.</field>
+            <field name="category_id" ref="module_category_portal"/>
             <field name="implied_ids" eval="[(4, ref('group_portal_officer'))]"/>
         </record>
     </data>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 73151e8853f..3ddfe1e6900 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -166,7 +166,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="product_pricelist_view_search" />
             <field name="context">{"default_type":"sale", "search_default_type":"sale"}</field>
-            <field name="domain">[('type','=','sale')]</field>
             <field name="help">A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80.</field>
         </record>
         <record id="product_pricelist_action_for_purchase" model="ir.actions.act_window">
@@ -177,7 +176,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="product_pricelist_view_search" />
             <field name="context">{"default_type":"purchase", "search_default_type":"purchase"}</field>
-            <field name="domain">[('type','=','purchase')]</field>
             <field name="help">A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80.</field>
         </record>
         <menuitem
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index d9f14a13225..5c993b9cd61 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -3,14 +3,8 @@
 <data noupdate="1">
 
     <record id="group_uos" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Useability / Product UoS View</field>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">Product UoS View</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record id="product_comp_rule" model="ir.rule">
@@ -21,7 +15,8 @@
     </record>
 
     <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Useability / Product Variant</field>
+        <field name="name">Product Variant</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record model="ir.rule" id="product_pricelist_comp_rule">
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index e23ce653702..1b25c9d15cc 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -62,8 +62,9 @@ Dashboard for project members that includes:
         'project_demo.xml',
     ],
     'test':[
-        'test/test_project.yml',
-        'test/test_project_delegation.yml',
+        'test/project_demo.yml',
+        'test/project_process.yml',
+        'test/task_process.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project/project.py b/addons/project/project.py
index 8688f4ebc9b..0046dea4409 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -114,6 +114,7 @@ class project(osv.osv):
             if task.project_id: result[task.project_id.id] = True
         return result.keys()
 
+    #dead code
     def _get_project_work(self, cr, uid, ids, context=None):
         result = {}
         for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
@@ -360,7 +361,7 @@ def Project():
     working_days = %s
     resource = %s
 """       % (
-            project.id, 
+            project.id,
             project.date_start, working_days,
             '|'.join(['User_'+str(x) for x in puids])
         )
@@ -879,14 +880,24 @@ class task(osv.osv):
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         return True
 
+
+    def _delegate_task_attachments(self, cr, uid, task_id, delegated_task_id, context=None):
+        attachment = self.pool.get('ir.attachment')
+        attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', task_id)], context=context)
+        new_attachment_ids = []
+        for attachment_id in attachment_ids:
+            new_attachment_ids.append(attachment.copy(cr, uid, attachment_id, default={'res_id': delegated_task_id}, context=context))
+        return new_attachment_ids
+        
+
     def do_delegate(self, cr, uid, ids, delegate_data={}, context=None):
         """
         Delegate Task to another users.
         """
         assert delegate_data['user_id'], _("Delegated User should be specified")
-        delegrated_tasks = {}
+        delegated_tasks = {}
         for task in self.browse(cr, uid, ids, context=context):
-            delegrated_task_id = self.copy(cr, uid, task.id, {
+            delegated_task_id = self.copy(cr, uid, task.id, {
                 'name': delegate_data['name'],
                 'project_id': delegate_data['project_id'] and delegate_data['project_id'][0] or False,
                 'user_id': delegate_data['user_id'] and delegate_data['user_id'][0] or False,
@@ -897,6 +908,7 @@ class task(osv.osv):
                 'child_ids': [],
                 'work_ids': []
             }, context=context)
+            self._delegate_task_attachments(cr, uid, task.id, delegated_task_id, context=context)
             newname = delegate_data['prefix'] or ''
             task.write({
                 'remaining_hours': delegate_data['planned_hours_me'],
@@ -910,8 +922,8 @@ class task(osv.osv):
             
             message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_data['user_id'][1])
             self.log(cr, uid, task.id, message)
-            delegrated_tasks[task.id] = delegrated_task_id
-        return delegrated_tasks
+            delegated_tasks[task.id] = delegated_task_id
+        return delegated_tasks
 
     def do_pending(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'pending'}, context=context)
@@ -1100,7 +1112,7 @@ class account_analytic_account(osv.osv):
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
         return super(account_analytic_account, self).create(cr, uid, vals, context=context)
-    
+
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
         analytic_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index a3bfe9be673..b7b59911fa4 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
+        <!-- Requests Links -->
+        <record id="req_link_project" model="res.request.link">
+            <field name="name">Project</field>
+            <field name="object">project.project</field>
+        </record>
+
+        <record id="req_link_task" model="res.request.link">
+            <field name="name">Project task</field>
+            <field name="object">project.task</field>
+        </record>
+
         <!-- Resource: project.project -->
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 62f74f51d1b..f1e3a6e9b74 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -3,18 +3,16 @@
 <data noupdate="1">
 
     <record id="group_project_user" model="res.groups">
-        <field name="name">Project / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_project_management"/>
     </record>
 
     <record id="group_project_manager" model="res.groups">
-        <field name="name">Project / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_project_management"/>
         <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
     </record>
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
diff --git a/addons/project/static/src/img/icon.png b/addons/project/static/src/img/icon.png
index 20ba49f07c8..8dc1bc78fa4 100644
Binary files a/addons/project/static/src/img/icon.png and b/addons/project/static/src/img/icon.png differ
diff --git a/addons/project/test/project_demo.yml b/addons/project/test/project_demo.yml
new file mode 100644
index 00000000000..3bcae52e238
--- /dev/null
+++ b/addons/project/test/project_demo.yml
@@ -0,0 +1,12 @@
+-
+  !record {model: project.project, id: project_integrate_openerp, view: False}:
+    partner_id: base.res_partner_agrolait
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    remaining_hours: 10.00
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    planned_hours: 10.00
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    project_id: project_integrate_openerp
\ No newline at end of file
diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
new file mode 100644
index 00000000000..3c51c464b1f
--- /dev/null
+++ b/addons/project/test/project_process.yml
@@ -0,0 +1,70 @@
+-
+  In order to Test Process of Project Management,
+-
+  I create duplicate template.
+-
+  !python {model: project.project}: |
+     new_template = self.duplicate_template(cr, uid, [ref("project_integrate_openerp")])
+     assert new_template, "duplicate template is not created"
+     template = self.browse(cr, uid, new_template['res_id'], context=context)
+     assert template.state == 'open', "Duplicate template must be in open state."
+-
+  I convert template into real Project.
+-
+  !python {model: project.project}: |
+     self.reset_project(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check project details after convert from template.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be active}:
+    - state == "open"
+-
+  I put project in pending.
+-
+  !python {model: project.project}: |
+    self.set_pending(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after put in pending.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be in pending state}:
+    - state == "pending"
+-
+  I re-open the project.
+-
+  !python {model: project.project}: |
+      self.set_open(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after reopen.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be open.}:
+    - state == "open"
+-
+  I close the project.
+-
+  !python {model: project.project}: |
+    self.set_done(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after closed.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be close.}:
+    - state == "close"
+-
+  I set project into template.
+-
+  !python {model: project.project}: |
+    self.set_template(cr, uid, [ref("project_integrate_openerp")])
+-
+  I schedule tasks of project.
+-
+  !python {model: project.project}: |
+    self.schedule_tasks(cr, uid, [ref("project_integrate_openerp")], context=context)
+-
+  I copy the tasks of project.
+-
+  !python {model: project.project}: |
+    self.template_copy(cr, uid, ref("project_integrate_openerp"))
+-
+  I cancel Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_project_9")])
\ No newline at end of file
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
new file mode 100644
index 00000000000..73250de2963
--- /dev/null
+++ b/addons/project/test/task_process.yml
@@ -0,0 +1,76 @@
+-
+  I put task in pending due to specification is not clear.
+-
+  !python {model: project.task}: |
+    self.do_pending(cr, uid, [ref("project_task_1")])
+    context.update({"active_id": ref("project_task_1")})
+-
+  I check state  of task after put in pending.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be in pending state}:
+    - state == "pending"
+-
+  !record {model: project.task.delegate, id: delegate_id}:
+    user_id: res_users_analyst
+    planned_hours: 12.0
+    planned_hours_me: 2.0
+-
+  Now I delegate task to team member.
+-
+  !python {model: project.task.delegate}: |
+    self.delegate(cr, uid, [ref("delegate_id")], {"active_id": ref("project_task_1")})
+-
+  I check delegated task details.
+-
+  !python {model: project.task}: |
+    task = self.browse(cr, uid, ref("project_task_1"), context=context)
+    assert task.planned_hours == 2.0, "Planning hours is not correct after delegated."
+    assert task.state == "pending", "Task should be in Pending after delegated."
+-
+  I re-open the task.
+-
+  !python {model: project.task}: |
+    self.do_reopen(cr, uid, [ref("project_task_1")])
+-
+  I check reopened task details.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
+    - state == "open"
+-
+  I change the stage of task to next stage.
+-
+  !python {model: project.task}: |
+    self.next_type(cr, uid, [ref("project_task_1")])
+-
+  !record {model: project.task.reevaluate, id: reevaluate_id}:
+    remaining_hours : 120
+-
+  I reevaluate task with remaining hours.
+-
+  !python {model: project.task.reevaluate}: |
+    self.compute_hours(cr, uid, [ref("reevaluate_id")], {"active_id": ref("project_task_1")})
+-
+  I check remaining hours after reevaluated task.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
+    - remaining_hours == 120.0
+-
+  I close the task.
+-
+  !python {model: project.task}: |
+    self.action_close(cr, uid, [ref("project_task_1")])
+-
+  I check state after closed.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}:
+    - state == "done"
+-
+  I change the stage of task to previous stage.
+-
+  !python {model: project.task}: |
+    self.prev_type(cr, uid, [ref("project_task_1")])
+-
+  I cancel Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_2")])
\ No newline at end of file
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
deleted file mode 100644
index f79c2a34224..00000000000
--- a/addons/project/test/test_project.yml
+++ /dev/null
@@ -1,296 +0,0 @@
--
-  Test project template feature
--
-  Create project 'OpenERP Training Programme'
--
-  !record {model: project.project, id: project_project_openerptrainingprogramme0}:
-    company_id: base.main_company
-    name: OpenERP Training Programme
--
-  Create task 'Technical Training' for this project
--
-  !record {model: project.task, id: project_task_technicaltraining0}:
-    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    name: Technical Training
-    planned_hours: 30.0
-    project_id: project_project_openerptrainingprogramme0
-    remaining_hours: 30.0
-    state: draft
--
-  Create task 'Functional Training' for this project
--
-  !record {model: project.task, id: project_task_functionaltraining0}:
-    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    name: Functional Training
-    planned_hours: 30.0
-    project_id: project_project_openerptrainingprogramme0
-    remaining_hours: 30.0
-    state: draft
--
-  Set project as project template
--
-  !python {model: project.project}: |
-    self.set_template(cr, uid, [ref("project_project_openerptrainingprogramme0")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_id": ref("project.menu_open_view_project_all"), })
--
-  Check if project in template state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in template state}:
-       - state == "template"
--
-  Create new project based on this template
--
-  !python {model: project.project}: |
-     new_prj = self.duplicate_template(cr, uid, [ref("project_project_openerptrainingprogramme0")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_id": ref("project.menu_open_view_project_all"), })
-     if not new_prj:
-         raise Exception( "New project based on template not created")
-     new_id = new_prj['res_id']
-     new_prj = self.read(cr, uid, [new_id], ['name', 'state'])[0]
-     state = new_prj['state']
-     name = new_prj['name']
-     assert state == 'open', "Project in %s state. Project created from template project must be in open state"%state
--
-  Reset project template to normal project
--
-  !python {model: project.project}: |
-    self.reset_project(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in open state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
-       - state == "open"
--
-  Test for different project-states
--
-  Keep project pending
--
-  !python {model: project.project}: |
-    self.set_pending(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in pending state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in pending state}:
-       - state == "pending"
--
-  Cancel the project
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in cancel state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in cancel state}:
-       - state == "cancelled"
--
-  Re-open the project
--
-  !python {model: project.project}: |
-    self.set_open(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_model": "ir.ui.menu", "project_id": False, "active_id":
-      ref("project.menu_open_view_project_all"), })
--
-  Check if project in open state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
-       - state == "open"
--
-  Test for task work allocation
--
-  As i cancelled my project before, i check if the task 'Technical Training' is in cancelled state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Task is in cancelled state}:
-       - state == "cancelled"
--
-  Now in order to reactivate the task 'Technical Training', i click on the "Reactivate" button and fill the remaining hour field
--
-  !record {model: project.task.reevaluate, id: project_task_technicaltraining_remainingwiz0}:
-    remaining_hours: 30.0
-- |
-  I click the apply button
--
-  !python {model: project.task.reevaluate}: |
-      self.compute_hours(cr, uid, [ref('project_task_technicaltraining_remainingwiz0')], {'active_id': ref("project_task_technicaltraining0"),'button_reactivate': True})
-- |
-  Check if task 'Technical Training' in  open state and for other initial values
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Project is in open state}:
-       - state == "open"
-       - planned_hours == 30
-       - remaining_hours == 30
-       - delay_hours == 0.0
-       - effective_hours == 0.0
--
-  Make a work task entry 'Training on OpenERP modules, models and classes' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on OpenERP modules, models and classes
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 10
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After work task of 10 hours effective_hours must be equal to 10}:
-       - remaining_hours == 20
-       - effective_hours == 10.0
--
-  Make a work task entry 'Training on OpenERP xml views' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on OpenERP xml views
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 20
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 20}:
-       - remaining_hours == 10
-       - effective_hours == 20.0
--
-  Make a work task entry 'Training on workflows' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on workflows
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 30}:
-       - remaining_hours == 0
-       - effective_hours == 30.0
--
-  Set remaining hours of 10 hours for reevaluating the task
--
-  !record {model: project.task.reevaluate, id: config_compute_remaining_0}:
-    remaining_hours: 10.0
--
-  Reevaluate the task
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("config_compute_remaining_0")], {"lang": "en_US",
-      "project_id": False, "tz": False, "active_model": "project.task", "search_default_project_id":
-      False, "search_default_user_id": 1, "search_default_current": 1, "active_ids":
-      [ref("project_task_technicaltraining0")], "active_id": ref("project_task_technicaltraining0"), })
-
--
-   Check for effective hours and remaining hours, remaining_hours must be 10 while planned_hours remains 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After reevaluating the task with 10 hours remaining_hours must be 10 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 10.0
-       - effective_hours == 30.0
--
-  Make a work task entry 'Training on reports and wizards' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on reports and wizards
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 40 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 0
-       - effective_hours == 40.0
--
-  Close the task
--
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
--
-  Check if task in done state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Task is in done state}:
-       - state == "done"
-
-
--
-  Test for task reactivation
--
-  Reactivate task
--
-  !record {model: project.task.reevaluate, id: config_compute_remaining_1}:
-    remaining_hours: 10.0
--
-  Reevaluate the task with 10 hours remaining
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("config_compute_remaining_1")], {"lang": "en_US",
-      "project_id": False, "tz": False, "button_reactivate": True, "active_model":
-      "project.task", "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "active_ids": [ref("project_task_technicaltraining0")], "active_id": ref("project_task_technicaltraining0"),
-      })
--
-   Check for effective hours and remaining hours, remaining_hours must be 10 while planned_hours remains 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After reevaluating the task with 10 hours remaining_hours must be 10 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 10.0
-       - effective_hours == 40.0
--
-  Make a work task entry 'Training on yml' of 5 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 5.0
-        name: Training on yml
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, remaining_hours must be 5, effective_hours must be 45
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After work task of 5 hours effective_hours must be equal to 45 and remaining_hours is 5}:
-       - planned_hours == 30
-       - remaining_hours == 5.0
-       - effective_hours == 45.0
--
-  Close the task
--
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
--
-  Check if task in done state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error}:
-       - state == "done"
--
-   Check for effective hours and remaining hours
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After closing the task planned_hours must remain 30 effective_hours must be 45 and remaining hours must be 0}:
-       - planned_hours == 30
-       - remaining_hours == 0.0
-       - effective_hours == 45.0
--
-  Close project 'OpenERP Training Programme'
--
-  !python {model: project.project}: |
-    self.set_done(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_model": "ir.ui.menu", "project_id": False, "active_id":
-      ref("project.menu_open_view_project_all"), })
--
-  Check if project in close state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: "Project must be in closed state"}:
-       - state == "close"
-
diff --git a/addons/project/test/test_project_delegation.yml b/addons/project/test/test_project_delegation.yml
deleted file mode 100644
index 02bc9afaae8..00000000000
--- a/addons/project/test/test_project_delegation.yml
+++ /dev/null
@@ -1,230 +0,0 @@
--
-  This scenario tests the delegation process. Closing all the delegated tasks(task delegation at multiple levels) transits the parent task from pending to open state.  
-- 
-  Creating a project OpenERP Documentation
-- 
-  !record {model: project.project, id: project_project_openerpdocumentation0}:
-    company_id: base.main_company
-    name: OpenERP Documentation    
-    
-- 
-  Creating a task 'Develop book for Technical and Functional reference'
-- 
-  !record {model: project.task, id: project_task_documentation_book}:
-    name: Develop book for Technical and Functional reference
-    planned_hours: 20.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 20.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_documentation_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), }) 
-
-- 
-  Creating a task 'Publish the References'
-- 
-  !record {model: project.task, id: project_task_publish_book}:
-    name: Publish the References
-    planned_hours: 10.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 10.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_publish_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), }) 
-
--
-  Test the delegate wizard 
-- 
-  Creating a delegate task 'Publish the References' of 15 hours, renaming parent task to 'CHECK Publish the References' of 1 hour
-- 
-  !record {model: project.task.delegate, id: project_task_publish_book_delegate}:
-    name: Publish the References
-    new_task_description: aaa
-    planned_hours: 15.0
-    planned_hours_me: 1.0
-    prefix: 'CHECK: Publish the References'
-    state: pending
-    user_id: base.user_demo
-    
-- 
-  Validating the delegate task
-- 
-  !python {model: project.task.delegate}: |
-    self.delegate(cr, uid, [ref("project_task_publish_book_delegate")],
-      {"lang": "en_US", "active_model": "project.task", "tz": False, "record_id":
-      4, "active_ids": [ref("project_task_publish_book")], "active_id": ref("project_task_publish_book"),
-      })
-
--
-  Check if parent task 'CHECK Publish the References' is in pending state
-- 
-  !assert {model: project.task, id: project_task_publish_book, severity: error, string: "Task must be in pending state after delegation"}:
-       - state == "pending"      
-- 
-  Creating a delegate task 'Prepare a book that gives functional overview of OpenERP' 
-- 
-  !record {model: project.task, id: project_task_delegate_openerp_tutorial}:
-    name: Prepare a book that gives functional overview of OpenERP
-    planned_hours: 30.0
-    project_id: project.project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_openerp_tutorial")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-          
-- 
-  Creating a delegate task 'Prepare a technical reference for creating your modules'
-- 
-  !record {model: project.task, id: project_task_delegate_developer_book}:
-    name: Prepare a technical reference for creating your modules
-    planned_hours: 30.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
- 
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_developer_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-
-- 
-  Delegate task 'Develop book for Technical and Functional reference' to these tasks and make it pending
-- 
-  !record {model: project.task, id: project_task_documentation_book}:
-    child_ids:
-      - project.project_task_delegate_openerp_tutorial
-      - project.project_task_delegate_developer_book
-    planned_hours: 20.0
-    state: pending
-
-- 
-  Creating a delegate task 'Prepare documentation for Module Development'
-- 
-  !record {model: project.task, id: project_task_delegate_module_develop}:
-    name: Prepare documentation for Module Development
-    planned_hours: 30.0
-    project_id: project.project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-    
-
-- 
-  Creating a delegate 'Prepare documentation for Business Process Development'
-- 
-  !record {model: project.task, id: project_task_delegate_business_process_develop}:
-    name: Prepare documentation for Business Process Development
-    planned_hours: 30.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-
-- 
-  Delegate task 'Prepare a technical reference for creating your modules' to these tasks and make it pending
-- 
-  !record {model: project.task, id: project_task_delegate_developer_book}:
-    child_ids:
-      - project.project_task_delegate_module_develop
-      - project.project_task_delegate_business_process_develop
-    planned_hours: 20.0
-    state: pending
-
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_module_develop")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-      
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_business_process_develop")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })      
-
-- 
-  Check if 'Prepare a technical reference for creating your modules' in pending state
-- 
-  !assert {model: project.task, id: project_task_delegate_developer_book, severity: error, string: Task must be in pending state}:
-       - state == "pending"
-                 
-- 
-  Close the child task 'Prepare documentation for Module Development'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_module_develop")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Close the child task 'Prepare documentation for Business Process Development'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_business_process_develop")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Parent task 'Prepare a technical reference for creating your modules' task must now be in open state
-- 
-  !assert {model: project.task, id: project_task_delegate_developer_book, severity: error, string: Task is in done state}:
-       - state == "open"
-       
-      
-- 
-  Check if task 'Develop book for Technical and Functional reference' in pending state
-- 
-  !assert {model: project.task, id: project_task_documentation_book, severity: error, string: Task is in pending state}:
-       - state == "pending"
-                 
-- 
-  Close the child task 'Prepare a technical reference for creating your modules'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_developer_book")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Close the child task 'Prepare a book that gives functional overview of OpenERP' 
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_openerp_tutorial")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Parent task 'Develop book for Technical and Functional reference' must be now in open state 
-- 
-  !assert {model: project.task, id: project_task_documentation_book, severity: error, string: Task is in done state}:
-       - state == "open"                  
diff --git a/addons/project_gtd/static/src/img/icon.png b/addons/project_gtd/static/src/img/icon.png
new file mode 100644
index 00000000000..2f888a90a60
Binary files /dev/null and b/addons/project_gtd/static/src/img/icon.png differ
diff --git a/addons/project_issue/static/src/img/icon.png b/addons/project_issue/static/src/img/icon.png
new file mode 100644
index 00000000000..20723a81a57
Binary files /dev/null and b/addons/project_issue/static/src/img/icon.png differ
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 84ac057bbb4..7d33a431f2a 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -44,6 +44,7 @@ Features
     "demo_xml": ["project_long_term_demo.xml"],
     "test": [
           'test/phase_process.yml',
+          'test/task_process.yml',
     ],
     "update_xml": [
         "security/ir.model.access.csv",
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 4ab1722336e..b6647b6de2b 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -72,12 +72,13 @@ class project_phase(osv.osv):
              if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']:
                  return False
          return True
-
+    #dead code
     def _get_default_uom_id(self, cr, uid):
        model_data_obj = self.pool.get('ir.model.data')
        model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
        return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
 
+    #dead code
     def _compute_progress(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         if not ids:
diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
new file mode 100644
index 00000000000..64ecef73476
--- /dev/null
+++ b/addons/project_long_term/test/task_process.yml
@@ -0,0 +1,19 @@
+-
+  I create a record to compute the tasks of project.
+-
+  !record {model: project.compute.tasks, id: project_compute_tasks0}:
+    project_id: project.project_integrate_openerp
+-
+  I compute and shedule the tasks.
+-
+  !python {model: project.compute.tasks}: |
+    self.compute_date(cr, uid, [ref("project_compute_tasks0")])
+-
+  Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
+-
+  !python {model: project.project}: |
+    prj = self.browse(cr, uid, [ref("project.project_integrate_openerp")])[0]
+    for task in prj.tasks:
+        if task.state in ('done','cancelled'):
+            continue
+        assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled"
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index a67c675b089..4a8ac571703 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="1">
 
     <record id="group_purchase_user" model="res.groups">
-        <field name="name">Purchases / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_purchase_management"/>
     </record>
     <record id="group_purchase_manager" model="res.groups">
-        <field name="name">Purchases / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_purchase_management"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
     </record>
 
diff --git a/addons/purchase/static/src/img/icon.png b/addons/purchase/static/src/img/icon.png
index 094705cecc3..fda2d52a710 100644
Binary files a/addons/purchase/static/src/img/icon.png and b/addons/purchase/static/src/img/icon.png differ
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index af8a1330e2d..71c54b973e3 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -2,12 +2,20 @@
 <openerp>
 <data noupdate="1">
 
+    <record model="ir.module.category" id="module_category_purchase_requisition">
+        <field name="name">Purchase Requisition</field>
+        <field name="parent_id" ref="base.module_category_purchase_management"/>
+        <field name="sequence">9</field>
+    </record>
+
     <record id="group_purchase_requisition_user" model="res.groups">
-        <field name="name">Purchase Requisition / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_purchase_requisition"/>
     </record>
 
     <record id="group_purchase_requisition_manager" model="res.groups">
-        <field name="name">Purchase Requisition / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_purchase_requisition"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/>
     </record>
     
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index b7a228acf6a..ae8c8bf62e3 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
diff --git a/addons/sale/static/src/img/icon.png b/addons/sale/static/src/img/icon.png
new file mode 100644
index 00000000000..46d395d70ee
Binary files /dev/null and b/addons/sale/static/src/img/icon.png differ
diff --git a/addons/sale/test/data_test.yml b/addons/sale/test/data_test.yml
index 8b5d32a086a..8e064212f58 100644
--- a/addons/sale/test/data_test.yml
+++ b/addons/sale/test/data_test.yml
@@ -9,7 +9,6 @@
     close_method: none
     code: View
     name: View
-    sign: 1
 - 
   I create Income Account Type.
 - 
@@ -17,7 +16,6 @@
     close_method: unreconciled
     code: Income
     name: Income
-    sign: 1
 - 
   I create Expense Account Type.
 - 
@@ -25,7 +23,6 @@
     close_method: unreconciled
     code: Expense
     name: Expense
-    sign: 1
 - 
   I create Cash Account Type.
 - 
@@ -33,7 +30,6 @@
     close_method: balance
     code: Cash
     name: Cash
-    sign: 1
 - 
   I create Minimal Chart Account.
 - 
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 7d4443a3cce..4900834f7b0 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -39,7 +39,6 @@ It adds sales name and sales Reference on production order.
     'depends': ['mrp', 'sale'],
     'init_xml': [],
     'update_xml': [
-        'security/sale_mrp_security.xml',
         'security/ir.model.access.csv',
         'sale_mrp_view.xml',
     ],
diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml
deleted file mode 100644
index c0139329d1e..00000000000
--- a/addons/sale_mrp/security/sale_mrp_security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-	<record id="base.group_sale_manager" model="res.groups">
-	        <field name="name">Sales / Manager</field>
-	    </record>
-    
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index f7a81a24948..0462f1339d0 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -26,7 +26,13 @@ class res_groups(osv.osv):
     _columns = {
         'share': fields.boolean('Share Group', readonly=True,
                     help="Group created to set access rights for sharing data with some users.")
-     }
+    }
+
+    def __init__(self, pool, cr):
+        super(res_groups, self).__init__(pool, cr)
+        # add domain in get_groups_by_application()
+        self.groups_by_application_domain.append(('share', '=', False))
+
 res_groups()
 
 class res_users(osv.osv):
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index b03a090c809..3b74fbb4dbc 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -21,18 +21,6 @@
             <field name="name">Users</field>
             <field name="context">{'search_default_no_share': 1}</field>
         </record>
-        <record id="view_users_form_share" model="ir.ui.view">
-            <field name="name">res.users.form</field>
-            <field name="model">res.users</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page//field[@name='groups_id']" position="attributes">
-                    <attribute name="context">{'search_default_no_share':1}</attribute>
-                </xpath>
-            </field>
-        </record>
-
 
         <record model="ir.ui.view" id="res_groups_search_sharing">
             <field name="name">res.groups.search.share</field>
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index a5405dbcb48..1e92ac44a53 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="ir.module.category" id="module_category_share">
+            <field name="name">Sharing</field>
+            <field name="parent_id" ref="base.module_category_tools"/>
+            <field name="sequence">26</field>
+        </record>
+
         <record id="group_share_user" model="res.groups">
-            <field name="name">Sharing / User</field>
+            <field name="name">User</field>
             <field name="comment">
 Members of this groups have access to the sharing wizard, which allows them to invite external users to view or edit some of their documents.</field>
+            <field name="category_id" ref="module_category_share"/>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/share/static/src/css/share.css b/addons/share/static/src/css/share.css
index 3b47a065b1e..4bd4f1d67e5 100644
--- a/addons/share/static/src/css/share.css
+++ b/addons/share/static/src/css/share.css
@@ -1,13 +1,14 @@
 
 .openerp li.oe-share {
-    background: url(../img/share.png) no-repeat;
+    background: url(../img/share.png) no-repeat 0 60%;
     padding-left: 20px;
 }
 
 .openerp a.oe-share {
-    background: url(../img/share.png) no-repeat;
+    background: url(../img/share.png) no-repeat center center;
     display: block;
     float: left;
     width: 20px;
     height: 20px;
+    margin-top: 3px;
 }
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index b2abc1832a4..45cc2bd20ca 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -4,21 +4,24 @@ openerp.share = function(instance) {
 function launch_wizard(self, view) {
         var action = view.widget_parent.action;
         var Share = new instance.web.DataSet(self, 'share.wizard', view.dataset.get_context());
-        var domain = view.dataset.domain;
-
+        var domain = new instance.web.CompoundDomain(view.dataset.domain);
         if (view.fields_view.type == 'form') {
             domain = new instance.web.CompoundDomain(domain, [['id', '=', view.datarecord.id]]);
         }
-
-        Share.create({
-            name: action.name,
-            domain: domain,
-            action_id: action.id,
-        }, function(result) {
-            var share_id = result.result;
-            var step1 = Share.call('go_step_1', [[share_id],], function(result) {
-                var action = result;
-                self.do_action(action);
+        self.rpc('/web/session/eval_domain_and_context', {
+            domains: [domain],
+            contexts: [view.dataset.context]
+        }, function (result) {
+            Share.create({
+                name: action.name,
+                domain: result.domain,
+                action_id: action.id,
+            }, function(result) {
+                var share_id = result.result;
+                var step1 = Share.call('go_step_1', [[share_id],], function(result) {
+                    var action = result;
+                    self.do_action(action);
+                });
             });
         });
 }
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 5f33f02f9e5..d6fa426f7ab 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -43,38 +43,6 @@ RANDOM_PASS_CHARACTERS = 'aaaabcdeeeefghjkmnpqrstuvwxyzAAAABCDEEEEFGHJKLMNPQRSTU
 def generate_random_pass():
     return ''.join(random.sample(RANDOM_PASS_CHARACTERS,10))
 
-
-# Utils for introspecting the ORM - could be moved to server someday
-class column_info(object):
-    """Struct containing details about an osv column, either one local to
-       its model, or one inherited via _inherits.
-
-       :attr name: name of the column
-       :attr column: column instance, subclass of osv.fields.column
-       :attr parent_model: if the column is inherited, name of the model
-                           that contains it, None for local columns.
-       :attr parent_column: the name of the column containing the m2o
-                            relationship to the parent model that contains
-                            this column, None for local columns.
-    """
-    def __init__(self, name, column, parent_model=None, parent_column=None):
-        self.name = name
-        self.column = column
-        self.parent_model = parent_model
-        self.parent_column = parent_column
-
-def get_column_infos(osv_model):
-    """Returns a dict mapping all fields names (direct fields and
-       inherited field via _inherits) to a ``column_info`` struct
-       giving detailed columns """
-    result = {}
-    for k, (parent,m2o,col) in osv_model._inherit_fields.iteritems():
-        result[k] = column_info(k, col, parent, m2o)
-    for k, v in osv_model._columns.iteritems():
-        result[k] = column_info(k,v)
-    return result
-
-
 class share_wizard(osv.osv_memory):
     _logger = logging.getLogger('share.wizard')
     _name = 'share.wizard'
@@ -321,7 +289,7 @@ class share_wizard(osv.osv_memory):
         models = [x[1].model for x in relation_fields]
         model_obj = self.pool.get('ir.model')
         model_osv = self.pool.get(model.model)
-        for colinfo in get_column_infos(model_osv).itervalues():
+        for colinfo in model_osv._all_columns.itervalues():
             coldef = colinfo.column
             coltype = coldef._type
             relation_field = None
@@ -331,7 +299,7 @@ class share_wizard(osv.osv_memory):
                 relation_osv = self.pool.get(coldef._obj)
                 if coltype == 'one2many':
                     # don't record reverse path if it's not a real m2o (that happens, but rarely)
-                    dest_model_ci = get_column_infos(relation_osv)
+                    dest_model_ci = relation_osv._all_columns
                     reverse_rel = coldef._fields_id
                     if reverse_rel in dest_model_ci and dest_model_ci[reverse_rel].column._type == 'many2one':
                         relation_field = ('%s.%s'%(reverse_rel, suffix)) if suffix else reverse_rel
@@ -339,7 +307,7 @@ class share_wizard(osv.osv_memory):
                 for parent in relation_osv._inherits:
                     if parent not in models:
                         parent_model = self.pool.get(parent)
-                        parent_colinfos = get_column_infos(parent_model)
+                        parent_colinfos = parent_model._all_columns
                         parent_model_browse = model_obj.browse(cr, UID_ROOT,
                                                                model_obj.search(cr, UID_ROOT, [('model','=',parent)]))[0]
                         if relation_field and coldef._fields_id in parent_colinfos:
@@ -689,7 +657,7 @@ class share_wizard(osv.osv_memory):
             raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
 
         # TODO: also send an HTML version of this mail
-        emails_sent = 0
+        msg_ids = []
         for result_line in wizard_data.result_line_ids:
             email_to = result_line.user_id.user_email
             subject = wizard_data.name
@@ -712,23 +680,23 @@ class share_wizard(osv.osv_memory):
                 body += _("The documents have been automatically added to your current OpenERP documents.\n")
                 body += _("You may use your current login (%s) and password to view them.\n") % result_line.user_id.login
             body += "\n\n"
-            body += user.signature
+            body += (user.signature or '')
             body += "\n\n"
             body += "--\n"
             body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
                       "It is open source and can be found on http://www.openerp.com.")
 
-            if mail_message.schedule_with_attach(cr, uid,
-                                                 user.user_email,
-                                                 [email_to],
-                                                 subject,
-                                                 body,
-                                                 model='share.wizard'):
-                emails_sent += 1
-            else:
-                self._logger.warning('Failed to send share notification from %s to %s, ignored', user.user_email, email_to)
-        self._logger.info('%s share notification(s) successfully sent.', emails_sent)
-share_wizard()
+            msg_ids.append(mail_message.schedule_with_attach(cr, uid,
+                                                       user.user_email,
+                                                       [email_to],
+                                                       subject,
+                                                       body,
+                                                       model='share.wizard',
+                                                       context=context))
+        # force direct delivery, as users expect instant notification
+        mail_message.send(cr, uid, msg_ids, context=context)
+        self._logger.info('%d share notification(s) sent.', len(msg_ids))
+
 
 class share_result_line(osv.osv_memory):
     _name = 'share.wizard.result.line'
@@ -753,6 +721,5 @@ class share_result_line(osv.osv_memory):
     _defaults = {
         'newly_created': True,
     }
-share_result_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 389d62e8ce0..f83a5d362ab 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record id="group_stock_user" model="res.groups">
-        <field name="name">Warehouse / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_warehouse_management"/>
     </record>
     <record id="group_stock_manager" model="res.groups">
-        <field name="name">Warehouse / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_warehouse_management"/>
         <field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
     </record>
 
diff --git a/addons/stock/static/src/img/icon.png b/addons/stock/static/src/img/icon.png
index a70ccfe18d5..b4c6580dead 100644
Binary files a/addons/stock/static/src/img/icon.png and b/addons/stock/static/src/img/icon.png differ
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index aeb809330e7..b489b8dd16e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1616,8 +1616,8 @@
                     <group colspan="2" col="2">
                         <separator colspan="2" string="Move Information"/>
                         <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                        <field name="product_uos" groups="product.group_uos" colspan="4"/>
+                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
+                        <field name="product_uos" groups="product.group_uos"/>
                     </group>
 
                     <group colspan="2" col="2">
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index dec830b2d77..c5e134181f7 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -7,7 +7,6 @@
     close_method: balance
     code: asset_test
     name: Asset For Tests
-    sign: 1
 -
   I create a account type income.
 -
@@ -15,7 +14,6 @@
     close_method: unreconciled
     code: income_test
     name: Income For Tests
-    sign: 1
 -
   I create a account type Expense.
 -
@@ -23,7 +21,6 @@
     close_method: unreconciled
     code: expense_test
     name: Expense For Tests
-    sign: 1
 -
   I create a account type Receivable.
 -
@@ -31,7 +28,6 @@
     close_method: unreconciled
     code: receivable_test
     name: Receivable For Tests
-    sign: 1
 -
 
   I create a account  Receivable.
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index e84cdb41c0d..7d665c96435 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
     </record>
 
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 7b6c43ed2bc..c44a35e3ee9 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -2,10 +2,12 @@
 <openerp>
     <data noupdate="0">
         <record model="res.groups" id="base.group_tool_user">
-            <field name="name">Tools / User</field>
+            <field name="name">User</field>
+            <field name="category_id" ref="base.module_category_tools"/>
         </record>
         <record model="res.groups" id="base.group_tool_manager">
-            <field name="name">Tools / Manager</field>
+            <field name="name">Manager</field>
+            <field name="category_id" ref="base.module_category_tools"/>
             <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
         </record>
         <record model="res.groups" id="base.group_survey_user">
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 98a8c03c177..16bd30c151f 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -2,14 +2,9 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
     
 </data>