[REF]Account: Refactoring the account, Change some fields name according to new api guidelines

code improvement

code improvement

payment_method to payment_method_id

writeoff_account to writeoff_account_id

property_account_receivable to property_account_receivable_id

property_account_payable to property_account_payable_id

property_account_expense_categ to property_account_expense_categ_id

property_account_income_categ to property_account_income_categ_id

property_account_expense to property_account_expense_id

property_account_income to property_account_income_id

property_account_expense_categ fix

sale_tax to sale_tax_id and default_sale_tax to default_sale_tax_id

purchase_tax to purchase_tax_id and default_purchase_tax to default_purchase_tax_id

ref_companies to ref_companies_ids

property_account_position to property_account_position_id

property_payment_term to property_payment_term_id

property_supplier_payment_term to property_supplier_payment_term_id

bank_accounts_id to bank_accounts_ids

payment_method fix after rebase

user_type after rebase

payment_method fix after rebase

after rebase

invoice to invoice_id

fix payment_method_id after rebase

code improvement

[IMP]user_type to user_type_id

[IMP]property_stock_account_input_categ, property_stock_account_output_categ to _id

[IMP]improve after rebase

[IMP]fix type

[IMP]Account: code improvement

addons/account/account.py

@@ -100,9 +100,9 @@ class AccountAccount(models.Model):
         help="Forces all moves for this account to have this secondary currency.")
     code = fields.Char(size=64, required=True, index=True)
     deprecated = fields.Boolean(index=True, default=False)
-    user_type = fields.Many2one('account.account.type', string='Type', required=True,
+    user_type_id = fields.Many2one('account.account.type', string='Type', required=True, oldname="user_type", 
         help="Account Type is used for information purpose, to generate country-specific legal reports, and set the rules to close a fiscal year and generate opening entries.")
-    internal_type = fields.Selection(related='user_type.type', store=True)
+    internal_type = fields.Selection(related='user_type_id.type', store=True)
     #has_unreconciled_entries = fields.Boolean(compute='_compute_has_unreconciled_entries',
     #    help="The account has at least one unreconciled debit and credit since last time the invoices & payments matching was performed.")
     last_time_entries_checked = fields.Datetime(string='Latest Invoices & Payments Matching Date', readonly=True, copy=False,
@@ -228,11 +228,11 @@ class AccountJournal(models.Model):
     analytic_journal_id = fields.Many2one('account.analytic.journal', string='Analytic Journal', help="Journal for analytic entries")
     refund_sequence = fields.Boolean(string='Dedicated Refund Sequence', help="Check this box if you don't want to share the same sequence for invoices and refunds made from this journal")
 
-    inbound_payment_methods = fields.Many2many('account.payment.method', 'account_journal_inbound_payment_method_rel', 'journal_id', 'inbound_payment_method',
+    inbound_payment_method_ids = fields.Many2many('account.payment.method', 'account_journal_inbound_payment_method_rel', 'journal_id', 'inbound_payment_method',
         domain=[('payment_type', '=', 'inbound')], string='Inbound Payment Methods', default=lambda self: self._default_inbound_payment_methods(),
         help="Means of payment for collecting money. Odoo modules offer various payments handling facilities, "
              "but you can always use the 'Manual' payment method in order to manage payments outside of the software.")
-    outbound_payment_methods = fields.Many2many('account.payment.method', 'account_journal_outbound_payment_method_rel', 'journal_id', 'outbound_payment_method',
+    outbound_payment_method_ids = fields.Many2many('account.payment.method', 'account_journal_outbound_payment_method_rel', 'journal_id', 'outbound_payment_method',
         domain=[('payment_type', '=', 'outbound')], string='Outbound Payment Methods', default=lambda self: self._default_outbound_payment_methods(),
         help="Means of payment for sending money. Odoo modules offer various payments handling facilities, "
              "but you can always use the 'Manual' payment method in order to manage payments outside of the software.")
@@ -342,7 +342,7 @@ class AccountJournal(models.Model):
                 'name': name,
                 'currency_id': currency_id or False,
                 'code': new_code,
-                'user_type': liquidity_type and liquidity_type.id or False,
+                'user_type_id': liquidity_type and liquidity_type.id or False,
                 'company_id': company.id,
         }
 
@@ -409,11 +409,11 @@ class AccountJournal(models.Model):
         return res
 
     @api.multi
-    @api.depends('inbound_payment_methods', 'outbound_payment_methods')
+    @api.depends('inbound_payment_method_ids', 'outbound_payment_method_ids')
     def _methods_compute(self):
         for journal in self:
-            journal.at_least_one_inbound = bool(len(self.inbound_payment_methods))
-            journal.at_least_one_outbound = bool(len(self.outbound_payment_methods))
+            journal.at_least_one_inbound = bool(len(self.inbound_payment_method_ids))
+            journal.at_least_one_outbound = bool(len(self.outbound_payment_method_ids))
 
 
 #----------------------------------------------------------

addons/account/account_analytic_line.py

@@ -49,17 +49,17 @@ class AccountAnalyticLine(models.Model):
                 if not unit_obj or prod.uom_po_id.category_id.id != unit_obj.category_id.id:
                     unit = prod.uom_po_id.id
         if j_id.type <> 'sale':
-            a = prod.property_account_expense.id
+            a = prod.property_account_expense_id.id
             if not a:
-                a = prod.categ_id.property_account_expense_categ.id
+                a = prod.categ_id.property_account_expense_categ_id.id
             if not a:
                 raise UserError(_('There is no expense account defined ' \
                                 'for this product: "%s" (id:%d).') % \
                                 (prod.name, prod.id,))
         else:
-            a = prod.property_account_income.id
+            a = prod.property_account_income_id.id
             if not a:
-                a = prod.categ_id.property_account_income_categ.id
+                a = prod.categ_id.property_account_income_categ_id.id
             if not a:
                 raise UserError(_('There is no income account defined ' \
                                 'for this product: "%s" (id:%d).') % \
@@ -117,13 +117,13 @@ class AccountAnalyticLine(models.Model):
                 if not self.product_uom_id or self.product_id.uom_po_id.category_id.id != self.product_uom_id.category_id.id:
                     unit = self.product_id.uom_po_id.id
         if journal_id.type != 'sale':
-            account = self.product_id.property_account_expense.id or self.product_id.categ_id.property_account_expense_categ.id
+            account = self.product_id.property_account_expense_id.id or self.product_id.categ_id.property_account_expense_categ_id.id
             if not account:
                 raise UserError(_('There is no expense account defined ' \
                                 'for this product: "%s" (id:%d).') % \
                                 (self.product_id.name, self.product_id.id,))
         else:
-            account = self.product_id.property_account_income.id or self.product_id.categ_id.property_account_income_categ.id
+            account = self.product_id.property_account_income_id.id or self.product_id.categ_id.property_account_income_categ_id.id
             if not account:
                 raise UserError(_('There is no income account defined ' \
                                 'for this product: "%s" (id:%d).') % \
@@ -156,4 +156,4 @@ class AccountAnalyticLine(models.Model):
         if context.get('account_id', False):
             analytic_account = self.env['account.analytic.account'].search([('id', '=', context['account_id'])], limit=1)
             header = _('Entries: ') + (analytic_account.name or '')
-        return header
+        return header

addons/account/account_bank_statement.py

@@ -448,9 +448,9 @@ class AccountBankStatementLine(models.Model):
         }
         if self.partner_id:
             if amount > 0:
-                data['open_balance_account_id'] = self.partner_id.property_account_receivable.id
+                data['open_balance_account_id'] = self.partner_id.property_account_receivable_id.id
             else:
-                data['open_balance_account_id'] = self.partner_id.property_account_payable.id
+                data['open_balance_account_id'] = self.partner_id.property_account_payable_id.id
 
         return data
 
@@ -557,7 +557,7 @@ class AccountBankStatementLine(models.Model):
 
         # Select move lines until their total amount is greater than the statement line amount
         domain = [('reconciled', '=', False)]
-        domain += [('account_id.user_type.type', '=', amount > 0 and 'receivable' or 'payable')]  # Make sure we can't mix receivable and payable
+        domain += [('account_id.user_type_id.type', '=', amount > 0 and 'receivable' or 'payable')]  # Make sure we can't mix receivable and payable
         domain += amount_domain_maker('<', amount)  # Will also enforce > 0
         mv_lines = self.get_move_lines_for_reconciliation(excluded_ids=excluded_ids, limit=5, additional_domain=domain)
         st_line_currency = self.currency_id or self.journal_id.currency_id or self.journal_id.company_id.currency_id

addons/account/account_invoice.py

@@ -427,16 +427,16 @@ class AccountInvoice(models.Model):
         type = self.type
         if p:
             partner_id = p.id
-            rec_account = p.property_account_receivable
-            pay_account = p.property_account_payable
+            rec_account = p.property_account_receivable_id
+            pay_account = p.property_account_payable_id
             if company_id:
-                if p.property_account_receivable.company_id and \
-                        p.property_account_receivable.company_id.id != company_id and \
-                        p.property_account_payable.company_id and \
-                        p.property_account_payable.company_id.id != company_id:
+                if p.property_account_receivable_id.company_id and \
+                        p.property_account_receivable_id.company_id.id != company_id and \
+                        p.property_account_payable_id.company_id and \
+                        p.property_account_payable_id.company_id.id != company_id:
                     prop = self.env['ir.property']
-                    rec_dom = [('name', '=', 'property_account_receivable'), ('company_id', '=', company_id)]
-                    pay_dom = [('name', '=', 'property_account_payable'), ('company_id', '=', company_id)]
+                    rec_dom = [('name', '=', 'property_account_receivable_id'), ('company_id', '=', company_id)]
+                    pay_dom = [('name', '=', 'property_account_payable_id'), ('company_id', '=', company_id)]
                     res_dom = [('res_id', '=', 'res.partner,%s' % partner_id)]
                     rec_prop = prop.search(rec_dom + res_dom) or prop.search(rec_dom)
                     pay_prop = prop.search(pay_dom + res_dom) or prop.search(pay_dom)
@@ -449,11 +449,11 @@ class AccountInvoice(models.Model):
 
             if type in ('out_invoice', 'out_refund'):
                 account_id = rec_account.id
-                payment_term_id = p.property_payment_term.id
+                payment_term_id = p.property_payment_term_id.id
             else:
                 account_id = pay_account.id
-                payment_term_id = p.property_supplier_payment_term.id
-            fiscal_position = p.property_account_position.id
+                payment_term_id = p.property_supplier_payment_term_id.id
+            fiscal_position = p.property_account_position_id.id
             bank_id = p.bank_ids and p.bank_ids.ids[0] or False
         self.account_id = account_id
         self.payment_term_id = payment_term_id
@@ -596,10 +596,10 @@ class AccountInvoice(models.Model):
                 'uos_id': line.uos_id.id,
                 'account_analytic_id': line.account_analytic_id.id,
                 'tax_ids': tax_ids,
-                'invoice': self.id,
+                'invoice_id': self.id,
             }
             if line['account_analytic_id']:
-                move_line_dict['analytic_lines'] = [(0, 0, line._get_analytic_line())]
+                move_line_dict['analytic_line_ids'] = [(0, 0, line._get_analytic_line())]
             res.append(move_line_dict)
         return res
 
@@ -642,7 +642,7 @@ class AccountInvoice(models.Model):
                     am = line2[tmp]['debit'] - line2[tmp]['credit'] + (l['debit'] - l['credit'])
                     line2[tmp]['debit'] = (am > 0) and am or 0.0
                     line2[tmp]['credit'] = (am < 0) and -am or 0.0
-                    line2[tmp]['analytic_lines'] += l['analytic_lines']
+                    line2[tmp]['analytic_line_ids'] += l['analytic_line_ids']
                 else:
                     line2[tmp] = l
             line = []
@@ -707,7 +707,7 @@ class AccountInvoice(models.Model):
                         'date_maturity': t[0],
                         'amount_currency': diff_currency and amount_currency,
                         'currency_id': diff_currency and inv.currency_id.id,
-                        'invoice': inv.id
+                        'invoice_id': inv.id
                     })
             else:
                 iml.append({
@@ -718,7 +718,7 @@ class AccountInvoice(models.Model):
                     'date_maturity': inv.date_due,
                     'amount_currency': diff_currency and total_currency,
                     'currency_id': diff_currency and inv.currency_id.id,
-                    'invoice': inv.id
+                    'invoice_id': inv.id
                 })
             part = self.env['res.partner']._find_accounting_partner(inv.partner_id)
             line = [(0, 0, self.line_get_convert(l, part.id)) for l in iml]
@@ -737,7 +737,7 @@ class AccountInvoice(models.Model):
             }
             ctx['company_id'] = inv.company_id.id
             ctx['dont_create_taxes'] = True
-            ctx['invoice'] = inv.move_name and inv or False
+            ctx['invoice_id'] = inv.move_name and inv or False
             move = account_move.with_context(ctx).create(move_vals)
             # make the invoice point to that move
             vals = {
@@ -764,14 +764,14 @@ class AccountInvoice(models.Model):
             'debit': line['price'] > 0 and line['price'],
             'credit': line['price'] < 0 and -line['price'],
             'account_id': line['account_id'],
-            'analytic_lines': line.get('analytic_lines', []),
+            'analytic_line_ids': line.get('analytic_line_ids', []),
             'amount_currency': line['price'] > 0 and abs(line.get('amount_currency', False)) or -abs(line.get('amount_currency', False)),
             'currency_id': line.get('currency_id', False),
             'quantity': line.get('quantity', 1.00),
             'product_id': line.get('product_id', False),
             'product_uom_id': line.get('uos_id', False),
             'analytic_account_id': line.get('account_analytic_id', False),
-            'invoice': line.get('invoice', False),
+            'invoice_id': line.get('invoice_id', False),
             'tax_ids': line.get('tax_ids', False),
             'tax_line_id': line.get('tax_line_id', False),
         }
@@ -914,10 +914,10 @@ class AccountInvoice(models.Model):
         payment_type = self.type in ('out_invoice', 'in_refund') and 'inbound' or 'outbound'
         if payment_type == 'inbound':
             payment_method = self.env.ref('account.account_payment_method_manual_in')
-            journal_payment_methods = pay_journal.inbound_payment_methods
+            journal_payment_methods = pay_journal.inbound_payment_method_ids
         else:
             payment_method = self.env.ref('account.account_payment_method_manual_out')
-            journal_payment_methods = pay_journal.outbound_payment_methods
+            journal_payment_methods = pay_journal.outbound_payment_method_ids
         if payment_method not in journal_payment_methods:
             raise UserError(_('No appropriate payment method enabled on journal %s') % pay_journal.name)
 
@@ -930,9 +930,9 @@ class AccountInvoice(models.Model):
             'partner_type': self.type in ('out_invoice', 'out_refund') and 'customer' or 'supplier',
             'journal_id': pay_journal.id,
             'payment_type': payment_type,
-            'payment_method': payment_method.id,
+            'payment_method_id': payment_method.id,
             'payment_difference_handling': writeoff_acc and 'reconcile' or 'open',
-            'writeoff_account': writeoff_acc and writeoff_acc.id or False,
+            'writeoff_account_id': writeoff_acc and writeoff_acc.id or False,
         })
         payment.post()
 

addons/account/account_move.py

@@ -40,7 +40,7 @@ class AccountMove(models.Model):
                 total += line.debit
             move.amount = total
 
-    @api.depends('line_ids.debit', 'line_ids.credit', 'line_ids.matched_debit_ids.amount', 'line_ids.matched_credit_ids.amount', 'line_ids.account_id.user_type.type')
+    @api.depends('line_ids.debit', 'line_ids.credit', 'line_ids.matched_debit_ids.amount', 'line_ids.matched_credit_ids.amount', 'line_ids.account_id.user_type_id.type')
     def _compute_matched_percentage(self):
         """Compute the percentage to apply for cash basis method. This value is relevant only for moves that
         involve journal items on receivable or payable accounts.
@@ -49,7 +49,7 @@ class AccountMove(models.Model):
             total_amount = 0.0
             total_reconciled = 0.0
             for line in move.line_ids:
-                if line.account_id.user_type.type in ('receivable', 'payable'):
+                if line.account_id.user_type_id.type in ('receivable', 'payable'):
                     amount = abs(line.debit - line.credit)
                     total_amount += amount
                     for partial_line in (line.matched_debit_ids + line.matched_credit_ids):
@@ -334,7 +334,7 @@ class AccountMoveLine(models.Model):
     date_maturity = fields.Date(string='Due date', index=True, required=True,
         help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line.")
     date = fields.Date(related='move_id.date', string='Date', required=True, index=True, default=fields.Date.context_today, store=True, copy=False)
-    analytic_lines = fields.One2many('account.analytic.line', 'move_id', string='Analytic lines')
+    analytic_line_ids = fields.One2many('account.analytic.line', 'move_id', string='Analytic lines', oldname="analytic_lines")
     tax_ids = fields.Many2many('account.tax', string='Taxes', copy=False, readonly=True)
     tax_line_id = fields.Many2one('account.tax', string='Originator tax', copy=False, readonly=True)
     analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account')
@@ -342,9 +342,9 @@ class AccountMoveLine(models.Model):
     counterpart = fields.Char("Counterpart", compute='_get_counterpart', help="Compute the counter part accounts of this journal item for this journal entry. This can be needed in reports.")
 
     # TODO: put the invoice link and partner_id on the account_move
-    invoice = fields.Many2one('account.invoice')
+    invoice_id = fields.Many2one('account.invoice', oldname="invoice")
     partner_id = fields.Many2one('res.partner', string='Partner', index=True, ondelete='restrict')
-    user_type = fields.Many2one('account.account.type', related='account_id.user_type', index=True, store=True)
+    user_type_id = fields.Many2one('account.account.type', related='account_id.user_type_id', index=True, store=True, oldname="user_type")
 
     _sql_constraints = [
         ('credit_debit1', 'CHECK (credit*debit=0)', 'Wrong credit or debit value in accounting entry !'),
@@ -418,7 +418,7 @@ class AccountMoveLine(models.Model):
                     FROM
                         account_move_line l
                         RIGHT JOIN account_account a ON (a.id = l.account_id)
-                        RIGHT JOIN account_account_type at ON (at.id = a.user_type)
+                        RIGHT JOIN account_account_type at ON (at.id = a.user_type_id)
                         %s
                     WHERE
                         a.reconcile IS TRUE
@@ -904,7 +904,7 @@ class AccountMoveLine(models.Model):
         if ('account_id' in vals):
             account = AccountObj.browse(vals['account_id'])
             if journal.type_control_ids:
-                type = account.user_type
+                type = account.user_type_id
                 for t in journal.type_control_ids:
                     if type.code == t.code:
                         ok = True
@@ -988,10 +988,10 @@ class AccountMoveLine(models.Model):
             raise UserError(_('You cannot use deprecated account.'))
         if any(key in vals for key in ('account_id', 'journal_id', 'date', 'move_id', 'debit', 'credit', 'amount_currency', 'currency_id')):
             self._update_check()
-        #when we set the expected payment date, log a note on the invoice related (if any)
-        if vals.get('expected_pay_date') and self.invoice:
+        #when we set the expected payment date, log a note on the invoice_id related (if any)
+        if vals.get('expected_pay_date') and self.invoice_id:
             msg = _('New expected payment date: ') + vals['expected_pay_date'] + '.\n' + vals.get('internal_note', '')
-            self.invoice.message_post(body=msg) #TODO: check it is an internal note (not a regular email)!
+            self.invoice_id.message_post(body=msg) #TODO: check it is an internal note (not a regular email)!
         #when making a reconciliation on an existing liquidity journal item, mark the payment as reconciled
         if 'statement_id' in vals and self.payment_id:
             # In case of an internal transfer, there are 2 liquidity move lines to match with a bank statement
@@ -1057,8 +1057,8 @@ class AccountMoveLine(models.Model):
             if obj_line.analytic_account_id:
                 if not obj_line.journal_id.analytic_journal_id:
                     raise UserError(_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
-                if obj_line.analytic_lines:
-                    obj_line.analytic_lines.unlink()
+                if obj_line.analytic_line_ids:
+                    obj_line.analytic_line_ids.unlink()
                 vals_line = obj_line._prepare_analytic_line()[0]
                 self.env['account.analytic.line'].create(vals_line)
 
@@ -1094,7 +1094,7 @@ class AccountMoveLine(models.Model):
             domain += [(date_field, '<=', context['date_to'])]
         if context.get('date_from'):
             if not context.get('strict_range'):
-                domain += ['|', (date_field, '>=', context['date_from']), ('account_id.user_type.include_initial_balance', '=', True)]
+                domain += ['|', (date_field, '>=', context['date_from']), ('account_id.user_type_id.include_initial_balance', '=', True)]
             else:
                 domain += [(date_field, '>=', context['date_from'])]
 

addons/account/account_payment.py

@@ -31,8 +31,8 @@ class account_abstract_payment(models.AbstractModel):
     _description = "Contains the logic shared between models which allows to register payments"
 
     payment_type = fields.Selection([('outbound', 'Send Money'), ('inbound', 'Receive Money')], string='Payment Type', required=True)
-    payment_method = fields.Many2one('account.payment.method', string='Payment Method', required=True)
-    payment_method_code = fields.Char(related='payment_method.code',
+    payment_method_id = fields.Many2one('account.payment.method', string='Payment Method', required=True, oldname="payment_method")
+    payment_method_code = fields.Char(related='payment_method_id.code',
         help="Technical field used to adapt the interface to the payment method selected.")
 
     partner_type = fields.Selection([('customer', 'Customer'), ('supplier', 'Supplier')])
@@ -60,7 +60,7 @@ class account_abstract_payment(models.AbstractModel):
         if not self.journal_id:
             self.hide_payment_method = True
             return
-        journal_payment_methods = self.payment_type == 'inbound' and self.journal_id.inbound_payment_methods or self.journal_id.outbound_payment_methods
+        journal_payment_methods = self.payment_type == 'inbound' and self.journal_id.inbound_payment_method_ids or self.journal_id.outbound_payment_method_ids
         self.hide_payment_method = len(journal_payment_methods) == 1 and journal_payment_methods[0].code == 'manual'
 
     @api.onchange('journal_id')
@@ -68,11 +68,11 @@ class account_abstract_payment(models.AbstractModel):
         if self.journal_id:
             self.currency_id = self.journal_id.currency_id or self.company_id.currency_id
             # Set default payment method (we consider the first to be the default one)
-            payment_methods = self.payment_type == 'inbound' and self.journal_id.inbound_payment_methods or self.journal_id.outbound_payment_methods
-            self.payment_method = payment_methods and payment_methods[0] or False
+            payment_methods = self.payment_type == 'inbound' and self.journal_id.inbound_payment_method_ids or self.journal_id.outbound_payment_method_ids
+            self.payment_method_id = payment_methods and payment_methods[0] or False
             # Set payment method domain (restrict to methods enabled for the journal and to selected payment type)
             payment_type = self.payment_type in ('outbound', 'transfer') and 'outbound' or 'inbound'
-            return {'domain': {'payment_method': [('payment_type', '=', payment_type), ('id', 'in', payment_methods.ids)]}}
+            return {'domain': {'payment_method_id': [('payment_type', '=', payment_type), ('id', 'in', payment_methods.ids)]}}
         return {}
 
     def _get_invoices(self):
@@ -98,7 +98,7 @@ class account_register_payments(models.TransientModel):
     @api.onchange('payment_type')
     def _onchange_payment_type(self):
         if self.payment_type:
-            return {'domain': {'payment_method': [('payment_type', '=', self.payment_type)]}}
+            return {'domain': {'payment_method_id': [('payment_type', '=', self.payment_type)]}}
 
     def _get_invoices(self):
         return self.env['account.invoice'].browse(self._context.get('active_ids'))
@@ -141,7 +141,7 @@ class account_register_payments(models.TransientModel):
         """ Hook for extension """
         return {
             'journal_id': self.journal_id.id,
-            'payment_method': self.payment_method.id,
+            'payment_method_id': self.payment_method_id.id,
             'payment_date': self.payment_date,
             'communication': self.communication,
             'invoice_ids': [(4, inv.id, None) for inv in self._get_invoices()],
@@ -194,7 +194,7 @@ class account_payment(models.Model):
     has_invoices = fields.Boolean(compute="_get_has_invoices", help="Technical field used for usablity purposes")
     payment_difference = fields.Monetary(compute='_compute_payment_difference', readonly=True)
     payment_difference_handling = fields.Selection([('open', 'Partial payment'), ('reconcile', 'Mark invoice as fully paid')], default='open', string="Payment Difference", copy=False)
-    writeoff_account = fields.Many2one('account.account', string="Counterpart Account", domain=[('deprecated', '=', False)], copy=False)
+    writeoff_account_id = fields.Many2one('account.account', string="Counterpart Account", domain=[('deprecated', '=', False)], copy=False)
 
     # FIXME: ondelete='restrict' not working (eg. cancel a bank statement reconciliation with a payment)
     move_line_ids = fields.One2many('account.move.line', 'payment_id', readonly=True, copy=False, ondelete='restrict')
@@ -210,9 +210,9 @@ class account_payment(models.Model):
             self.destination_account_id = self.company_id.transfer_account_id.id
         elif self.partner_id:
             if self.partner_type == 'customer':
-                self.destination_account_id = self.partner_id.property_account_receivable.id
+                self.destination_account_id = self.partner_id.property_account_receivable_id.id
             else:
-                self.destination_account_id = self.partner_id.property_account_payable.id
+                self.destination_account_id = self.partner_id.property_account_payable_id.id
 
     @api.onchange('partner_type')
     def _onchange_partner_type(self):
@@ -256,12 +256,12 @@ class account_payment(models.Model):
 
     @api.model
     def create(self, vals):
-        self._check_communication(vals['payment_method'], vals.get('communication', ''))
+        self._check_communication(vals['payment_method_id'], vals.get('communication', ''))
         return super(account_payment, self).create(vals)
 
     def _check_communication(self, payment_method_id, communication):
         """ This method is to be overwritten by payment type modules. The method body would look like :
-            if payment_method_id == self.env.ref('my_module.payment_method').id:
+            if payment_method_id == self.env.ref('my_module.payment_method_id').id:
                 try:
                     communication.decode('ascii')
                 except UnicodeError:
@@ -442,7 +442,7 @@ class account_payment(models.Model):
         """
         return {
             'partner_id': self.payment_type in ('inbound', 'outbound') and self.partner_id.commercial_partner_id.id or False,
-            'invoice': invoice_id and invoice_id.id or False,
+            'invoice_id': invoice_id and invoice_id.id or False,
             'move_id': move_id,
             'debit': debit,
             'credit': credit,

addons/account/chart_template.py

@@ -24,7 +24,7 @@ class AccountAccountTemplate(models.Model):
     name = fields.Char(required=True, index=True)
     currency_id = fields.Many2one('res.currency', string='Secondary Currency', help="Forces all moves for this account to have this secondary currency.")
     code = fields.Char(size=64, required=True, index=True)
-    user_type = fields.Many2one('account.account.type', string='Type', required=True,
+    user_type_id = fields.Many2one('account.account.type', string='Type', required=True,
         help="These types are defined according to your country. The type contains more information "\
         "about the account and its specificities.")
     reconcile = fields.Boolean(string='Allow Invoices & payments Matching', default=False,
@@ -71,20 +71,20 @@ class AccountChartTemplate(models.Model):
         help='List of all the taxes that have to be installed by the wizard')
     bank_account_code_char = fields.Char(string='Code of the main bank account')
     transfer_account_id = fields.Many2one('account.account.template', string='Transfer Account', required=True,
-        domain=lambda self: [('reconcile', '=', True), ('user_type.id', '=', self.env.ref('account.data_account_type_current_assets').id)],
+        domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id)],
         help="Intermediary account used when moving money from a liquidity account to another")
     income_currency_exchange_account_id = fields.Many2one('account.account.template',
         string="Gain Exchange Rate Account", domain=[('internal_type', '=', 'other'), ('deprecated', '=', False)])
     expense_currency_exchange_account_id = fields.Many2one('account.account.template',
         string="Loss Exchange Rate Account", domain=[('internal_type', '=', 'other'), ('deprecated', '=', False)])
-    property_account_receivable = fields.Many2one('account.account.template', string='Receivable Account')
-    property_account_payable = fields.Many2one('account.account.template', string='Payable Account')
-    property_account_expense_categ = fields.Many2one('account.account.template', string='Expense Category Account')
-    property_account_income_categ = fields.Many2one('account.account.template', string='Income Category Account')
-    property_account_expense = fields.Many2one('account.account.template', string='Expense Account on Product Template')
-    property_account_income = fields.Many2one('account.account.template', string='Income Account on Product Template')
-    property_stock_account_input_categ = fields.Many2one('account.account.template')
-    property_stock_account_output_categ = fields.Many2one('account.account.template')
+    property_account_receivable_id = fields.Many2one('account.account.template', string='Receivable Account', oldname="property_account_receivable")
+    property_account_payable_id = fields.Many2one('account.account.template', string='Payable Account', oldname="property_account_payable")
+    property_account_expense_categ_id = fields.Many2one('account.account.template', string='Expense Category Account', oldname="property_account_expense_categ")
+    property_account_income_categ_id = fields.Many2one('account.account.template', string='Income Category Account', oldname="property_account_income_categ")
+    property_account_expense_id = fields.Many2one('account.account.template', string='Expense Account on Product Template', oldname="property_account_expense")
+    property_account_income_id = fields.Many2one('account.account.template', string='Income Account on Product Template', oldname="property_account_income")
+    property_stock_account_input_categ_id = fields.Many2one('account.account.template', oldname="property_stock_account_input_categ")
+    property_stock_account_output_categ_id = fields.Many2one('account.account.template', oldname="property_stock_account_output_categ")
     property_stock_valuation_account_id = fields.Many2one('account.account.template')
 
     @api.one
@@ -159,9 +159,9 @@ class AccountChartTemplate(models.Model):
             # Get the default accounts
             default_account = False
             if journal['type'] == 'sale':
-                default_account = acc_template_ref.get(self.property_account_income_categ.id)
+                default_account = acc_template_ref.get(self.property_account_income_categ_id.id)
             elif journal['type'] == 'purchase':
-                default_account = acc_template_ref.get(self.property_account_expense_categ.id)
+                default_account = acc_template_ref.get(self.property_account_expense_categ_id.id)
             elif journal['type'] == 'general' and journal['name'] == _('Exchange Rate Journal'):
                 if type=='credit':
                     default_account = acc_template_ref.get(self.income_currency_exchange_account_id.id)
@@ -206,12 +206,12 @@ class AccountChartTemplate(models.Model):
         self.ensure_one()
         PropertyObj = self.env['ir.property']
         todo_list = [
-            ('property_account_receivable', 'res.partner', 'account.account'),
-            ('property_account_payable', 'res.partner', 'account.account'),
-            ('property_account_expense_categ', 'product.category', 'account.account'),
-            ('property_account_income_categ', 'product.category', 'account.account'),
-            ('property_account_expense', 'product.template', 'account.account'),
-            ('property_account_income', 'product.template', 'account.account'),
+            ('property_account_receivable_id', 'res.partner', 'account.account'),
+            ('property_account_payable_id', 'res.partner', 'account.account'),
+            ('property_account_expense_categ_id', 'product.category', 'account.account'),
+            ('property_account_income_categ_id', 'product.category', 'account.account'),
+            ('property_account_expense_id', 'product.template', 'account.account'),
+            ('property_account_income_id', 'product.template', 'account.account'),
         ]
         for record in todo_list:
             account = getattr(self, record[0])
@@ -232,8 +232,8 @@ class AccountChartTemplate(models.Model):
                     #create the property
                     PropertyObj.create(vals)
         stock_properties = [
-            'property_stock_account_input_categ',
-            'property_stock_account_output_categ',
+            'property_stock_account_input_categ_id',
+            'property_stock_account_output_categ_id',
             'property_stock_valuation_account_id',
         ]
         for stock_property in stock_properties:
@@ -354,7 +354,7 @@ class AccountChartTemplate(models.Model):
                 'name': account_template.name,
                 'currency_id': account_template.currency_id and account_template.currency_id.id or False,
                 'code': code_acc,
-                'user_type': account_template.user_type and account_template.user_type.id or False,
+                'user_type_id': account_template.user_type_id and account_template.user_type_id.id or False,
                 'reconcile': account_template.reconcile,
                 'note': account_template.note,
                 'tax_ids': [(6, 0, tax_ids)],
@@ -548,15 +548,15 @@ class WizardMultiChartsAccounts(models.TransientModel):
     currency_id = fields.Many2one('res.currency', string='Currency', help="Currency as per company's country.", required=True)
     only_one_chart_template = fields.Boolean(string='Only One Chart Template Available')
     chart_template_id = fields.Many2one('account.chart.template', string='Chart Template', required=True)
-    bank_accounts_id = fields.One2many('account.bank.accounts.wizard', 'bank_account_id', string='Cash and Banks', required=True)
+    bank_account_ids = fields.One2many('account.bank.accounts.wizard', 'bank_account_id', string='Cash and Banks', required=True, oldname="bank_accounts_id")
     bank_account_code_char = fields.Char('Bank Accounts Code')
     code_digits = fields.Integer(string='# of Digits', required=True, help="No. of Digits to use for account code")
-    sale_tax = fields.Many2one('account.tax.template', string='Default Sales Tax')
-    purchase_tax = fields.Many2one('account.tax.template', string='Default Purchase Tax')
+    sale_tax_id = fields.Many2one('account.tax.template', string='Default Sales Tax', oldname="sale_tax")
+    purchase_tax_id = fields.Many2one('account.tax.template', string='Default Purchase Tax', oldname="purchase_tax")
     sale_tax_rate = fields.Float(string='Sales Tax(%)')
     use_anglo_saxon = fields.Boolean(string='Use Anglo-Saxon Accounting', related='chart_template_id.use_anglo_saxon')
     transfer_account_id = fields.Many2one('account.account.template', required=True, string='Transfer Account',
-        domain=lambda self: [('reconcile', '=', True), ('user_type.id', '=', self.env.ref('account.data_account_type_current_assets').id)],
+        domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id)],
         help="Intermediary account used when moving money from a liquidity account to another")
     purchase_tax_rate = fields.Float(string='Purchase Tax(%)')
     complete_tax_set = fields.Boolean('Complete Set of Taxes',
@@ -597,11 +597,11 @@ class WizardMultiChartsAccounts(models.TransientModel):
                 purchase_tax_domain = base_tax_domain + [('type_tax_use', '=', 'purchase')]
                 sale_tax = tax_templ_obj.search(sale_tax_domain, order="sequence, id desc", limit=1)
                 purchase_tax = tax_templ_obj.search(purchase_tax_domain, order="sequence, id desc", limit=1)
-                self.sale_tax = sale_tax.id
-                self.purchase_tax = purchase_tax.id
+                self.sale_tax_id = sale_tax.id
+                self.purchase_tax_id = purchase_tax.id
                 res.setdefault('domain', {})
-                res['domain']['sale_tax'] = repr(sale_tax_domain)
-                res['domain']['purchase_tax'] = repr(purchase_tax_domain)
+                res['domain']['sale_tax_id'] = repr(sale_tax_domain)
+                res['domain']['purchase_tax_id'] = repr(purchase_tax_domain)
             if self.chart_template_id.transfer_account_id:
                 self.transfer_account_id = self.chart_template_id.transfer_account_id.id
             if self.chart_template_id.code_digits:
@@ -617,8 +617,8 @@ class WizardMultiChartsAccounts(models.TransientModel):
         tax_templ_obj = self.env['account.tax.template']
         account_chart_template = self.env['account.chart.template']
 
-        if 'bank_accounts_id' in fields:
-            res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'}, {'acc_name': _('Bank'), 'account_type': 'bank'}]})
+        if 'bank_account_ids' in fields:
+            res.update({'bank_account_ids': [{'acc_name': _('Cash'), 'account_type': 'cash'}, {'acc_name': _('Bank'), 'account_type': 'bank'}]})
         if 'company_id' in fields:
             res.update({'company_id': self.env.user.company_id.id})
         if 'currency_id' in fields:
@@ -641,14 +641,14 @@ class WizardMultiChartsAccounts(models.TransientModel):
             if 'chart_template_id' in fields:
                 res.update({'only_one_chart_template': len(chart_templates) == 1,
                             'chart_template_id': chart_id})
-            if 'sale_tax' in fields:
+            if 'sale_tax_id' in fields:
                 sale_tax = tax_templ_obj.search([('chart_template_id', 'in', chart_hierarchy_ids),
                                                               ('type_tax_use', '=', 'sale')], limit=1, order='sequence')
-                res.update({'sale_tax': sale_tax and sale_tax.id or False})
-            if 'purchase_tax' in fields:
+                res.update({'sale_tax_id': sale_tax and sale_tax.id or False})
+            if 'purchase_tax_id' in fields:
                 purchase_tax = tax_templ_obj.search([('chart_template_id', 'in', chart_hierarchy_ids),
                                                                   ('type_tax_use', '=', 'purchase')], limit=1, order='sequence')
-                res.update({'purchase_tax': purchase_tax and purchase_tax.id or False})
+                res.update({'purchase_tax_id': purchase_tax and purchase_tax.id or False})
         res.update({
             'purchase_tax_rate': 15.0,
             'sale_tax_rate': 15.0,
@@ -730,10 +730,10 @@ class WizardMultiChartsAccounts(models.TransientModel):
         acc_template_ref, taxes_ref = self.chart_template_id._install_template(company, code_digits=self.code_digits, transfer_account_id=self.transfer_account_id)
 
         # write values of default taxes for product as super user
-        if self.sale_tax and taxes_ref:
-            ir_values_obj.sudo().set_default('product.template', "taxes_id", [taxes_ref[self.sale_tax.id]], for_all_users=True, company_id=company.id)
-        if self.purchase_tax and taxes_ref:
-            ir_values_obj.sudo().set_default('product.template', "supplier_taxes_id", [taxes_ref[self.purchase_tax.id]], for_all_users=True, company_id=company.id)
+        if self.sale_tax_id and taxes_ref:
+            ir_values_obj.sudo().set_default('product.template', "taxes_id", [taxes_ref[self.sale_tax_id.id]], for_all_users=True, company_id=company.id)
+        if self.purchase_tax_id and taxes_ref:
+            ir_values_obj.sudo().set_default('product.template', "supplier_taxes_id", [taxes_ref[self.purchase_tax_id.id]], for_all_users=True, company_id=company.id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(company, acc_template_ref)
@@ -742,14 +742,14 @@ class WizardMultiChartsAccounts(models.TransientModel):
         self.env['account.account'].create({
             'code': '0',
             'name': _('Undistributed Profits/Losses'),
-            'user_type': self.env.ref("account.data_unaffected_earnings").id,
+            'user_type_id': self.env.ref("account.data_unaffected_earnings").id,
             'company_id': company.id,})
         return {}
 
     @api.multi
     def _create_bank_journals_from_o2m(self, company, acc_template_ref):
         '''
-        This function creates bank journals and its accounts for each line encoded in the field bank_accounts_id of the
+        This function creates bank journals and its accounts for each line encoded in the field bank_account_ids of the
         wizard.
 
         :param company_id: the id of the company for which the wizard is running.
@@ -760,8 +760,8 @@ class WizardMultiChartsAccounts(models.TransientModel):
         self.ensure_one()
         # Build a list with all the data to process
         journal_data = []
-        if self.bank_accounts_id:
-            for acc in self.bank_accounts_id:
+        if self.bank_account_ids:
+            for acc in self.bank_account_ids:
                 vals = {
                     'acc_name': acc.acc_name,
                     'account_type': acc.account_type,

addons/account/company.py

@@ -14,7 +14,7 @@ class ResCompany(models.Model):
     period_lock_date = fields.Date(help="Only users with the 'Adviser' role can edit accounts prior to and inclusive of this date")
     fiscalyear_lock_date = fields.Date(string="Fiscal Year lock date", help="No users, including Advisers, can edit accounts prior to and inclusive of this date")
     transfer_account_id = fields.Many2one('account.account',
-        domain=lambda self: [('reconcile', '=', True), ('user_type.id', '=', self.env.ref('account.data_account_type_current_assets').id), ('deprecated', '=', False)], string="Transfer Account", help="Intermediary account used when moving money from a liquidity account to another")
+        domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id), ('deprecated', '=', False)], string="Transfer Account", help="Intermediary account used when moving money from a liquidity account to another")
     expects_chart_of_accounts = fields.Boolean(string='Expects a Chart of Accounts', default=True)
     chart_template_id = fields.Many2one('account.chart.template', help='The chart template for the company (if any)')
     bank_account_code_char = fields.Char(string='Code of the main bank account')
@@ -31,8 +31,8 @@ class ResCompany(models.Model):
     expense_currency_exchange_account_id = fields.Many2one('account.account', related='currency_exchange_journal_id.default_debit_account_id',
         string="Loss Exchange Rate Account", domain="[('internal_type', '=', 'other'), ('deprecated', '=', False), ('company_id', '=', id)]")
     anglo_saxon_accounting = fields.Boolean(string="Use anglo-saxon accounting")
-    property_stock_account_input_categ = fields.Many2one('account.account')
-    property_stock_account_output_categ = fields.Many2one('account.account')
+    property_stock_account_input_categ_id = fields.Many2one('account.account', oldname="property_stock_account_input_categ")
+    property_stock_account_output_categ_id = fields.Many2one('account.account', oldname="property_stock_account_output_categ")
     property_stock_valuation_account_id = fields.Many2one('account.account')
 
     @api.multi

addons/account/demo/account_demo.xml

@@ -56,22 +56,22 @@
 
         <!-- Add payment term on some demo partners -->
         <record id="base.res_partner_2" model="res.partner">
-            <field name="property_payment_term" ref="account.account_payment_term_net"/>
+            <field name="property_payment_term_id" ref="account.account_payment_term_net"/>
         </record>
         <record id="base.res_partner_12" model="res.partner">
-            <field name="property_payment_term" ref="account_payment_term"/>
-            <field name="property_supplier_payment_term" ref="account_payment_term"/>
+            <field name="property_payment_term_id" ref="account_payment_term"/>
+            <field name="property_supplier_payment_term_id" ref="account_payment_term"/>
         </record>
         <record id="base.res_partner_4" model="res.partner">
-            <field name="property_supplier_payment_term" ref="account.account_payment_term_net"/>
+            <field name="property_supplier_payment_term_id" ref="account.account_payment_term_net"/>
         </record>
         <record id="base.res_partner_1" model="res.partner">
-            <field name="property_supplier_payment_term" ref="account_payment_term"/>
+            <field name="property_supplier_payment_term_id" ref="account_payment_term"/>
         </record>
 <!-- 
         <record id="account.credit_account" model="account.account">
             <field name="name">Bank Account</field>
-            <field name="user_type" ref="account.data_account_type_liquidity"/>
+            <field name="user_type_id" ref="account.data_account_type_liquidity"/>
             <field name="code">Testbank</field>
         </record>
 

addons/account/demo/account_invoice_demo.yml

@@ -122,7 +122,7 @@
       }
       account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_ceo_wages_account')])])
       if not account_id:
-          account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses'))])
+          account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses'))])
       if account_id:
           line_vals['account_id'] = account_id[0]
           self._update(cr, uid, 'account.invoice.line', 'account', line_vals, 'ceo_wages_line')
@@ -143,7 +143,7 @@
       }
       account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_coffee_machine_account')])])
       if not account_id:
-          account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses'))])
+          account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses'))])
       if account_id:
           line_vals['account_id'] = account_id[0]
           tax_id = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'purchase'), ('amount', '>', 0)])
@@ -154,7 +154,7 @@
           self.pool.get('account.invoice').signal_workflow(cr, uid, [ref('demo_invoice_equipment_purchase')], 'invoice_open')
 -
   !python {model: account.bank.statement.line} : |
-      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_revenue')), ('tag_ids', 'in', [ref('account.account_tag_financing')])])
+      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_revenue')), ('tag_ids', 'in', [ref('account.account_tag_financing')])])
       line = self.browse(cr, uid, ref('account.demo_bank_statement_line_5'))
       if not line.journal_entry_ids and account_ids:
           line.write({'account_id': account_ids[0]})
@@ -175,8 +175,8 @@
       bank_journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'bank')])[0]
       if bank_journal_id:
           bank_account_id = self.pool.get('account.journal').browse(cr, uid, bank_journal_id).default_debit_account_id.id
-      fixed_asset_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type', 'in', (ref('account.data_account_type_fixed_assets'),ref('account.data_account_type_current_assets')))])
-      equity_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_equity')), ('tag_ids', 'in', [ref('account.demo_capital_account')])])
+      fixed_asset_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', 'in', (ref('account.data_account_type_fixed_assets'),ref('account.data_account_type_current_assets')))])
+      equity_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_equity')), ('tag_ids', 'in', [ref('account.demo_capital_account')])])
       if bank_account_id and fixed_asset_account_ids and equity_account_ids:
           self._update(cr, uid, 'account.move.line', 'account', {
               'move_id': ref('account.demo_opening_move'),

addons/account/demo/account_statement_operations.yml

@@ -1,6 +1,6 @@
 -
   !python {model: ir.model.data} : |
-      account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses')), ('tag_ids', '=', ref('account_tag_operating'))])
+      account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses')), ('tag_ids', '=', ref('account_tag_operating'))])
       vals = {
           'name': "Discount For Early Payment",
           'label': 'Discount',
@@ -12,7 +12,7 @@
           self._update(cr, uid, 'account.operation.template', 'account', vals, 'statement_operation_template_1')
 -
   !python {model: ir.model.data} : |
-      account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses')), ('tag_ids', '=', ref('account_tag_operating'))])
+      account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses')), ('tag_ids', '=', ref('account_tag_operating'))])
       vals = {
           'name': "Bank Fees",
           'label': 'Bank Fees',
@@ -24,7 +24,7 @@
           self._update(cr, uid, 'account.operation.template', 'account', vals, 'statement_operation_template_2')
 -
   !python {model: ir.model.data} : |
-      account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_revenue')), ('tag_ids', '=', ref('account_tag_operating'))])
+      account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_revenue')), ('tag_ids', '=', ref('account_tag_operating'))])
       vals = {
           'name': "Profit / Loss",
           'label': 'Profit / Loss',

addons/account/partner.py

@@ -106,8 +106,8 @@ class AccountFiscalPosition(models.Model):
         partner = PartnerObj.browse(partner_id)
 
         # partner manually set fiscal position always win
-        if partner.property_account_position:
-            return partner.property_account_position.id
+        if partner.property_account_position_id:
+            return partner.property_account_position_id.id
 
         # if no delivery use invocing
         if delivery_id:
@@ -184,7 +184,7 @@ class ResPartner(models.Model):
         self._cr.execute("""SELECT l.partner_id, act.type, SUM(l.debit-l.credit)
                       FROM account_move_line l
                       LEFT JOIN account_account a ON (l.account_id=a.id)
-                      LEFT JOIN account_account_type act ON (a.user_type=act.id)
+                      LEFT JOIN account_account_type act ON (a.user_type_id=act.id)
                       WHERE act.type IN ('receivable','payable')
                       AND l.partner_id IN %s
                       AND l.reconciled IS FALSE
@@ -335,27 +335,27 @@ class ResPartner(models.Model):
     contracts_count = fields.Integer(compute='_journal_item_count', string="Contracts", type='integer')
     journal_item_count = fields.Integer(compute='_journal_item_count', string="Journal Items", type="integer")
     issued_total = fields.Char(compute='_compute_issued_total', string="Journal Items")
-    property_account_payable = fields.Many2one('account.account', company_dependent=True,
-        string="Account Payable",
+    property_account_payable_id = fields.Many2one('account.account', company_dependent=True,
+        string="Account Payable", oldname="property_account_payable",
         domain="[('internal_type', '=', 'payable'), ('deprecated', '=', False)]",
         help="This account will be used instead of the default one as the payable account for the current partner",
         required=True)
-    property_account_receivable = fields.Many2one('account.account', company_dependent=True,
-        string="Account Receivable",
+    property_account_receivable_id = fields.Many2one('account.account', company_dependent=True,
+        string="Account Receivable", oldname="property_account_receivable",
         domain="[('internal_type', '=', 'receivable'), ('deprecated', '=', False)]",
         help="This account will be used instead of the default one as the receivable account for the current partner",
         required=True)
-    property_account_position = fields.Many2one('account.fiscal.position', company_dependent=True,
+    property_account_position_id = fields.Many2one('account.fiscal.position', company_dependent=True,
         string="Fiscal Position",
-        help="The fiscal position will determine taxes and accounts used for the partner.")
-    property_payment_term = fields.Many2one('account.payment.term', company_dependent=True,
+        help="The fiscal position will determine taxes and accounts used for the partner.", oldname="property_account_position")
+    property_payment_term_id = fields.Many2one('account.payment.term', company_dependent=True,
         string ='Customer Payment Term',
-        help="This payment term will be used instead of the default one for sale orders and customer invoices")
-    property_supplier_payment_term = fields.Many2one('account.payment.term', company_dependent=True,
+        help="This payment term will be used instead of the default one for sale orders and customer invoices", oldname="property_payment_term")
+    property_supplier_payment_term_id = fields.Many2one('account.payment.term', company_dependent=True,
          string ='Supplier Payment Term',
-         help="This payment term will be used instead of the default one for purchase orders and supplier bills")
-    ref_companies = fields.One2many('res.company', 'partner_id',
-        string='Companies that refers to partner')
+         help="This payment term will be used instead of the default one for purchase orders and supplier bills", oldname="property_supplier_payment_term")
+    ref_company_ids = fields.One2many('res.company', 'partner_id',
+        string='Companies that refers to partner', oldname="ref_companies")
     has_unreconciled_entries = fields.Boolean(compute='_compute_has_unreconciled_entries',
         help="The partner has at least one unreconciled debit and credit since last time the invoices & payments matching was performed.")
     last_time_entries_checked = fields.Datetime(oldname='last_reconciliation_date',
@@ -373,5 +373,5 @@ class ResPartner(models.Model):
     @api.model
     def _commercial_fields(self):
         return super(ResPartner, self)._commercial_fields() + \
-            ['debit_limit', 'property_account_payable', 'property_account_receivable', 'property_account_position',
-             'property_payment_term', 'property_supplier_payment_term', 'last_time_entries_checked']
+            ['debit_limit', 'property_account_payable_id', 'property_account_receivable_id', 'property_account_position_id',
+             'property_payment_term_id', 'property_supplier_payment_term_id', 'last_time_entries_checked']

addons/account/product.py

@@ -7,12 +7,12 @@ from openerp.exceptions import UserError
 class ProductCategory(models.Model):
     _inherit = "product.category"
 
-    property_account_income_categ = fields.Many2one('account.account', company_dependent=True,
-        string="Income Account",
+    property_account_income_categ_id = fields.Many2one('account.account', company_dependent=True,
+        string="Income Account", oldname="property_account_income_categ",
         domain=[('deprecated', '=', False)],
         help="This account will be used for invoices to value sales.")
-    property_account_expense_categ = fields.Many2one('account.account', company_dependent=True,
-        string="Expense Account",
+    property_account_expense_categ_id = fields.Many2one('account.account', company_dependent=True,
+        string="Expense Account", oldname="property_account_expense_categ",
         domain=[('deprecated', '=', False)],
         help="This account will be used for invoices to value expenses.")
 
@@ -26,12 +26,12 @@ class ProductTemplate(models.Model):
         domain=[('type_tax_use', '=', 'sale')])
     supplier_taxes_id = fields.Many2many('account.tax', 'product_supplier_taxes_rel', 'prod_id', 'tax_id', string='Supplier Taxes',
         domain=[('type_tax_use', '=', 'purchase')])
-    property_account_income = fields.Many2one('account.account', company_dependent=True,
-        string="Income Account",
+    property_account_income_id = fields.Many2one('account.account', company_dependent=True,
+        string="Income Account", oldname="property_account_income",
         domain=[('deprecated', '=', False)],
         help="This account will be used for invoices instead of the default one to value sales for the current product.")
-    property_account_expense = fields.Many2one('account.account', company_dependent=True,
-        string="Expense Account",
+    property_account_expense_id = fields.Many2one('account.account', company_dependent=True,
+        string="Expense Account", oldname="property_account_expense",
         domain=[('deprecated', '=', False)],
         help="This account will be used for invoices instead of the default one to value expenses for the current product.")
 
@@ -54,8 +54,8 @@ class ProductTemplate(models.Model):
     @api.multi
     def _get_product_accounts(self):
         return {
-            'income': self.property_account_income or self.categ_id.property_account_income_categ,
-            'expense': self.property_account_expense or self.categ_id.property_account_expense_categ
+            'income': self.property_account_income_id or self.categ_id.property_account_income_categ_id,
+            'expense': self.property_account_expense_id or self.categ_id.property_account_expense_categ_id
         }
 
     @api.multi

addons/account/report/account_financial_report.py

@@ -60,7 +60,7 @@ class account_financial_report(osv.osv):
             elif report.type == 'account_type':
                 # it's the sum 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)
+                account_ids = account_obj.search(cr, uid, [('user_type_id','in', report_types), ('type','!=','view')], context=context)
                 for a in account_obj.browse(cr, uid, account_ids, context=context):
                     for field in field_names:
                         res[report.id][field] += getattr(a, field)

addons/account/res_config.py

@@ -48,15 +48,15 @@ class AccountConfigSettings(models.TransientModel):
              summed and eventually this total tax amount will be rounded. If you sell with tax included,
              you should choose 'Round per line' because you certainly want the sum of your tax-included line
              subtotals to be equal to the total amount with taxes.""")
-    sale_tax = fields.Many2one('account.tax.template', string='Default sale tax')
-    purchase_tax = fields.Many2one('account.tax.template', string='Default purchase tax')
+    sale_tax_id = fields.Many2one('account.tax.template', string='Default sale tax', oldname="sale_tax")
+    purchase_tax_id = fields.Many2one('account.tax.template', string='Default purchase tax', oldname="purchase_tax")
     sale_tax_rate = fields.Float(string='Sales tax (%)')
     purchase_tax_rate = fields.Float(string='Purchase tax (%)')
     bank_account_code_char = fields.Char(string='Bank Accounts Code', related='company_id.bank_account_code_char', help='Define the code for the bank account')
     template_transfer_account_id = fields.Many2one('account.account.template', help="Intermediary account used when moving money from a liquidity account to another")
     transfer_account_id = fields.Many2one('account.account',
         related='company_id.transfer_account_id',
-        domain=lambda self: [('reconcile', '=', True), ('user_type.id', '=', self.env.ref('account.data_account_type_current_assets').id)],
+        domain=lambda self: [('reconcile', '=', True), ('user_type_id.id', '=', self.env.ref('account.data_account_type_current_assets').id)],
         help="Intermediary account used when moving money from a liquidity account to another")
     complete_tax_set = fields.Boolean(string='Complete set of taxes',
         help='''This boolean helps you to choose if you want to propose to the user to encode
@@ -101,8 +101,8 @@ class AccountConfigSettings(models.TransientModel):
     group_proforma_invoices = fields.Boolean(string='Allow pro-forma invoices',
         implied_group='account.group_proforma_invoices',
         help="Allows you to put invoices in pro-forma state.")
-    default_sale_tax = fields.Many2one('account.tax', help="This sale tax will be assigned by default on new products.")
-    default_purchase_tax = fields.Many2one('account.tax', help="This purchase tax will be assigned by default on new products.")
+    default_sale_tax_id = fields.Many2one('account.tax', help="This sale tax will be assigned by default on new products.", oldname="default_sale_tax")
+    default_purchase_tax_id = fields.Many2one('account.tax', help="This purchase tax will be assigned by default on new products.", oldname="default_purchase_tax")
     group_multi_currency = fields.Boolean(string='Allow multi currencies',
         implied_group='base.group_multi_currency',
         help="Allows you multi currency environment")
@@ -142,17 +142,17 @@ class AccountConfigSettings(models.TransientModel):
             ir_values = self.env['ir.values']
             taxes_id = ir_values.get_default('product.template', 'taxes_id', company_id = self.company_id.id)
             supplier_taxes_id = ir_values.get_default('product.template', 'supplier_taxes_id', company_id = self.company_id.id)
-            self.default_sale_tax = isinstance(taxes_id, list) and taxes_id[0] or taxes_id
-            self.default_purchase_tax = isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id
+            self.default_sale_tax_id = isinstance(taxes_id, list) and taxes_id[0] or taxes_id
+            self.default_purchase_tax_id = isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id
         return {}
 
     @api.onchange('chart_template_id')
     def onchange_chart_template_id(self):
         tax_templ_obj = self.env['account.tax.template']
-        self.complete_tax_set = self.sale_tax = self.purchase_tax = False
+        self.complete_tax_set = self.sale_tax_id = self.purchase_tax_id = False
         self.sale_tax_rate = self.purchase_tax_rate = 15
         if self.chart_template_id and not self.has_chart_of_accounts:
-            # update complete_tax_set, sale_tax and purchase_tax
+            # update complete_tax_set, sale_tax_id and purchase_tax_id
             self.complete_tax_set = self.chart_template_id.complete_tax_set
             if self.chart_template_id.complete_tax_set:
                 ir_values_obj = self.env['ir.values']
@@ -163,8 +163,8 @@ class AccountConfigSettings(models.TransientModel):
                 purchase_tax = tax_templ_obj.search(
                     [('chart_template_id', '=', self.chart_template_id.id), ('type_tax_use', '=', 'purchase')], limit=1,
                     order="sequence, id desc")
-                self.sale_tax = sale_tax
-                self.purchase_tax = purchase_tax
+                self.sale_tax_id = sale_tax
+                self.purchase_tax_id = purchase_tax
             if self.chart_template_id.code_digits:
                 self.code_digits = self.chart_template_id.code_digits
             if self.chart_template_id.transfer_account_id:
@@ -205,10 +205,10 @@ class AccountConfigSettings(models.TransientModel):
     def set_product_taxes(self):
         """ Set the product taxes if they have changed """
         ir_values_obj = self.env['ir.values']
-        if self.default_sale_tax:
-            ir_values_obj.sudo().set_default('product.template', "taxes_id", [self.default_sale_tax.id], for_all_users=True, company_id=self.company_id.id)
-        if self.default_purchase_tax:
-            ir_values_obj.sudo().set_default('product.template', "supplier_taxes_id", [self.default_purchase_tax.id], for_all_users=True, company_id=self.company_id.id)
+        if self.default_sale_tax_id:
+            ir_values_obj.sudo().set_default('product.template', "taxes_id", [self.default_sale_tax_id.id], for_all_users=True, company_id=self.company_id.id)
+        if self.default_purchase_tax_id:
+            ir_values_obj.sudo().set_default('product.template', "supplier_taxes_id", [self.default_purchase_tax_id.id], for_all_users=True, company_id=self.company_id.id)
 
     @api.multi
     def set_chart_of_accounts(self):
@@ -221,8 +221,8 @@ class AccountConfigSettings(models.TransientModel):
                 'chart_template_id': self.chart_template_id.id,
                 'transfer_account_id': self.template_transfer_account_id.id,
                 'code_digits': self.code_digits or 6,
-                'sale_tax': self.sale_tax.id,
-                'purchase_tax': self.purchase_tax.id,
+                'sale_tax_id': self.sale_tax_id.id,
+                'purchase_tax_id': self.purchase_tax_id.id,
                 'sale_tax_rate': self.sale_tax_rate,
                 'purchase_tax_rate': self.purchase_tax_rate,
                 'complete_tax_set': self.complete_tax_set,

addons/account/test/account_bank_statement.yml

@@ -29,7 +29,7 @@
 -
   !python {model: account.bank.statement.line}: |
     import time
-    account_id = self.pool.get('account.account').search(cr, uid, [('user_type.type', '=', 'liquidity'), ('currency_id', '=', False)])[0]
+    account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id.type', '=', 'liquidity'), ('currency_id', '=', False)])[0]
     vals = {
         'amount': 1000,
         'date': time.strftime('%Y-%m-%d'),

addons/account/test/account_invoice_state.yml

@@ -38,7 +38,7 @@
   I check the journal associated and put this journal as not
 -
   !python {model: account.invoice, id: account_invoice_state}: |
-    moves = self.env['account.move.line'].search([('invoice', '=', self.id)])
+    moves = self.env['account.move.line'].search([('invoice_id', '=', self.id)])
     assert (len(moves) > 0), 'You should have multiple moves'
     moves[0].journal_id.write({'update_posted': True})
 -
@@ -57,4 +57,4 @@
   I check that customer invoice is in the cancel state
 -
   !assert {model: account.invoice, id: account_invoice_state}:
-    - state == 'cancel'
+    - state == 'cancel'

addons/account/test/account_minimal_test.xml

@@ -19,100 +19,100 @@
         <record id="xfa" model="account.account">
             <field name="code">X1000</field>
             <field name="name">Fixed Assets - (test)</field>
-            <field name="user_type" ref="account.data_account_type_fixed_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets"/>
         </record>
         <record id="cas" model="account.account">
             <field name="code">X1010</field>
             <field name="name">Current Assets - (test)</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
         </record>
         <record id="stk" model="account.account">
             <field name="code">X1011</field>
             <field name="name">Purchased Stocks - (test)</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.demo_stock_account')])]"/>
         </record>
         <record id="a_recv" model="account.account">
             <field name="code">X1012</field>
             <field name="name">Debtors - (test)</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.data_account_type_receivable"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
         </record>
         <record id="ova" model="account.account">
             <field name="code">X1013</field>
             <field name="name">VAT Paid- (test)</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
         </record>
         <record id="bnk" model="account.account">
             <field name="code">X1014</field>
             <field name="name">Bank Current Account - (test)</field>
-            <field name="user_type" ref="account.data_account_type_liquidity"/>
+            <field name="user_type_id" ref="account.data_account_type_liquidity"/>
         </record>
         <record id="cash" model="account.account">
             <field name="code">X1015</field>
             <field name="name">Cash - (test)</field>
-            <field name="user_type" ref="account.data_account_type_liquidity"/>
+            <field name="user_type_id" ref="account.data_account_type_liquidity"/>
         </record>
         <record id="o_income" model="account.account">
             <field name="code">X1016</field>
             <field name="name">Opening Income - (test)</field>
-            <field name="user_type" ref="account.data_account_type_other_income"/>
+            <field name="user_type_id" ref="account.data_account_type_other_income"/>
         </record>
         <record id="usd_bnk" model="account.account">
             <field name="code">X1017</field>
             <field name="name">USD Bank Account - (test)</field>
-            <field name="user_type" ref="account.data_account_type_liquidity"/>
+            <field name="user_type_id" ref="account.data_account_type_liquidity"/>
             <field name="currency_id" ref="base.USD"/>
         </record>
         <record id="transfer_account" model="account.account">
             <field name="code">X1019</field>
             <field name="name">Internal Transfert Account - (test)</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="reconcile">1</field>
         </record>
         <record id="ncas" model="account.account">
             <field name="code">X1020</field>
             <field name="name">Non-current Assets - (test)</field>
-            <field name="user_type" ref="account.data_account_type_non_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets"/>
         </record>
         <record id="prepayements" model="account.account">
             <field name="code">X1030</field>
             <field name="name">Prepayments - (test)</field>
-            <field name="user_type" ref="account.data_account_type_prepayments"/>
+            <field name="user_type_id" ref="account.data_account_type_prepayments"/>
         </record>
         <record id="current_liabilities" model="account.account">
             <field name="code">X1110</field>
             <field name="name">Current Liabilities - (test)</field>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         </record>
         <record id="a_pay" model="account.account">
             <field name="code">X1111</field>
             <field name="name">Creditors - (test)</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.data_account_type_payable"/>
+            <field name="user_type_id" ref="account.data_account_type_payable"/>
         </record>
 
         <record id="iva" model="account.account">
             <field name="code">X1112</field>
             <field name="name">VAT Received - (test)</field>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         </record>
 
         <record id="rsa" model="account.account">
             <field name="code">X1113</field>
             <field name="name">Reserve and Profit/Loss - (test)</field>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         </record>
 
         <record id="cas" model="account.account">
             <field name="code">X1120</field>
             <field name="name">Non-current Liabilities - (test)</field>
-            <field name="user_type" ref="account.data_account_type_non_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
         </record>
         <record id="o_expense" model="account.account">
             <field name="code">X1114</field>
             <field name="name">Opening Expense - (test)</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
         </record>
 
         <!-- Profit and Loss -->
@@ -120,95 +120,95 @@
         <record model="account.account" id="income_fx_income">
             <field name="name">Foreign Exchange Gain - (test)</field>
             <field name="code">X2010</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="reconcile" eval="False"/>
         </record>
         <record id="a_sale" model="account.account">
             <field name="code">X2020</field>
             <field name="name">Product Sales - (test)</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
         <record id="a_sale_invest" model="account.account">
             <field name="code">X2021</field>
             <field name="name">Sale of Lands - (test)</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_investing')])]"/>
         </record>
         <record id="a_sale_finance" model="account.account">
             <field name="code">X2022</field>
             <field name="name">Bank Accounts Interests - (test)</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
         </record>
         <record id="cog" model="account.account">
             <field name="code">X2030</field>
             <field name="name">Cost of Goods Sold - (test)</field>
-            <field name="user_type" ref="account.data_account_type_direct_costs"/>
+            <field name="user_type_id" ref="account.data_account_type_direct_costs"/>
         </record>
 
         <record model="account.account" id="income_fx_expense">
             <field name="name">Foreign Exchange Loss - (test)</field>
             <field name="code">X2110</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="reconcile" eval="False"/>
         </record>
         <record id="a_expense" model="account.account">
             <field name="code">X2120</field>
             <field name="name">Expenses - (test)</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
         <record id="a_salary_expense" model="account.account">
             <field name="code">X2121</field>
             <field name="name">Salary Expenses - (test)</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
         <record id="a_expense_invest" model="account.account">
             <field name="code">X2122</field>
             <field name="name">Purchase of Equipments - (test)</field>
-            <field name="user_type" ref="account.data_account_type_fixed_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_investing')])]"/>
         </record>
         <record id="a_expense_finance" model="account.account">
             <field name="code">X2123</field>
             <field name="name">Bank Fees - (test)</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
         </record>
         <record id="a_capital" model="account.account">
             <field name="code">X3001</field>
             <field name="name">Capital</field>
-            <field name="user_type" ref="account.data_account_type_equity"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
         </record>
         <record id="a_dividends" model="account.account">
             <field name="code">X3002</field>
             <field name="name">Dividends</field>
-            <field name="user_type" ref="account.data_account_type_equity"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
         </record>
         <record id="a_current_year_earnings" model="account.account">
             <field name="code">X0000</field>
             <field name="name">Unaffected Earnings</field>
-            <field name="user_type" ref="account.data_unaffected_earnings"/>
+            <field name="user_type_id" ref="account.data_unaffected_earnings"/>
         </record>
 
         <!-- Properties -->
-        <record forcecreate="True" id="property_account_receivable" model="ir.property">
-            <field name="name">property_account_receivable</field>
-            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_receivable')]"/>
+        <record forcecreate="True" id="property_account_receivable_id" model="ir.property">
+            <field name="name">property_account_receivable_id</field>
+            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_receivable_id')]"/>
             <field eval="'account.account,'+str(a_recv)" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record forcecreate="True" id="property_account_payable" model="ir.property">
-            <field name="name">property_account_payable</field>
-            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_payable')]"/>
+        <record forcecreate="True" id="property_account_payable_id" model="ir.property">
+            <field name="name">property_account_payable_id</field>
+            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_payable_id')]"/>
             <field eval="'account.account,'+str(a_pay)" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record forcecreate="True" id="property_account_position" model="ir.property">
-            <field name="name">property_account_position</field>
-            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_position')]"/>
+        <record forcecreate="True" id="property_account_position_id" model="ir.property">
+            <field name="name">property_account_position_id</field>
+            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_account_position_id')]"/>
             <field eval="False" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
@@ -286,15 +286,15 @@
         Product income and expense accounts, default parameters
         -->
 
-        <record id="property_account_expense_categ" model="ir.property">
-            <field name="name">property_account_expense_categ</field>
-            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ')]"/>
+        <record id="property_account_expense_categ_id" model="ir.property">
+            <field name="name">property_account_expense_categ_id</field>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ_id')]"/>
             <field eval="'account.account,'+str(ref('a_expense'))" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        <record id="property_account_income_categ" model="ir.property">
-            <field name="name">property_account_income_categ</field>
-            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_income_categ')]"/>
+        <record id="property_account_income_categ_id" model="ir.property">
+            <field name="name">property_account_income_categ_id</field>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_income_categ_id')]"/>
             <field eval="'account.account,'+str(ref('a_sale'))" model="account.account" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>

addons/account/tests/test_account_customer_invoice.py

@@ -24,13 +24,13 @@ class TestAccountCustomerInvoice(AccountTestUsers):
         self.journalrec = self.env['account.journal'].search([('type', '=', 'sale')])[0]
         self.partner3 = self.env.ref('base.res_partner_3')
         account_user_type = self.env.ref('account.data_account_type_receivable')
-        self.ova = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_current_assets').id)])[0]
+        self.ova = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_current_assets').id)], limit=1)
 
         #only adviser can create an account
         self.account_rec1_id = self.account_model.sudo(self.account_manager.id).create(dict(
             code="cust_acc",
             name="customer account",
-            user_type=account_user_type.id,
+            user_type_id=account_user_type.id,
             reconcile=True,
         ))
 
@@ -39,7 +39,7 @@ class TestAccountCustomerInvoice(AccountTestUsers):
                 {
                     'product_id': self.env.ref('product.product_product_5').id,
                     'quantity': 10.0,
-                    'account_id': self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_revenue').id)])[0].id,
+                    'account_id': self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_revenue').id)], limit=1).id,
                     'name': 'product test 5',
                     'price_unit': 100.00,
                 }

addons/account/tests/test_account_supplier_invoice.py

@@ -16,8 +16,8 @@ class TestAccountSupplierInvoice(AccountingTestCase):
         })
 
         # Should be changed by automatic on_change later
-        invoice_account = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_receivable').id)])[0].id
-        invoice_line_account = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_expenses').id)])[0].id
+        invoice_account = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_receivable').id)], limit=1).id
+        invoice_line_account = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_expenses').id)], limit=1).id
 
         invoice = self.env['account.invoice'].create({'partner_id': self.env.ref('base.res_partner_2').id,
             'account_id': invoice_account,

addons/account/tests/test_account_validate_account_move.py

@@ -4,7 +4,7 @@ class TestAccountValidateAccount(AccountingTestCase):
 
     def test_account_validate_account(self):
         account_move_line = self.env['account.move.line']
-        account_cash = self.env['account.account'].search([('user_type.type', '=', 'liquidity')], limit=1)
+        account_cash = self.env['account.account'].search([('user_type_id.type', '=', 'liquidity')], limit=1)
         journal = self.env['account.journal'].search([('type', '=', 'bank')], limit=1)
 
         company_id = self.env['res.users'].browse(self.env.uid).company_id.id

addons/account/tests/test_bank_statement_reconciliation.py

@@ -35,7 +35,7 @@ class TestBankStatementReconciliation(AccountingTestCase):
         self.assertTrue(rec_move)
         counterpart_mv_line = None
         for l in rec_move.line_ids:
-            if l.account_id.user_type.type == 'receivable':
+            if l.account_id.user_type_id.type == 'receivable':
                 counterpart_mv_line = l
                 break
         self.assertIsNotNone(counterpart_mv_line)
@@ -64,7 +64,7 @@ class TestBankStatementReconciliation(AccountingTestCase):
             'price_unit': amount,
             'invoice_id': invoice.id,
             'name': '.',
-            'account_id': self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_revenue').id)])[0].id,
+            'account_id': self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_revenue').id)], limit=1).id,
         })
         invoice.signal_workflow('invoice_open')
 

addons/account/tests/test_payment.py

@@ -22,9 +22,9 @@ class TestPayment(AccountingTestCase):
         self.payment_method_manual_in = self.env.ref("account.account_payment_method_manual_in")
         self.payment_method_manual_out = self.env.ref("account.account_payment_method_manual_out")
 
-        self.account_receivable = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_receivable').id)])[0]
-        self.account_payable = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_payable').id)])[0]
-        self.account_revenue = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_revenue').id)])[0]
+        self.account_receivable = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_receivable').id)], limit=1)
+        self.account_payable = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_payable').id)], limit=1)
+        self.account_revenue = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_revenue').id)], limit=1)
 
         self.bank_euro = self.env['res.partner.bank'].create({'acc_number': '0123456789', 'bank_name': 'Test Bank', 'company_id': self.env.user.company_id.id})
         self.bank_journal_euro = self.bank_euro.journal_id
@@ -126,7 +126,7 @@ class TestPayment(AccountingTestCase):
         register_payments = self.register_payments_model.with_context(ctx).create({
             'payment_date': time.strftime('%Y') + '-07-15',
             'journal_id': self.bank_journal_euro.id,
-            'payment_method': self.payment_method_manual_in.id,
+            'payment_method_id': self.payment_method_manual_in.id,
         })
         register_payments.create_payment()
         payment = self.payment_model.search([], order="id desc", limit=1)
@@ -158,7 +158,7 @@ class TestPayment(AccountingTestCase):
             'currency_id': self.currency_usd_id,
             'journal_id': self.bank_journal_usd.id,
             'destination_journal_id': self.bank_journal_euro.id,
-            'payment_method': self.payment_method_manual_out.id,
+            'payment_method_id': self.payment_method_manual_out.id,
         })
         payment.post()
         self.check_journal_items(payment.move_line_ids, [
@@ -177,11 +177,11 @@ class TestPayment(AccountingTestCase):
             'journal_id': self.bank_journal_usd.id,
             'partner_type': 'supplier',
             'partner_id': self.partner_axelor.id,
-            'payment_method': self.payment_method_manual_out.id,
+            'payment_method_id': self.payment_method_manual_out.id,
         })
         payment.post()
 
         self.check_journal_items(payment.move_line_ids, [
             {'account_id': self.account_usd.id, 'debit': 0.0, 'credit': 38.21, 'amount_currency': -58.42, 'currency_id': self.currency_usd_id},
-            {'account_id': self.partner_axelor.property_account_payable.id, 'debit': 38.21, 'credit': 0.0, 'amount_currency': 50, 'currency_id': self.currency_chf_id},
+            {'account_id': self.partner_axelor.property_account_payable_id.id, 'debit': 38.21, 'credit': 0.0, 'amount_currency': 50, 'currency_id': self.currency_chf_id},
         ])

addons/account/tests/test_reconciliation.py

@@ -21,8 +21,8 @@ class TestReconciliation(AccountingTestCase):
         self.currency_usd_id = self.env.ref("base.USD").id
         self.currency_euro_id = self.env.ref("base.EUR").id
         self.env.ref('base.main_company').write({'currency_id': self.currency_euro_id})
-        self.account_rcv = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_receivable').id)])[0]
-        self.account_rsa = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_payable').id)])[0]
+        self.account_rcv = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_receivable').id)], limit=1)
+        self.account_rsa = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_payable').id)], limit=1)
         self.product = self.env.ref("product.product_product_4")
 
         self.bank_euro = self.env['res.partner.bank'].create({'acc_number': 'Reconciliation test', 'bank_name': 'Test Bank', 'company_id': self.env.user.company_id.id})
@@ -53,7 +53,7 @@ class TestReconciliation(AccountingTestCase):
             'price_unit': 100,
             'invoice_id': invoice.id,
             'name': 'product that cost 100',
-            'account_id': self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_revenue').id)])[0].id,
+            'account_id': self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_revenue').id)], limit=1).id,
         })
 
         #validate invoice

addons/account/tests/test_search.py

@@ -14,21 +14,21 @@ class TestSearch(AccountTestUsers):
         self.atax = self.account_model.create(dict(
             name="Tax Received",
             code="X121",
-            user_type=ac_ids.id,
+            user_type_id=ac_ids.id,
             reconcile=True,
         )).id, "X121 Tax Received"
 
         self.apurchase = self.account_model.create(dict(
             name="Purchased Stocks",
             code="X1101",
-            user_type=ac_ids.id,
+            user_type_id=ac_ids.id,
             reconcile=True,
         )).id, "X1101 Purchased Stocks"
 
         self.asale = self.account_model.create(dict(
             name="Product Sales",
             code="XX200",
-            user_type=ac_ids.id,
+            user_type_id=ac_ids.id,
             reconcile=True,
         )).id, "XX200 Product Sales"
 
@@ -56,16 +56,15 @@ class TestSearch(AccountTestUsers):
         self.assertEqual(set([self.asale[0]]), set([a[0] for a in asale_ids]), "name_search 'ilike XX200' should have returned Product Sales account only")
 
     def test_property_unset_search(self):
-        cr, uid = self.cr, self.uid
-        res_partner_model = self.registry('res.partner')
-        account_payment_term_model = self.registry('account.payment.term')
+        res_partner_model = self.env['res.partner']
+        account_payment_term_model = self.env['account.payment.term']
 
-        a_partner = res_partner_model.create(cr, uid, {'name': 'test partner'})
-        a_payment_term = account_payment_term_model.create(cr, uid, {'name': 'test payment term'})
+        a_partner = res_partner_model.create({'name': 'test partner'})
+        a_payment_term = account_payment_term_model.create({'name': 'test payment term'})
 
-        partner_ids = res_partner_model.search(cr, uid, [('property_payment_term', '=', False), ('id', '=', a_partner)])
-        self.assertTrue(partner_ids, "unset property field 'propety_payment_term' should have been found")
+        partners = res_partner_model.search([('property_payment_term_id', '=', False), ('id', '=', a_partner.id)])
+        self.assertTrue(partners, "unset property field 'propety_payment_term' should have been found")
 
-        res_partner_model.write(cr, uid, [a_partner], {'property_payment_term': a_payment_term})
-        partner_ids = res_partner_model.search(cr, uid, [('property_payment_term', '=', False), ('id', '=', a_partner)])
-        self.assertFalse(partner_ids, "set property field 'propety_payment_term' should not have been found")
+        a_partner.write({'property_payment_term_id': a_payment_term})
+        partners = res_partner_model.search([('property_payment_term_id', '=', False), ('id', '=', a_partner.id)])
+        self.assertFalse(partners, "set property field 'propety_payment_term' should not have been found")

addons/account/tests/test_tax.py

@@ -45,7 +45,7 @@ class TestTax(AccountTestUsers):
         })
         self.bank_journal = self.env['account.journal'].search([('type', '=', 'bank'), ('company_id', '=', self.account_manager.company_id.id)])[0]
         self.bank_account = self.bank_journal.default_debit_account_id
-        self.expense_account = self.env['account.account'].search([('user_type.type', '=', 'payable')])[0] #Should be done by onchange later
+        self.expense_account = self.env['account.account'].search([('user_type_id.type', '=', 'payable')], limit=1) #Should be done by onchange later
 
     def test_tax_group(self):
         res = self.group_tax.compute_all(200.0)

addons/account/views/account_invoice_view.xml

@@ -455,7 +455,7 @@
                                     <field name="journal_id" groups="account.group_account_user"
                                     options="{'no_create': True}" attrs="{'readonly':[('move_name','!=',False)]}"/>
                                     <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-                                    <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id" invisible="1"/>
+                                    <field domain="[('partner_id.ref_company_ids', 'in', [company_id])]" name="partner_bank_id" invisible="1"/>
                                     <field name="date_due"/>
                                 </group>
                                 <group>

addons/account/views/account_payment_view.xml

@@ -10,7 +10,7 @@
                     <field name="payment_date"/>
                     <field name="name"/>
                     <field name="journal_id"/>
-                    <field name="payment_method"/>
+                    <field name="payment_method_id"/>
                     <field name="partner_id" string="Customer"/>
                     <field name="amount"/>
                     <field name="state"/>
@@ -29,7 +29,7 @@
                     <field name="payment_date"/>
                     <field name="name"/>
                     <field name="journal_id"/>
-                    <field name="payment_method"/>
+                    <field name="payment_method_id"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="amount"/>
                     <field name="company_id" groups="base.group_multi_company"/>
@@ -61,7 +61,7 @@
                     <separator/>
                     <filter string="Partner" domain="[]" context="{'group_by': 'partner_id'}"/>
                     <filter string="Journal" domain="[]" context="{'group_by': 'journal_id'}"/>
-                    <filter string="Payment Method" domain="[]" context="{'group_by': 'payment_method'}"/>
+                    <filter string="Payment Method" domain="[]" context="{'group_by': 'payment_method_id'}"/>
                     <filter string="State" domain="[]" context="{'group_by': 'state'}"/>
                     <filter string="Currency" domain="[]" context="{'group_by': 'currency_id'}" groups="base.group_multi_currency"/>
                     <filter string="Company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
@@ -102,7 +102,7 @@
                                 <field name="journal_id" widget="selection" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                                 <field name="destination_journal_id" widget="selection" attrs="{'required': [('payment_type', '=', 'transfer')], 'invisible': [('payment_type', '!=', 'transfer')], 'readonly': [('state', '!=', 'draft')]}"/>
                                 <field name="hide_payment_method" invisible="1"/>
-                                <field name="payment_method" string=" " widget="radio" attrs="{'invisible': [('hide_payment_method', '=', True)], 'readonly': [('state', '!=', 'draft')]}"/>
+                                <field name="payment_method_id" string=" " widget="radio" attrs="{'invisible': [('hide_payment_method', '=', True)], 'readonly': [('state', '!=', 'draft')]}"/>
                                 <field name="payment_method_code" invisible="1"/>
                                 <label for="amount"/>
                                 <div name="amount_div" class="o_row">
@@ -186,7 +186,7 @@
                             <group>
                                 <field name="journal_id" widget="selection"/>
                                 <field name="hide_payment_method" invisible="1"/>
-                                <field name="payment_method" widget="radio" attrs="{'invisible': [('hide_payment_method', '=', True)]}"/>
+                                <field name="payment_method_id" widget="radio" attrs="{'invisible': [('hide_payment_method', '=', True)]}"/>
                                 <field name="payment_method_code" invisible="1"/>
                                 <label for="amount"/>
                                 <div name="amount_div">
@@ -204,7 +204,7 @@
                                 <field name="payment_difference"/>
                                 <field name="payment_difference_handling" widget="radio" nolabel="1"/>
                                 </div>
-                                <field name="writeoff_account" attrs="{'required': [('payment_difference_handling', '=', 'reconcile')], 'invisible': [('payment_difference_handling', '!=', 'reconcile')]}"/>
+                                <field name="writeoff_account_id" attrs="{'required': [('payment_difference_handling', '=', 'reconcile')], 'invisible': [('payment_difference_handling', '!=', 'reconcile')]}"/>
                             </group>
                         </group>
                     </sheet>
@@ -242,7 +242,7 @@
                         <group>
                             <field name="journal_id" widget="selection"/>
                             <field name="hide_payment_method" invisible="1"/>
-                            <field name="payment_method" widget="radio" attrs="{'invisible': [('hide_payment_method', '=', True)]}"/>
+                            <field name="payment_method_id" widget="radio" attrs="{'invisible': [('hide_payment_method', '=', True)]}"/>
                             <field name="payment_method_code" invisible="1"/>
                             <field name="amount"/>
                             <field name="currency_id" invisible="1"/>

addons/account/views/account_view.xml

@@ -17,7 +17,7 @@
                                 <group>
                                     <field name="code" string="Account code"/> -
                                     <field name="name" string="Account name"/>
-                                    <field name="user_type" widget="selection"/>
+                                    <field name="user_type_id" widget="selection"/>
                                     <field name="tax_ids" widget="many2many_tags"/>
                                     <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
                                     <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/>
@@ -104,7 +104,7 @@
                 <tree string="Chart of accounts" toolbar="1" >
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="user_type"/>
+                    <field name="user_type_id"/>
                     <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/>
                     <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
                 </tree>
@@ -118,9 +118,9 @@
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','=like',str(self)+'%')]" string="Account"/>
                     <filter icon="terp-sale" string="Receivable Accounts" domain="[('internal_type','=','receivable')]"/>
                     <filter icon="terp-purchase" string="Payable Accounts" domain="[('internal_type','=','payable')]"/>
-                    <field name="user_type"/>
+                    <field name="user_type_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
+                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type_id'}"/>
                     </group>
                 </search>
             </field>
@@ -171,7 +171,7 @@
         <act_window
             id="action_move_line_select_by_type"
             name="Journal Items"
-            context="{'search_default_user_type': [active_id]}"
+            context="{'search_default_user_type_id': [active_id]}"
             res_model="account.move.line"
             src_model="account.account.type"/>
 
@@ -268,8 +268,8 @@
                                         <field name="account_control_ids" widget="many2many_tags"/>
                                     </group>
                                     <group>
-                                        <field name="inbound_payment_methods" widget="many2many_checkboxes" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}"/>
-                                        <field name="outbound_payment_methods" widget="many2many_checkboxes" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}"/>
+                                        <field name="inbound_payment_method_ids" widget="many2many_checkboxes" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}"/>
+                                        <field name="outbound_payment_method_ids" widget="many2many_checkboxes" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}"/>
                                         <field name="refund_sequence" attrs="{'invisible': [('type', 'not in', ['sale', 'purchase'])]}"/>
                                         <field name="group_invoice_lines" attrs="{'invisible': [('type', 'not in', ['sale', 'purchase'])]}"/>
                                         <field name="profit_account_id" attrs="{'invisible': [('type', '!=', 'cash')]}"/>
@@ -1002,7 +1002,7 @@
                                 <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
                             </page>
                             <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-                                <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+                                <field name="analytic_line_ids" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
                             </page>
                         </notebook>
                     </sheet>
@@ -1048,7 +1048,7 @@
                             </group>
                         </page>
                         <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-                            <field name="analytic_lines"/>
+                            <field name="analytic_line_ids"/>
                         </page>
                     </notebook>
                 </form>
@@ -1411,7 +1411,7 @@
                         <field name="name"/>
                         <field name="code"/>
                         <newline/>
-                        <field name="user_type" widget="selection"/>
+                        <field name="user_type_id" widget="selection"/>
                         <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/>
                         <field name="tag_ids" domain="[('applicability', '!=', 'taxes')]" widget="many2many_tags" context="{'default_applicability': 'accounts'}"/>
                         <field name="reconcile"/>
@@ -1431,7 +1431,7 @@
                 <tree string="Account Template">
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="user_type" invisible="1"/>
+                    <field name="user_type_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -1441,9 +1441,9 @@
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
-                    <field name="user_type"/>
+                    <field name="user_type_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
+                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type_id'}"/>
                    </group>
                 </search>
             </field>
@@ -1476,12 +1476,12 @@
                     <field name="tax_template_ids" colspan="4"  nolabel="1"/>
                     <separator string="Properties" colspan="4"/>
                     <group col="4">
-                        <field name="property_account_receivable"/>
-                        <field name="property_account_payable"/>
-                        <field name="property_account_expense_categ"/>
-                        <field name="property_account_income_categ"/>
-                        <field name="property_account_expense"/>
-                        <field name="property_account_income"/>
+                        <field name="property_account_receivable_id"/>
+                        <field name="property_account_payable_id"/>
+                        <field name="property_account_expense_categ_id"/>
+                        <field name="property_account_income_categ_id"/>
+                        <field name="property_account_expense_id"/>
+                        <field name="property_account_income_id"/>
                     </group>
                 </form>
             </field>
@@ -1495,10 +1495,10 @@
                     <field name="bank_account_code_char"/>
                     <group expand="0" string="Group By">
                         <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_code_char'}"/>
-                        <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
-                        <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
-                        <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
-                        <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
+                        <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable_id'}"/>
+                        <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable_id'}"/>
+                        <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ_id'}"/>
+                        <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ_id'}"/>
                     </group>
                 </search>
             </field>
@@ -1511,10 +1511,10 @@
                     <field name="name"/>
                     <field name="company_id"/>
                     <field name="bank_account_code_char"/>
-                    <field name="property_account_receivable" invisible="1"/>
-                    <field name="property_account_payable" invisible="1"/>
-                    <field name="property_account_expense_categ" invisible="1"/>
-                    <field name="property_account_income_categ" invisible="1"/>
+                    <field name="property_account_receivable_id" invisible="1"/>
+                    <field name="property_account_payable_id" invisible="1"/>
+                    <field name="property_account_expense_categ_id" invisible="1"/>
+                    <field name="property_account_income_categ_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -1636,12 +1636,12 @@
                             <field name="company_id" options="{'no_create': True}"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                             <field name="currency_id" class="oe_inline"/>
                             <field name="use_anglo_saxon"/>
-                            <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','=','sale')]"/>
+                            <field name="sale_tax_id" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','=','sale')]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
                             <div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
                                 <field name="sale_tax_rate" class="oe_inline"/> %%
                             </div>
-                            <field name="purchase_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
+                            <field name="purchase_tax_id" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
                             <label for="purchase_tax_rate" string="Purchase Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
                             <div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
                                 <field name="purchase_tax_rate" class="oe_inline"/> %%

addons/account/views/partner_view.xml

@@ -139,21 +139,21 @@
                     <group>
                         <group string="Sale" name="acc_sale">
                             <button name="%(action_account_partner_followup_note)d" class="oe_link" type="action" string="Log a followup note" colspan="2"/>
-                            <field name="property_payment_term" widget="selection"/>
+                            <field name="property_payment_term_id" widget="selection"/>
                             <field name="credit"/>
                             <field name="credit_limit"/>
                         </group>
                         <group string="Purchase" name="acc_purchase">
-                            <field name="property_supplier_payment_term" widget="selection"/>
+                            <field name="property_supplier_payment_term_id" widget="selection"/>
                             <field name="debit"/>
                             <field name="currency_id" invisible="1"/>
                         </group>
                         <group string="Fiscal Information" name="fiscal_information">
-                            <field name="property_account_position" widget="selection"/>
+                            <field name="property_account_position_id" widget="selection"/>
                         </group>
                         <group string="Accounting Entries" name="accounting_entries">
-                            <field name="property_account_receivable" groups="account.group_account_invoice" />
-                            <field name="property_account_payable" groups="account.group_account_invoice"/>
+                            <field name="property_account_receivable_id" groups="account.group_account_invoice" />
+                            <field name="property_account_payable_id" groups="account.group_account_invoice"/>
                         </group>
                     </group>
                     <group string="Bank Accounts" name="bank_accounts">

addons/account/views/product_view.xml

@@ -15,11 +15,11 @@
                         </group>
                         <group name="properties">
                             <group>
-                                <field name="property_account_income" domain="[('internal_type','=','other'),('deprecated','=',False)]" groups="account.group_account_user"/>
+                                <field name="property_account_income_id" domain="[('internal_type','=','other'),('deprecated','=',False)]" groups="account.group_account_user"/>
                                 <field name="taxes_id" colspan="2" widget="many2many_tags"/>
                             </group>
                             <group>
-                                <field name="property_account_expense" domain="[('internal_type','=','other'),('deprecated','=',False)]" groups="account.group_account_user"/>
+                                <field name="property_account_expense_id" domain="[('internal_type','=','other'),('deprecated','=',False)]" groups="account.group_account_user"/>
                                 <field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
                             </group>
                         </group>
@@ -36,8 +36,8 @@
                 <data>
                     <xpath expr="//group[@name='parent']" position="inside">
                         <group name="account_property" string="Account Properties" colspan="2">
-                            <field name="property_account_income_categ" domain="[('internal_type','=','other'),('deprecated', '=', False)]"/>
-                            <field name="property_account_expense_categ" domain="[('internal_type','=','other'),('deprecated', '=', False)]"/>
+                            <field name="property_account_income_categ_id" domain="[('internal_type','=','other'),('deprecated', '=', False)]"/>
+                            <field name="property_account_expense_categ_id" domain="[('internal_type','=','other'),('deprecated', '=', False)]"/>
                         </group>
                     </xpath>
                 </data>

addons/account/views/res_config_view.xml

@@ -56,14 +56,14 @@
                                     class="oe_link" attrs="{'invisible': [('has_chart_of_accounts','!=',False)]}"/>
                             </div>
                             <div attrs="{'invisible': ['|', '|', ('chart_template_id','=',False), ('complete_tax_set','=',False), ('has_chart_of_accounts','!=',False)]}">
-                                <label for="sale_tax"/>
-                                <field name="sale_tax"
+                                <label for="sale_tax_id"/>
+                                <field name="sale_tax_id"
                                     domain="[('chart_template_id', '=', chart_template_id),('type_tax_use','in',('sale','all'))]"
                                     class="oe_inline"/>
                             </div>
                             <div attrs="{'invisible': ['|', '|', ('chart_template_id','=',False), ('complete_tax_set','=',False), ('has_chart_of_accounts','!=',False)]}">
-                                <label for="purchase_tax"/>
-                                <field name="purchase_tax"
+                                <label for="purchase_tax_id"/>
+                                <field name="purchase_tax_id"
                                     domain="[('chart_template_id', '=', chart_template_id),('type_tax_use','in',('purchase', 'all'))]"
                                     class="oe_inline"/>
                             </div>
@@ -147,8 +147,8 @@
                         <label for="id" string="Customer"/>
                         <div>
                             <div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
-                                <label for="default_sale_tax"/>
-                                <field name="default_sale_tax"
+                                <label for="default_sale_tax_id"/>
+                                <field name="default_sale_tax_id"
                                     domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
                                     class="oe_inline"/>
                             </div>
@@ -166,8 +166,8 @@
                         <label for="id" string="Supplier"/>
                         <div name="other_cofing">
                             <div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
-                                <label for="default_purchase_tax"/>
-                                <field name="default_purchase_tax"
+                                <label for="default_purchase_tax_id"/>
+                                <field name="default_purchase_tax_id"
                                     domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
                                     class="oe_inline"/>
                             </div>

addons/account_analytic_analysis/account_analytic_analysis.py

@@ -660,7 +660,7 @@ class account_analytic_account(osv.osv):
         if not journal_ids:
             raise UserError(_('Please define a sale journal for the company "%s".') % (contract.company_id.name or '', ))
 
-        partner_payment_term = partner.property_payment_term and partner.property_payment_term.id or False
+        partner_payment_term = partner.property_payment_term_id and partner.property_payment_term_id.id or False
 
         currency_id = False
         if contract.pricelist_id:
@@ -671,7 +671,7 @@ class account_analytic_account(osv.osv):
             currency_id = contract.company_id.currency_id.id
 
         invoice = {
-           'account_id': partner.property_account_receivable.id,
+           'account_id': partner.property_account_receivable_id.id,
            'type': 'out_invoice',
            'partner_id': partner.id,
            'currency_id': currency_id,
@@ -693,9 +693,9 @@ class account_analytic_account(osv.osv):
         for line in contract.recurring_invoice_line_ids:
 
             res = line.product_id
-            account_id = res.property_account_income.id
+            account_id = res.property_account_income_id.id
             if not account_id:
-                account_id = res.categ_id.property_account_income_categ.id
+                account_id = res.categ_id.property_account_income_categ_id.id
             account_id = fpos_obj.map_account(cr, uid, fiscal_position, account_id)
 
             taxes = res.taxes_id or False

addons/account_analytic_plans/account_analytic_plans.py

@@ -381,7 +381,7 @@ class account_invoice(osv.osv):
                 ctx.update({'date': inv.date_invoice})
                 amount_calc = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, il['price'], context=ctx) * sign
                 qty = il['quantity']
-                il['analytic_lines'] = []
+                il['analytic_line_ids'] = []
                 for line2 in obj_move_line.account_ids:
                     amt = amount_calc * (line2.rate/100)
                     qtty = qty* (line2.rate/100)
@@ -397,7 +397,7 @@ class account_invoice(osv.osv):
                         'journal_id': self._get_journal_analytic(cr, uid, inv.type),
                         'ref': ref,
                     }
-                    il['analytic_lines'].append((0, 0, al_vals))
+                    il['analytic_line_ids'].append((0, 0, al_vals))
         return iml
 
 

addons/account_asset/account_asset_demo.yml

@@ -4,10 +4,10 @@
     !python {model: ir.model.data} : |
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'general'), ('id', '!=', company.currency_exchange_journal_id.id)])
-        expense_account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses'))])
-        xfa_account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_fixed_assets'))])
+        expense_account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses'))])
+        xfa_account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_fixed_assets'))])
         if not xfa_account_id:
-            xfa_account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_current_assets'))])
+            xfa_account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_current_assets'))])
         from datetime import datetime, timedelta
         import time
         if xfa_account_id and expense_account_id and journal_id:
@@ -60,9 +60,9 @@
                 'category_id': ref('account_asset_category_fixedassets0'),
             }
             self._update(cr, uid, 'account.asset.asset', 'account_asset', vals, 'account_asset_asset_office0')
-        sale_account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_revenue')), ('tag_ids', 'in', [ref('account.account_tag_operating')])])
+        sale_account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_revenue')), ('tag_ids', 'in', [ref('account.account_tag_operating')])])
         if not sale_account_id:
-            sale_account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_revenue'))])
+            sale_account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_revenue'))])
         if xfa_account_id and sale_account_id:
             vals = {
                 'journal_id': journal_id[0],

addons/account_budget/account_budget_demo.yml

@@ -1,7 +1,7 @@
 -
   !python {model: ir.model.data} : |
       import time
-      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type.name', '=', 'Revenue'), ('tag_ids.name', 'in', ['Operating Activities'])])
+      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id.name', '=', 'Revenue'), ('tag_ids.name', 'in', ['Operating Activities'])])
       if account_ids:
           vals = {
               'name': 'Sales',
@@ -93,7 +93,7 @@
           }
           self._update(cr, uid, 'crossovered.budget.lines', 'account_budget', vals, 'crossovered_budget_lines_16')
 
-      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type.name', '=', 'Expenses'), ('tag_ids.name', 'in', ['Operating Activities'])])
+      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id.name', '=', 'Expenses'), ('tag_ids.name', 'in', ['Operating Activities'])])
       if account_ids:
           vals = {
               'name': 'Purchases',

addons/account_budget/test/account_budget.yml

@@ -8,7 +8,7 @@
       vals = {
         'name': 'Product Sales - (test)',
         'code': 'X2020',
-        'user_type': ref('account.data_account_type_revenue'),
+        'user_type_id': ref('account.data_account_type_revenue'),
         'tag_ids': [(6,0,[ref('account.account_tag_operating')])],
       }
       self._update(cr, uid, 'account.account', 'account_budget', vals, 'a_sale')
@@ -17,7 +17,7 @@
       vals = {
         'name': 'Expense - (test)',
         'code': 'X2120',
-        'user_type': ref('account.data_account_type_expenses'),
+        'user_type_id': ref('account.data_account_type_expenses'),
         'tag_ids': [(6,0,[ref('account.account_tag_operating')])],
       }
       self._update(cr, uid, 'account.account', 'account_budget', vals, 'a_expense')

addons/account_budget/tests/test_theoreticalamount.py

@@ -22,7 +22,7 @@ class TestTheoreticalAmount(TransactionCase):
         crossovered_budget_line_obj = self.registry('crossovered.budget.lines')
         user_type_id = self.ref('account.data_account_type_revenue')
         tag_id = self.ref('account.account_tag_operating')
-        account_rev_id = self.registry('account.account').create(cr, uid, {'code': 'X2020', 'name': 'Budget - Test Revenue Account', 'user_type': user_type_id, 'tag_ids': [(4, tag_id, 0)]})
+        account_rev_id = self.registry('account.account').create(cr, uid, {'code': 'X2020', 'name': 'Budget - Test Revenue Account', 'user_type_id': user_type_id, 'tag_ids': [(4, tag_id, 0)]})
         buget_post = self.registry('account.budget.post').create(cr, uid, {
             'name': 'Sales',
             'code': 'SAL',

addons/account_check_writing/account_journal.py

@@ -7,9 +7,9 @@ class AccountJournal(models.Model):
     _inherit = "account.journal"
 
     @api.one
-    @api.depends('outbound_payment_methods')
+    @api.depends('outbound_payment_method_ids')
     def _compute_check_writing_payment_method_selected(self):
-        self.check_writing_payment_method_selected = any(pm.code == 'check_writing' for pm in self.outbound_payment_methods)
+        self.check_writing_payment_method_selected = any(pm.code == 'check_writing' for pm in self.outbound_payment_method_ids)
 
     @api.one
     @api.depends('check_manual_sequencing')
@@ -72,6 +72,6 @@ class AccountJournal(models.Model):
         for bank_journal in bank_journals:
             check_sequence = self._create_check_sequence({'name': bank_journal.name, 'company_id': bank_journal.company_id.id})
             bank_journal.write({
-                'outbound_payment_methods': [(4, check_writing.id, None)],
+                'outbound_payment_method_ids': [(4, check_writing.id, None)],
                 'check_sequence_id': check_sequence.id,
             })

addons/account_check_writing/account_journal_dashboard.py

@@ -9,7 +9,7 @@ class account_journal(models.Model):
     def get_journal_dashboard_datas(self):
         domain_checks_to_print = [
             ('journal_id', '=', self.id),
-            ('payment_method.code', '=', 'check_writing'),
+            ('payment_method_id.code', '=', 'check_writing'),
             ('state','=','posted')
         ]
         return dict(
@@ -30,6 +30,6 @@ class account_journal(models.Model):
                 journal_id=self.id,
                 default_journal_id=self.id,
                 default_payment_type='outbound',
-                default_payment_method=self.env.ref('account_check_writing.account_payment_method_check_writing').id,
+                default_payment_method_id=self.env.ref('account_check_writing.account_payment_method_check_writing').id,
             ),
         }

addons/account_check_writing/account_payment.py

@@ -37,7 +37,7 @@ class account_register_payments(models.TransientModel):
 
     def get_payment_vals(self):
         res = super(account_register_payments, self).get_payment_vals()
-        if self.payment_method == self.env.ref('account_check_writing.account_payment_method_check_writing'):
+        if self.payment_method_id == self.env.ref('account_check_writing.account_payment_method_check_writing'):
             res.update({
                 'check_amount_in_words': self.check_amount_in_words,
                 'check_manual_sequencing': self.check_manual_sequencing,
@@ -82,7 +82,7 @@ class account_payment(models.Model):
 
     @api.model
     def create(self, vals):
-        if vals['payment_method'] == self.env.ref('account_check_writing.account_payment_method_check_writing').id\
+        if vals['payment_method_id'] == self.env.ref('account_check_writing.account_payment_method_check_writing').id\
                 and vals.get('check_manual_sequencing'):
             sequence = self.env['account.journal'].browse(vals['journal_id']).check_sequence_id
             vals.update({'check_number': sequence.next_by_id()})
@@ -92,7 +92,7 @@ class account_payment(models.Model):
     def send_checks(self):
         """ Check that the recordset is valid, set the payments state to sent and call print_checks() """
         # Since this method can be called via a client_action_multi, we need to make sure the received records are what we expect
-        self = self.filtered(lambda r: r.payment_method.code == 'check_writing' and r.state != 'reconciled')
+        self = self.filtered(lambda r: r.payment_method_id.code == 'check_writing' and r.state != 'reconciled')
 
         if len(self) == 0:
             raise UserError(_("Payments to print as a checks must have 'Check Writing' selected as payment method and "

addons/account_check_writing/tests/test_check_writing.py

@@ -13,8 +13,8 @@ class TestCheckWriting(AccountingTestCase):
         self.product = self.env.ref("product.product_product_4")
         self.payment_method_check = self.env.ref("account_check_writing.account_payment_method_check_writing")
 
-        self.account_payable = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_payable').id)])[0]
-        self.account_expenses = self.env['account.account'].search([('user_type', '=', self.env.ref('account.data_account_type_expenses').id)])[0]
+        self.account_payable = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_payable').id)], limit=1)
+        self.account_expenses = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_expenses').id)], limit=1)
 
         self.bank = self.env['res.partner.bank'].create({'acc_number': '0123456789', 'bank_name': 'Test Bank', 'company_id': self.env.user.company_id.id})
         self.bank_journal = self.bank.journal_id
@@ -46,7 +46,7 @@ class TestCheckWriting(AccountingTestCase):
         }).create({
             'payment_date': time.strftime('%Y') + '-07-15',
             'journal_id': self.bank_journal.id,
-            'payment_method': self.payment_method_check.id,
+            'payment_method_id': self.payment_method_check.id,
         })
         register_payments.create_payment()
         return self.env['account.payment'].search([], order="id desc", limit=1)

addons/account_voucher/account_voucher.py

@@ -101,9 +101,9 @@ class AccountVoucher(models.Model):
     @api.onchange('partner_id')
     def onchange_partner_id(self):
         if self.journal_id.type == 'sale':
-            account_id = self.partner_id.property_account_receivable.id
+            account_id = self.partner_id.property_account_receivable_id.id
         elif self.journal_id.type == 'purchase':
-            account_id = self.partner_id.property_account_payable.id
+            account_id = self.partner_id.property_account_payable_id.id
         else:
             account_id = self.journal_id.default_credit_account_id.id or self.journal_id.default_debit_account_id.id
         self.account_id = account_id
@@ -143,9 +143,9 @@ class AccountVoucher(models.Model):
             partner = self.partner_id
             journal = self.journal_id
             if journal.type == 'sale':
-                account_id = partner.property_account_receivable.id
+                account_id = partner.property_account_receivable_id.id
             elif journal.type == 'purchase':
-                account_id = partner.property_account_payable.id
+                account_id = partner.property_account_payable_id.id
             else:
                 account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
         self.account_id = account_id
@@ -357,7 +357,7 @@ class account_voucher_line(models.Model):
             self = self.with_context(lang=part.lang)
 
         product = self.env['product.product'].browse(product_id)
-        fpos = part.property_account_position.id
+        fpos = part.property_account_position_id.id
         account = self._get_account(product, fpos, type)
         values = {
             'name': product.partner_ref,

addons/account_voucher/test/account_voucher_chart.yml

@@ -10,14 +10,14 @@
         code: X1012
         name: Debtors - (test)
         reconcile: !eval True
-        user_type: account.data_account_type_receivable
+        user_type_id: account.data_account_type_receivable
 -
     Create sales account
 -
   !record {model: account.account, id: a_sale}:
         code: X1020
         name: Product Sales - (test)
-        user_type: account.data_account_type_revenue
+        user_type_id: account.data_account_type_revenue
 -
     Create sales journal
 -
@@ -35,7 +35,7 @@
   !record {model: account.account, id: a_cash}:
         code: X1015
         name: Cash - (test)
-        user_type: account.data_account_type_liquidity
+        user_type_id: account.data_account_type_liquidity
 -
     Create cash journal
 -

addons/analytic_user_function/analytic_user_function.py

@@ -100,9 +100,9 @@ class account_analytic_line(osv.osv):
         res['product_id'] = product.id
         res['uom_id'] = product.uom_id.id
 
-        expense_account = product.property_account_expense.id
+        expense_account = product.property_account_expense_id.id
         if not expense_account:
-            expense_account = product.categ_id.property_account_expense_categ.id
+            expense_account = product.categ_id.property_account_expense_categ_id.id
             if not expense_account:
                 raise UserError(_('There is no expense account defined for this product: "%s" (id:%d)') % (product.name, product.id,))
         res['general_account_id'] = expense_account

addons/base_vat/base_vat_view.xml

@@ -7,7 +7,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="account.view_partner_property_form"/>
             <field name="arch" type="xml">
-                <field name="property_account_position" position="after">
+                <field name="property_account_position_id" position="after">
                     <label for="vat"/>
                     <div name="vat_info" class="o_row">
                         <field name="vat" on_change="vat_change(vat)" placeholder="e.g. BE0477472701"/>

addons/delivery/stock.py

@@ -76,16 +76,16 @@ class stock_picking(osv.osv):
         price = grid_obj.get_price_from_picking(cr, uid, grid_id,
                 invoice.amount_untaxed, picking.weight, picking.volume,
                 quantity, context=context)
-        account_id = picking.carrier_id.product_id.property_account_income.id
+        account_id = picking.carrier_id.product_id.property_account_income_id.id
         if not account_id:
             account_id = picking.carrier_id.product_id.categ_id\
-                    .property_account_income_categ.id
+                    .property_account_income_categ_id.id
 
         taxes = picking.carrier_id.product_id.taxes_id
         partner = picking.partner_id or False
         if partner:
-            account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
-            taxes_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, taxes)
+            account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position_id, account_id)
+            taxes_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position_id, taxes)
         else:
             taxes_ids = [x.id for x in taxes]
 

addons/hr_expense/hr_expense.py

@@ -126,8 +126,8 @@ class hr_expense_expense(osv.osv):
             employee = emp_obj.browse(cr, uid, employee_id, context=context)
             department_id = employee.department_id.id
             company_id = employee.company_id.id
-            if employee.address_home_id and employee.address_home_id.property_account_payable:
-                employee_payable_account_id = employee.address_home_id.property_account_payable.id
+            if employee.address_home_id and employee.address_home_id.property_account_payable_id:
+                employee_payable_account_id = employee.address_home_id.property_account_payable_id.id
         return {'value': {'department_id': department_id, 'company_id': company_id, 'employee_payable_account_id': employee_payable_account_id}}
 
     def expense_confirm(self, cr, uid, ids, context=None):
@@ -192,7 +192,7 @@ class hr_expense_expense(osv.osv):
             'debit': x['price']>0 and x['price'],
             'credit': x['price']<0 and -x['price'],
             'account_id': x['account_id'],
-            'analytic_lines': x.get('analytic_lines', False),
+            'analytic_line_ids': x.get('analytic_line_ids', False),
             'amount_currency': x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
             'currency_id': x.get('currency_id', False),
             'tax_line_id': x.get('tax_line_id', False),
@@ -298,7 +298,7 @@ class hr_expense_expense(osv.osv):
                 taxes = product.supplier_taxes_id
                 # If taxes are not related to the product, maybe they are in the account
                 if not taxes:
-                    a = product.property_account_expense.id or product.categ_id.property_account_expense_categ.id
+                    a = product.property_account_expense_id.id or product.categ_id.property_account_expense_categ_id.id
                     a = fpos_obj.map_account(cr, uid, fpos, a)
                     taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False
             if not taxes:
@@ -325,15 +325,15 @@ class hr_expense_expense(osv.osv):
         company = line.expense_id.company_id
         property_obj = self.pool.get('ir.property')
         if line.product_id:
-            acc = line.product_id.property_account_expense
+            acc = line.product_id.property_account_expense_id
             if not acc:
-                acc = line.product_id.categ_id.property_account_expense_categ
+                acc = line.product_id.categ_id.property_account_expense_categ_id
             if not acc:
                 raise UserError(_('No purchase account found for the product %s (or for his category), please configure one.') % (line.product_id.name))
         else:
-            acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company.id})
+            acc = property_obj.get(cr, uid, 'property_account_expense_categ_id', 'product.category', context={'force_company': company.id})
             if not acc:
-                raise UserError(_('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
+                raise UserError(_('Please configure Default Expense account for Product purchase: `property_account_expense_categ_id`.'))
         return {
             'type':'src',
             'name': line.name.split('\n')[0][:64],

addons/hr_expense/tests/test_journal_entries.py

@@ -26,12 +26,12 @@ class TestCheckJournalEntry(TransactionCase):
         self.product_obj.write(cr, uid, self.product_id, {'supplier_taxes_id': [(6, 0, [self.tax_id])]})
         # Create payable account for the expense
         user_type_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'account', 'data_account_type_payable')[1]
-        account_payable_id = self.registry('account.account').create(cr, uid, {'code': 'X1111', 'name': 'HR Expense - Test Payable Account', 'user_type': user_type_id, 'reconcile': True})
+        account_payable_id = self.registry('account.account').create(cr, uid, {'code': 'X1111', 'name': 'HR Expense - Test Payable Account', 'user_type_id': user_type_id, 'reconcile': True})
         # Create expenses account for the expense
         user_type_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'account', 'data_account_type_expenses')[1]
-        account_expense_id = self.registry('account.account').create(cr, uid, {'code': 'X2120', 'name': 'HR Expense - Test Purchase Account', 'user_type': user_type_id})
+        account_expense_id = self.registry('account.account').create(cr, uid, {'code': 'X2120', 'name': 'HR Expense - Test Purchase Account', 'user_type_id': user_type_id})
         # Assign it to the air ticket product
-        self.registry('product.product').write(cr, uid, self.product_id, {'property_account_expense': account_expense_id})
+        self.registry('product.product').write(cr, uid, self.product_id, {'property_account_expense_id': account_expense_id})
         # Create Sale Journal
         company_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'main_company')[1]
         self.registry('account.journal').create(cr, uid, {'name': 'Purchase Journal - Test', 'code': 'HRTPJ', 'type': 'purchase', 'company_id': company_id})

addons/hr_timesheet/hr_timesheet.py

@@ -61,8 +61,8 @@ class account_analytic_line(models.Model):
     @api.model
     def _get_general_account(self, user_id=None):
         emp = self.env['hr.employee'].search([('user_id', '=', user_id or self.env.uid)], limit=1)
-        if emp and emp.product_id.categ_id.property_account_expense_categ.id:
-            return emp.product_id.categ_id.property_account_expense_categ.id
+        if emp and emp.product_id.categ_id.property_account_expense_categ_id.id:
+            return emp.product_id.categ_id.property_account_expense_categ_id.id
         else:
             raise exceptions.ValidationError("This user or employee is not associated to a Product with a valid Financial Account")
 
@@ -88,7 +88,7 @@ class account_analytic_line(models.Model):
                     raise exceptions.ValidationError("The employee " + emp.name + " is not associated to a valid Product. Please define one for him or select another user.")
                 elif not emp.product_id.uom_id.id:
                     raise exceptions.ValidationError("The employee " + emp.name + " is not associated to a valid Product Unit of Measure. Please define one for him or select another user.")
-                elif not emp.product_id.categ_id.property_account_expense_categ.id:
+                elif not emp.product_id.categ_id.property_account_expense_categ_id.id:
                     raise exceptions.ValidationError("The employee " + emp.name + " is not associated to a valid Financial Account. Please define one for him or select another user.")
 
     @api.onchange('user_id')

addons/hr_timesheet/hr_timesheet_demo.yml

@@ -3,7 +3,7 @@
 -
     !python {model: ir.model.data} : |
         import time
-        expense_account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses'))])
+        expense_account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses'))])
         if expense_account_id:
             vals = {
                 'name': 'Requirements analysis and specification',

addons/hr_timesheet_invoice/hr_timesheet_invoice.py

@@ -70,8 +70,8 @@ class account_analytic_line(osv.osv):
         record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
         if record_ids:
             employee = proxy.browse(cr, uid, record_ids[0], context=context)
-            if employee.product_id and employee.product_id.property_account_income:
-                return employee.product_id.property_account_income.id
+            if employee.product_id and employee.product_id.property_account_income_id:
+                return employee.product_id.property_account_income_id.id
         return False
 
     _defaults = {
@@ -107,17 +107,17 @@ class account_analytic_line(osv.osv):
             price = 0.0
         return price
 
-    def _prepare_cost_invoice(self, cr, uid, partner, company_id, currency_id, analytic_lines, group_by_partner=False, context=None):
+    def _prepare_cost_invoice(self, cr, uid, partner, company_id, currency_id, analytic_line_ids, group_by_partner=False, context=None):
         """ returns values used to create main invoice from analytic lines"""
         account_payment_term_obj = self.pool['account.payment.term']
         if group_by_partner:
             invoice_name = partner.name
         else:
-            invoice_name = analytic_lines[0].account_id.name
+            invoice_name = analytic_line_ids[0].account_id.name
         date_due = False
-        if partner.property_payment_term:
+        if partner.property_payment_term_id:
             pterm_list = account_payment_term_obj.compute(cr, uid,
-                    partner.property_payment_term.id, value=1,
+                    partner.property_payment_term_id.id, value=1,
                     date_ref=time.strftime('%Y-%m-%d'))
             if pterm_list:
                 pterm_list = [line[0] for line in pterm_list]
@@ -127,21 +127,21 @@ class account_analytic_line(osv.osv):
             'name': "%s - %s" % (time.strftime('%d/%m/%Y'), invoice_name),
             'partner_id': partner.id,
             'company_id': company_id,
-            'payment_term_id': partner.property_payment_term.id or False,
-            'account_id': partner.property_account_receivable.id,
+            'payment_term_id': partner.property_payment_term_id.id or False,
+            'account_id': partner.property_account_receivable_id.id,
             'currency_id': currency_id,
             'date_due': date_due,
-            'fiscal_position_id': partner.property_account_position.id
+            'fiscal_position_id': partner.property_account_position_id.id
         }
 
     def _prepare_cost_invoice_line(self, cr, uid, invoice_id, product_id, uom, user_id,
-                factor_id, account, analytic_lines, journal_type, data, context=None):
+                factor_id, account, analytic_line_ids, journal_type, data, context=None):
         product_obj = self.pool['product.product']
 
         uom_context = dict(context or {}, uom=uom)
 
-        total_price = sum(l.amount for l in analytic_lines)
-        total_qty = sum(l.unit_amount for l in analytic_lines)
+        total_price = sum(l.amount for l in analytic_line_ids)
+        total_qty = sum(l.unit_amount for l in analytic_line_ids)
 
         if data.get('product'):
             # force product, use its public price
@@ -176,11 +176,11 @@ class account_analytic_line(osv.osv):
             if factor.customer_name:
                 factor_name += ' - ' + factor.customer_name
 
-                general_account = product.property_account_income or product.categ_id.property_account_income_categ
+                general_account = product.property_account_income_id or product.categ_id.property_account_income_categ_id
                 if not general_account:
                     raise UserError(_("Configuration Error!") + '\n' + _("Please define income account for product '%s'.") % product.name)
                 taxes = product.taxes_id or general_account.tax_ids
-                tax = self.pool['account.fiscal.position'].map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                tax = self.pool['account.fiscal.position'].map_tax(cr, uid, account.partner_id.property_account_position_id, taxes)
                 curr_invoice_line.update({
                     'invoice_line_tax_ids': [(6, 0, tax)],
                     'name': factor_name,
@@ -188,7 +188,7 @@ class account_analytic_line(osv.osv):
                 })
 
             note = []
-            for line in analytic_lines:
+            for line in analytic_line_ids:
                 # set invoice_line_note
                 details = []
                 if data.get('date', False):
@@ -243,14 +243,14 @@ class account_analytic_line(osv.osv):
                     line.account_id.pricelist_id.currency_id.id)
                 invoice_grouping.setdefault(key, []).append(line)
 
-        for (key_id, company_id, currency_id), analytic_lines in invoice_grouping.items():
+        for (key_id, company_id, currency_id), analytic_line_ids in invoice_grouping.items():
             # key_id is either an account.analytic.account, either a res.partner
             # don't really care, what's important is the analytic lines that
             # will be used to create the invoice lines
 
-            partner = analytic_lines[0].account_id.partner_id  # will be the same for every line
+            partner = analytic_line_ids[0].account_id.partner_id  # will be the same for every line
 
-            curr_invoice = self._prepare_cost_invoice(cr, uid, partner, company_id, currency_id, analytic_lines, group_by_partner, context=context)
+            curr_invoice = self._prepare_cost_invoice(cr, uid, partner, company_id, currency_id, analytic_line_ids, group_by_partner, context=context)
             invoice_context = dict(context,
                     lang=partner.lang,
                     force_company=company_id,  # set force_company in context so the correct product properties are selected (eg. income account)
@@ -261,7 +261,7 @@ class account_analytic_line(osv.osv):
             # use key (product, uom, user, invoiceable, analytic account, journal type)
             # creates one invoice line per key
             invoice_lines_grouping = {}
-            for analytic_line in analytic_lines:
+            for analytic_line in analytic_line_ids:
                 account = analytic_line.account_id
                 if (not partner) or not (account.pricelist_id):
                     raise UserError(_('Contract incomplete. Please fill in the Customer and Pricelist fields for %s.') % (account.name))
@@ -284,7 +284,7 @@ class account_analytic_line(osv.osv):
                     journal_type, data, context=context)
 
                 invoice_line_obj.create(cr, uid, curr_invoice_line, context=context)
-            self.write(cr, uid, [l.id for l in analytic_lines], {'invoice_id': last_invoice}, context=context)
+            self.write(cr, uid, [l.id for l in analytic_line_ids], {'invoice_id': last_invoice}, context=context)
             invoice_obj.compute_taxes(cr, uid, [last_invoice], context)
         return invoices
 
@@ -318,7 +318,7 @@ class account_invoice(osv.osv):
                     # *-* browse (or refactor to avoid read inside the loop)
                     to_invoice = obj_analytic_account.read(cr, uid, [il['account_analytic_id']], ['to_invoice'], context=context)[0]['to_invoice']
                     if to_invoice:
-                        il['analytic_lines'][0][2]['to_invoice'] = to_invoice[0]
+                        il['analytic_line_ids'][0][2]['to_invoice'] = to_invoice[0]
         return iml
 
 
@@ -330,8 +330,8 @@ class account_move_line(osv.osv):
         analytic_line_obj = self.pool.get('account.analytic.line')
         for move_line in self.browse(cr, uid, ids, context=context):
             # For customer invoice, link analytic line to the invoice so it is not proposed for invoicing in Bill Tasks Work
-            invoice_id = move_line.invoice and move_line.invoice.type in ('out_invoice', 'out_refund') and move_line.invoice.id or False
-            for line in move_line.analytic_lines:
+            invoice_id = move_line.invoice_id and move_line.invoice_id.type in ('out_invoice', 'out_refund') and move_line.invoice_id.id or False
+            for line in move_line.analytic_line_ids:
                 analytic_line_obj.write(cr, uid, line.id, {
                     'invoice_id': invoice_id,
                     'to_invoice': line.account_id.to_invoice and line.account_id.to_invoice.id or False

addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml

@@ -47,13 +47,13 @@
   !record {model: account.account, id: account_income_i000}:
     name: "income account"
     code: "I000"
-    user_type: "account.data_account_type_revenue"
+    user_type_id: "account.data_account_type_revenue"
     tax_ids: [tax10]
 - 
-  I set the account as property_account_income on the product and I set the tax on the product 
+  I set the account as property_account_income_id on the product and I set the tax on the product 
 -  
   !record {model: product.product, id: product.product_product_consultant, view: False}:
-    property_account_income: account_income_i000
+    property_account_income_id: account_income_i000
     uom_id: product.product_uom_hour
     taxes_id: [tax10] 
     list_price: 75

addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml

@@ -46,13 +46,13 @@
   !record {model: account.account, id: account_income_i000}:
     name: "income account"
     code: "I000"
-    user_type: "account.data_account_type_revenue"
+    user_type_id: "account.data_account_type_revenue"
     tax_ids: [tax8]
 -
-  I set the account as property_account_income on the product and I set no tax on the product (so default tax from the account will be used)
+  I set the account as property_account_income_id on the product and I set no tax on the product (so default tax from the account will be used)
 -
   !record {model: product.product, id: product.product_product_consultant, view: False}:
-    property_account_income: account_income_i000
+    property_account_income_id: account_income_i000
     uom_id: product.product_uom_hour
     taxes_id: []
     list_price: 75

addons/hr_timesheet_invoice/tests/test_invoice.py

@@ -17,7 +17,7 @@ class TestInvoice(AccountingTestCase):
         self.timesheet_journal_id = self.registry("ir.model.data").get_object_reference(cr, uid, "hr_timesheet", "analytic_journal")[1]
         self.expense_journal_id = self.registry("ir.model.data").get_object_reference(cr, uid, 'account', 'exp')[1]
         user_type_id = self.ref('account.data_account_type_expenses')
-        self.expense_account_id = self.env['account.account'].create({'code': 'X2120', 'name': 'Test Expense Account', 'user_type': user_type_id}).id
+        self.expense_account_id = self.env['account.account'].create({'code': 'X2120', 'name': 'Test Expense Account', 'user_type_id': user_type_id}).id
         self.factor_100_id = self.registry("ir.model.data").get_object_reference(cr, uid, "hr_timesheet_invoice", "timesheet_invoice_factor1")[1]
 
         self.potato_account_id = self.account_analytic_account.create(cr, uid, {

addons/inter_company_rules/models/purchase_order.py

@@ -83,7 +83,7 @@ class purchase_order(models.Model):
             'pricelist_id': partner.property_product_pricelist.id,
             'partner_invoice_id': partner_addr['invoice'],
             'date_order': self.date_order,
-            'fiscal_position_id': partner.property_account_position and partner.property_account_position.id or False,
+            'fiscal_position_id': partner.property_account_position_id.id,
             'user_id': False,
             'auto_generated': True,
             'auto_purchase_order_id': self.id,

addons/inter_company_rules/models/sale_order.py

@@ -86,8 +86,8 @@ class sale_order(models.Model):
             'pricelist_id': company_partner.property_product_pricelist_purchase.id,
             'date_order': self.date_order,
             'company_id': company.id,
-            'fiscal_position_id': company_partner.property_account_position or False,
-            'payment_term_id': company_partner.property_supplier_payment_term.id or False,
+            'fiscal_position_id': company_partner.property_account_position_id,
+            'payment_term_id': company_partner.property_supplier_payment_term_id.id,
             'auto_generated': True,
             'auto_sale_order_id': self.id,
             'partner_ref': self.name,

addons/inter_company_rules/test/inter_company_invoice.yml

@@ -26,7 +26,7 @@
   !record {model: account.account, id: account_expense_company_a}:
     name: Expenses
     code: X1000
-    user_type: account.data_account_type_expenses
+    user_type_id: account.data_account_type_expenses
     company_id: company_a
 -
   Create an invoice for the partner of company B with amount 450.0

addons/inter_company_rules/test/test_intercompany_data.yml

@@ -116,9 +116,9 @@
         'currency_id': ref("base.EUR"),
         'transfer_account_id': ref("account.transfer_account_id"),
         'code_digits': 6,
-        'purchase_tax': False,
+        'purchase_tax_id': False,
         'bank_account_code_char': 'COMP_A',
-        'sale_tax': False})
+        'sale_tax_id': False})
     self.execute(cr, uid, [wiz_comp_a])
     wiz_comp_b = self.create(cr, uid, {
         'chart_template_id': '1',
@@ -126,26 +126,26 @@
         'currency_id': ref("base.EUR"),
         'transfer_account_id': ref("account.transfer_account_id"),
         'code_digits': 6,
-        'purchase_tax': False,
+        'purchase_tax_id': False,
         'bank_account_code_char': 'COMP_B',
-        'sale_tax': False})
+        'sale_tax_id': False})
     self.execute(cr, uid, [wiz_comp_b])
 -
   Now remove company from related partners of company and apply default accounts.
 -
   !python {model: res.partner}: |
     account_obj = self.pool.get("account.account")
-    account_receivable_a = account_obj.search(cr, uid, [('company_id', '=', ref("company_a")), ('user_type.type', '=', 'receivable')], context=context)
-    account_payable_a = account_obj.search(cr, uid, [('company_id', '=', ref("company_a")), ('user_type.type', '=', 'payable')], context=context)
+    account_receivable_a = account_obj.search(cr, uid, [('company_id', '=', ref("company_a")), ('user_type_id.type', '=', 'receivable')], limit=1, context=context)
+    account_payable_a = account_obj.search(cr, uid, [('company_id', '=', ref("company_a")), ('user_type_id.type', '=', 'payable')], limit=1, context=context)
     self.write(cr, uid, [ref("partner_company_a")], {
         'company_id': False,
-        'property_account_receivable': account_receivable_a[0],
-        'property_account_payable': account_payable_a[0]
+        'property_account_receivable_id': account_receivable_a,
+        'property_account_payable_id': account_payable_a
     }, context=context)
-    account_receivable_b = account_obj.search(cr, uid, [('company_id', '=', ref("company_b")), ('user_type.type', '=', 'receivable')], context=context)
-    account_payable_b = account_obj.search(cr, uid, [('company_id', '=', ref("company_b")), ('user_type.type', '=', 'payable')], context=context)
+    account_receivable_b = account_obj.search(cr, uid, [('company_id', '=', ref("company_b")), ('user_type_id.type', '=', 'receivable')], limit=1, context=context)
+    account_payable_b = account_obj.search(cr, uid, [('company_id', '=', ref("company_b")), ('user_type_id.type', '=', 'payable')], limit=1, context=context)
     self.write(cr, uid, [ref("partner_company_b")], {
         'company_id': False,
-        'property_account_receivable': account_receivable_b[0],
-        'property_account_payable': account_payable_b[0]
+        'property_account_receivable_id': account_receivable_b,
+        'property_account_payable_id': account_payable_b
     }, context=context)

addons/l10n_ar/l10n_ar_chart.xml

@@ -13,7 +13,7 @@
         <field name="name">cuenta de Transferencia</field>
         <field name="code">1</field>
         <field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_current_assets" name="user_type"/>
+        <field ref="account.data_account_type_current_assets" name="user_type_id"/>
     </record>
 
     <record id="ar_chart_template" model="account.chart.template">
@@ -34,7 +34,7 @@
         <field name="name">Créditos por Ventas / Deudores por Ventas</field>
         <field name="code">121</field>
         <field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_receivable" name="user_type"/>
+        <field ref="account.data_account_type_receivable" name="user_type_id"/>
         <field name="reconcile">1</field>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
@@ -42,7 +42,7 @@
     <record id="122" model="account.account.template">
         <field name="name">Créditos por Ventas / Deudores Morosos</field>
         <field name="code">122</field><field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_receivable" name="user_type"/>
+        <field ref="account.data_account_type_receivable" name="user_type_id"/>
         <field name="reconcile">1</field>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
@@ -51,7 +51,7 @@
         <field name="name">Créditos por Ventas / Deudores en Gestión Judicial</field>
         <field name="code">123</field>
         <field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_receivable" name="user_type"/>
+        <field ref="account.data_account_type_receivable" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -59,7 +59,7 @@
         <field name="name">Créditos por Ventas / Deudores Varios</field>
         <field name="code">124</field>
         <field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_receivable" name="user_type"/>
+        <field ref="account.data_account_type_receivable" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -67,7 +67,7 @@
         <field name="name">Créditos por Ventas / (-) Previsión para Ds. Incobrables</field>
         <field name="code">125</field>
         <field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_receivable" name="user_type"/>
+        <field ref="account.data_account_type_receivable" name="user_type_id"/>
         <field name="reconcile">1</field>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
@@ -76,14 +76,14 @@
         <field name="name">Otros Créditos / Préstamos otorgados</field>
         <field name="code">131</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="132" model="account.account.template">
         <field name="name">Otros Créditos / Anticipos a Proveedores</field>
         <field name="code">132</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -91,7 +91,7 @@
         <field name="name">Otros Créditos / Anticipo de Impuestos</field>
         <field name="code">133</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -99,7 +99,7 @@
         <field name="name">Otros Créditos / Anticipo al Personal</field>
         <field name="code">134</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -107,7 +107,7 @@
         <field name="name">Otros Créditos / Alquileres Pagados por Adelantado</field>
         <field name="code">135</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -115,7 +115,7 @@
         <field name="name">Otros Créditos / Intereses Pagados por Adelantado</field>
         <field name="code">136</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -123,7 +123,7 @@
         <field name="name">Otros Créditos / Accionistas</field>
         <field name="code">137</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -131,7 +131,7 @@
         <field name="name">Otros Créditos / (-) Previsión para Descuentos</field>
         <field name="code">138</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -139,14 +139,14 @@
         <field name="name">Otros Créditos / (-) Intereses (+) a Devengar</field>
         <field name="code">139</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="141" model="account.account.template">
         <field name="name">Inversiones / Acciones Transitorias</field>
         <field name="code">141</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -154,7 +154,7 @@
         <field name="name">Inversiones / Acciones Permanentes</field>
         <field name="code">142</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -162,14 +162,14 @@
         <field name="name">Inversiones / Títulos Públicos</field>
         <field name="code">143</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="144" model="account.account.template">
         <field name="name">Inversiones / (-) Previsión para Devalorización de Acciones</field>
         <field name="code">144</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -177,14 +177,14 @@
         <field name="name">Bienes de Cambio - Mercaderías / Categoria de productos 01</field>
         <field name="code">151.01</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="152" model="account.account.template">
         <field name="name">Bienes de Cambio - Mercaderías en Tránsito</field>
         <field name="code">152</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -192,7 +192,7 @@
         <field name="name">Materias primas</field>
         <field name="code">153</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -200,7 +200,7 @@
         <field name="name">Productos en Curso de Elaboración</field>
         <field name="code">154</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -208,7 +208,7 @@
         <field name="name">Productos Elaborados</field>
         <field name="code">155</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -216,7 +216,7 @@
         <field name="name">Materiales Varios </field>
         <field name="code">156</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -224,7 +224,7 @@
         <field name="name">(-) Previsión para Desvalorización de Bienes de Cambio</field>
         <field name="code">157</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -232,7 +232,7 @@
         <field name="name">Bienes de Uso / Inmuebles</field>
         <field name="code">161</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -240,7 +240,7 @@
         <field name="name">Bienes de Uso / Maquinaria</field>
         <field name="code">162</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -248,7 +248,7 @@
         <field name="name">Bienes de Uso / Equipos</field>
         <field name="code">163</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -256,7 +256,7 @@
         <field name="name">Bienes de Uso / Rodados</field>
         <field name="code">164</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -264,7 +264,7 @@
         <field name="name">Bienes de Uso / (-) Depreciación Acumulada</field>
         <field name="code">165</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -272,7 +272,7 @@
         <field name="name">Bienes Inmateriales / Marcas de Fábrica</field>
         <field name="code">171</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -280,7 +280,7 @@
         <field name="name">Bienes Inmateriales / Concesiones y Franquicias</field>
         <field name="code">172</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -288,7 +288,7 @@
         <field name="name">Bienes Inmateriales / Patentes de Invención</field>
         <field name="code">173</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -296,7 +296,7 @@
         <field name="name">Bienes Inmateriales / (-) Amortización Acumulada</field>
         <field name="code">174</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_fixed_assets" name="user_type"/>
+        <field ref="account.data_account_type_fixed_assets" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -304,7 +304,7 @@
         <field name="name">Deudas Comerciales / Proveedores</field>
         <field name="code">211</field>
         <field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_payable" name="user_type"/>
+        <field ref="account.data_account_type_payable" name="user_type_id"/>
         <field name="reconcile">1</field>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
@@ -313,7 +313,7 @@
         <field name="name">Deudas Comerciales / Anticipos de Clientes</field>
         <field name="code">212</field>
         <field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_payable" name="user_type"/>
+        <field ref="account.data_account_type_payable" name="user_type_id"/>
         <field name="reconcile">1</field>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
@@ -322,7 +322,7 @@
         <field name="name">Deudas Comerciales / (-) Intereses a Devengar por Compras al Crédito</field>
         <field name="code">213</field>
         <field name="reconcile" eval="True"/>
-        <field ref="account.data_account_type_payable" name="user_type"/>
+        <field ref="account.data_account_type_payable" name="user_type_id"/>
         <field name="reconcile">1</field>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
@@ -331,7 +331,7 @@
         <field name="name">Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente</field>
         <field name="code">221</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -339,7 +339,7 @@
         <field name="name">Deudas Bancarias y Financieras / Prestamos</field>
         <field name="code">222</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -347,7 +347,7 @@
         <field name="name">Deudas Bancarias y Financieras / Obligaciones a Pagar</field>
         <field name="code">223</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -355,7 +355,7 @@
         <field name="name">Deudas Bancarias y Financieras / Intereses a Pagar</field>
         <field name="code">224</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -363,7 +363,7 @@
         <field name="name">Deudas Bancarias y Financieras / Debentures Emitidos</field>
         <field name="code">225</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -371,14 +371,14 @@
         <field name="name">Deudas Fiscales / IVA a Pagar</field>
         <field name="code">231</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
     <record id="232" model="account.account.template">
         <field name="name">Deudas Fiscales / Impuesto a los Débitos y Créditos Bancarios a Pagar</field><field name="code">232</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -386,7 +386,7 @@
         <field name="name">Deudas Fiscales / Impuesto a las Ganancias a Pagar</field>
         <field name="code">233</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -394,7 +394,7 @@
         <field name="name">Deudas Fiscales / Impuesto sobre los Bienes Personales a Pagar</field>
         <field name="code">234</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -402,28 +402,28 @@
         <field name="name">Deudas Fiscales / Impuesto a la Ganancia Mínima Presunta a Pagar</field>
         <field name="code">235</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="236" model="account.account.template">
         <field name="name">Deudas Fiscales / Monotributo a Pagar</field>
         <field name="code">236</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="241" model="account.account.template">
         <field name="name">Deudas Sociales / Sueldos a Pagar</field>
         <field name="code">241</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="242" model="account.account.template">
         <field name="name">Deudas Sociales / Cargas Sociales a Pagar</field>
         <field name="code">242</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -431,7 +431,7 @@
         <field name="name">Deudas Sociales / Provisión para Sueldo Anual Complementario</field>
         <field name="code">243</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -439,28 +439,28 @@
         <field name="name">Deudas Sociales / Retenciones a Depositar</field>
         <field name="code">244</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="251" model="account.account.template">
         <field name="name">Otras Deudas / Acreedores Varios</field>
         <field name="code">251</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="252" model="account.account.template">
         <field name="name">Otras Deudas / Dividendos a Pagar</field>
         <field name="code">252</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="253" model="account.account.template">
         <field name="name">Otras Deudas / Cobros por Adelantado</field>
         <field name="code">253</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -468,7 +468,7 @@
         <field name="name">Otras Deudas / Honorarios Directores y Síndicos a Pagar</field>
         <field name="code">254</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -476,7 +476,7 @@
         <field name="name">Previsiones / Previsión Indemnización por Despidos</field>
         <field name="code">261</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -484,7 +484,7 @@
         <field name="name">Previsiones / Previsión para juicios Pendientes</field>
         <field name="code">262</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -492,7 +492,7 @@
         <field name="name">Previsiones / Previsión para Garantías por Service</field>
         <field name="code">263</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_current_liabilities" name="user_type"/>
+        <field ref="account.data_account_type_current_liabilities" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -500,7 +500,7 @@
         <field name="name">Capital social / Capital Suscripto</field>
         <field name="code">311</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -508,7 +508,7 @@
         <field name="name">Capital social / Acciones en Circulación</field>
         <field name="code">312</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -516,7 +516,7 @@
         <field name="name">Capital social / Dividendos a Distribuir en Acciones</field>
         <field name="code">313</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -524,7 +524,7 @@
         <field name="name">Capital social / (-) Descuento de Emisión de Acciones</field>
         <field name="code">314</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -532,7 +532,7 @@
         <field name="name">Aportes No Capitalizados / Primas de Emsión</field>
         <field name="code">321</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -540,7 +540,7 @@
         <field name="name">Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones</field>
         <field name="code">322</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -548,7 +548,7 @@
         <field name="name">Ajustes al Patrimonio / Revaluo Técnico de Bienes de Uso</field>
         <field name="code">331</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -556,7 +556,7 @@
         <field name="name">Reserva Legal</field>
         <field name="code">341</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -564,7 +564,7 @@
         <field name="name">Reserva Estatutaria</field>
         <field name="code">342</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -572,7 +572,7 @@
         <field name="name">Reserva Facultativa</field>
         <field name="code">343</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -580,7 +580,7 @@
         <field name="name">Reserva para Renovación de Bienes de Uso</field>
         <field name="code">344</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -588,7 +588,7 @@
         <field name="name">Resultados Acumulados</field>
         <field name="code">351</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -596,7 +596,7 @@
         <field name="name">Resultados Acumulados del Ejercicio Anterior</field>
         <field name="code">352</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -604,7 +604,7 @@
         <field name="name">Ganancias y Pérdidas del Ejercicio</field>
         <field name="code">353</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -612,7 +612,7 @@
         <field name="name">Resultado del Ejercicio</field>
         <field name="code">354</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_equity" name="user_type"/>
+        <field ref="account.data_account_type_equity" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -620,7 +620,7 @@
         <field name="name">Ventas - Categoria de productos 01</field>
         <field name="code">411.01</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_revenue" name="user_type"/>
+        <field ref="account.data_account_type_revenue" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -628,7 +628,7 @@
         <field name="name">Intereses gananados, obtenidos, percibidos</field>
         <field name="code">412</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_revenue" name="user_type"/>
+        <field ref="account.data_account_type_revenue" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -636,7 +636,7 @@
         <field name="name">Alquileres gananados, obtenidos, percibidos</field>
         <field name="code">413</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -644,7 +644,7 @@
         <field name="name">Comisiones gananados, obtenidos, percibidos</field>
         <field name="code">414</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -652,14 +652,14 @@
         <field name="name">Descuentos gananados, obtenidos, percibidos</field>
         <field name="code">415</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="416" model="account.account.template">
         <field name="name">Renta de Títulos Públicos</field>
         <field name="code">416</field><field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -667,7 +667,7 @@
         <field name="name">Honorarios gananados, obtenidos, percibidos</field>
         <field name="code">417</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -675,7 +675,7 @@
         <field name="name">Ganancia Venta de Acciones</field>
         <field name="code">418</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -683,7 +683,7 @@
         <field name="name">Recupero de Rezagos</field>
         <field name="code">421</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -691,7 +691,7 @@
         <field name="name">Recupero de Deudores Incobrables</field>
         <field name="code">422</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -699,7 +699,7 @@
         <field name="name">Ganancia Venta de Bienes de Uso</field>
         <field name="code">423</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -707,7 +707,7 @@
         <field name="name">Donaciones obtenidas, ganandas, percibidas</field>
         <field name="code">424</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -715,7 +715,7 @@
         <field name="name">Ganancia Venta Inversiones Permanentes</field>
         <field name="code">425</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_other_income" name="user_type"/>
+        <field ref="account.data_account_type_other_income" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -723,7 +723,7 @@
         <field name="name">Costo de Mercaderías Vendidas - Categoria de productos 01</field>
         <field name="code">511.01</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -731,7 +731,7 @@
         <field name="name">Gastos en Depreciación de Bienes de Uso</field>
         <field name="code">512</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -739,7 +739,7 @@
         <field name="name">Gastos en Amortización</field>
         <field name="code">513</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -747,21 +747,21 @@
         <field name="name">Gastos en Sueldos y Jormales</field>
         <field name="code">514</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     <record id="515" model="account.account.template">
         <field name="name">Gastos en Cargas Sociales</field>
         <field name="code">515</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
     </record>
 
     <record id="516" model="account.account.template">
         <field name="name">Gastos en Impuestos</field>
         <field name="code">516</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -769,7 +769,7 @@
         <field name="name">Gastos Bancarios</field>
         <field name="code">517</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -777,7 +777,7 @@
         <field name="name">Gastos en Servicios Públicos</field>
         <field name="code">518</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -785,7 +785,7 @@
         <field name="name">Gastos de Publicidad y Propaganda</field>
         <field name="code">519</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -793,7 +793,7 @@
         <field name="name">Gastos en Siniestros</field>
         <field name="code">521</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -801,7 +801,7 @@
         <field name="name">Donaciones Cedidas, Otorgadas</field>
         <field name="code">522</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -809,7 +809,7 @@
         <field name="name">Pérdida Venta Bienes de Uso</field>
         <field name="code">523</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -817,7 +817,7 @@
         <field name="name">Compras - Categoria de productos 01</field>
         <field name="code">61.01</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -825,7 +825,7 @@
         <field name="name">Costos de Producción</field>
         <field name="code">62</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
@@ -833,7 +833,7 @@
         <field name="name">Gastos de Administración</field>
         <field name="code">63</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
     
@@ -841,15 +841,15 @@
         <field name="name">Gastos de Comercialización</field>
         <field name="code">64</field>
         <field name="reconcile" eval="False"/>
-        <field ref="account.data_account_type_expenses" name="user_type"/>
+        <field ref="account.data_account_type_expenses" name="user_type_id"/>
         <field name="chart_template_id" ref="ar_chart_template"/>
     </record>
 
     <record id="ar_chart_template" model="account.chart.template">
-        <field name="property_account_receivable" ref="121"/>
-        <field name="property_account_payable" ref="211"/>
-        <field name="property_account_expense_categ" ref="61_01"/>
-        <field name="property_account_income_categ" ref="411_01"/>
+        <field name="property_account_receivable_id" ref="121"/>
+        <field name="property_account_payable_id" ref="211"/>
+        <field name="property_account_expense_categ_id" ref="61_01"/>
+        <field name="property_account_income_categ_id" ref="411_01"/>
         <field name="expense_currency_exchange_account_id" ref="61_01"/>
         <field name="income_currency_exchange_account_id" ref="411_01"/>
     </record>   

addons/l10n_be/account_chart_template.xml

@@ -6,7 +6,7 @@
             <field name="name">Transferts</field>
             <field name="code">580</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
         </record>
         <!-- Chart template -->
         <record id="l10nbe_chart_template" model="account.chart.template">

addons/l10n_bo/l10n_bo_chart.xml

@@ -50,195 +50,195 @@
 	<record model="account.account.template" id="pcge">
 	  <field name="name">Bolivia</field>
 	  <field name="code">pcge</field>
-	  <field ref="account_account_type_view" name="user_type"/>
+	  <field ref="account_account_type_view" name="user_type_id"/>
 	</record>
 		<record model="account.account.template" id="_1_BG">
 		  <field name="name">Cuentas Patrimoniales</field>
 		  <field name="code">.1.BG</field>
 		  <field name="reconcile" eval="False"/>
-		  <field ref="account_account_type_view" name="user_type"/>
+		  <field ref="account_account_type_view" name="user_type_id"/>
 		</record>
-			<record id="1" model="account.account.template"><field name="name">ACTIVO</field><field name="code">1</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-			<record id="11" model="account.account.template"><field name="name">Caja y Bancos</field><field name="code">11</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="111" model="account.account.template"><field name="name">Caja y Bancos - Caja</field><field name="code">111</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="111_001" model="account.account.template"><field name="name">Caja y bancos - Caja / efectivo en BOB</field><field name="code">111.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="112" model="account.account.template"><field name="name">Caja y Bancos - Moneda Extranjera</field><field name="code">112</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="112_001" model="account.account.template"><field name="name">Caja y bancos - Caja / efectivo USD</field><field name="code">112.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/><field name="currency_id" ref="base.USD"/></record>
-            <record id="113" model="account.account.template"><field name="name">Caja y Bancos - Fondos fijos</field><field name="code">113</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="113_001" model="account.account.template"><field name="name">Caja y ...- Fondos fijos / caja chica 01 BOB</field><field name="code">113.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="114" model="account.account.template"><field name="name">Caja y Bancos - Cuentas Corrientes</field><field name="code">114</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="114_001" model="account.account.template"><field name="name">Caja y Bancos.../ BCO. CTA CTE BOB</field><field name="code">114.001</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="115" model="account.account.template"><field name="name">Caja y bancos - Valores a Depositar </field><field name="code">115</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="116" model="account.account.template"><field name="name">Caja y bancos - Recaudaciones a Depositar </field><field name="code">116</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="12" model="account.account.template"><field name="name">Créditos fiscal IVA</field><field name="code">12</field><field name="reconcile" eval="True"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="121" model="account.account.template"><field name="name">Créditos fiscal IVA / Deudores por Ventas</field><field name="code">121</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="122" model="account.account.template"><field name="name">Créditos fiscal IVA / Deudores Morosos</field><field name="code">122</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="123" model="account.account.template"><field name="name">Créditos fiscal IVA / Deudores en Gestión Judicial</field><field name="code">123</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/></record>
-            <record id="124" model="account.account.template"><field name="name">Créditos fiscal IVA / Deudores Varios</field><field name="code">124</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/></record>
-            <record id="125" model="account.account.template"><field name="name">Créditos fiscal IVA / (-) Previsión para Ds. Incobrables</field><field name="code">125</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="13" model="account.account.template"><field name="name">Otros Créditos</field><field name="code">13</field><field name="reconcile" eval="True"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="131" model="account.account.template"><field name="name">Otros Créditos / Préstamos otorgados</field><field name="code">131</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="132" model="account.account.template"><field name="name">Otros Créditos / Anticipos a Proveedores</field><field name="code">132</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="133" model="account.account.template"><field name="name">Otros Créditos / Anticipo de Impuestos</field><field name="code">133</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="134" model="account.account.template"><field name="name">Otros Créditos / Anticipo al Personal</field><field name="code">134</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="135" model="account.account.template"><field name="name">Otros Créditos / Alquileres Pagados por Adelantado</field><field name="code">135</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="136" model="account.account.template"><field name="name">Otros Créditos / Intereses Pagados por Adelantado</field><field name="code">136</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="137" model="account.account.template"><field name="name">Otros Créditos / Accionistas</field><field name="code">137</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="138" model="account.account.template"><field name="name">Otros Créditos / (-) Previsión para Descuentos</field><field name="code">138</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="139" model="account.account.template"><field name="name">Otros Créditos / (-) Intereses (+) a Devengar</field><field name="code">139</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="14" model="account.account.template"><field name="name">Inversiones</field><field name="code">14</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="141" model="account.account.template"><field name="name">Inversiones / Acciones Transitorias</field><field name="code">141</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type"/></record>
-            <record id="142" model="account.account.template"><field name="name">Inversiones / Acciones Permanentes</field><field name="code">142</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type"/></record>
-            <record id="143" model="account.account.template"><field name="name">Inversiones / Títulos Públicos</field><field name="code">143</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type"/></record>
-            <record id="144" model="account.account.template"><field name="name">Inversiones / (-) Previsión para Devalorización de Acciones</field><field name="code">144</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type"/></record>
-            <record id="15" model="account.account.template"><field name="name">Bienes de Cambio o Realizables</field><field name="code">15</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="151" model="account.account.template"><field name="name">Bienes de Cambio - Mercaderías</field><field name="code">151</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="151_01" model="account.account.template"><field name="name">Bienes de Cambio - Existencia de Mercaderías / Categoria de productos 01</field><field name="code">151.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="152" model="account.account.template"><field name="name">Bienes de Cambio - Mercaderías en Tránsito</field><field name="code">152</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="153" model="account.account.template"><field name="name">Materias primas</field><field name="code">153</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="154" model="account.account.template"><field name="name">Productos en Curso de Elaboración</field><field name="code">154</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="155" model="account.account.template"><field name="name">Productos Elaborados</field><field name="code">155</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="156" model="account.account.template"><field name="name">Materiales Varios </field><field name="code">156</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="157" model="account.account.template"><field name="name">(-) Desvalorización de Existencias</field><field name="code">157</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="16" model="account.account.template"><field name="name">Bienes de Uso</field><field name="code">16</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="161" model="account.account.template"><field name="name">Bienes de Uso / Inmuebles</field><field name="code">161</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="162" model="account.account.template"><field name="name">Bienes de Uso / Maquinaria</field><field name="code">162</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="163" model="account.account.template"><field name="name">Bienes de Uso / Equipos</field><field name="code">163</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="164" model="account.account.template"><field name="name">Bienes de Uso / Vehículos</field><field name="code">164</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="165" model="account.account.template"><field name="name">Bienes de Uso / (-) Depreciación Acumulada Bienes de Uso</field><field name="code">165</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="17" model="account.account.template"><field name="name">Bienes Intangibles</field><field name="code">17</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="171" model="account.account.template"><field name="name">Bienes Intangibles / Marcas de Fábrica</field><field name="code">171</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="172" model="account.account.template"><field name="name">Bienes Intangibles / Concesiones y Franquicias</field><field name="code">172</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="173" model="account.account.template"><field name="name">Bienes Intangibles / Patentes de Invención</field><field name="code">173</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="174" model="account.account.template"><field name="name">Bienes Intangibles / (-) Amortización Acumulada</field><field name="code">174</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="2" model="account.account.template"><field name="name">PASIVO</field><field name="code">2</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="21" model="account.account.template"><field name="name">Deudas Comerciales</field><field name="code">21</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="211" model="account.account.template"><field name="name">Deudas Comerciales / Proveedores</field><field name="code">211</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="212" model="account.account.template"><field name="name">Deudas Comerciales / Anticipos de Clientes</field><field name="code">212</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="213" model="account.account.template"><field name="name">Deudas Comerciales / (-) Intereses a Devengar por Compras al Crédito</field><field name="code">213</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="22" model="account.account.template"><field name="name">Deudas Bancarias y Financieras</field><field name="code">22</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="221" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente</field><field name="code">221</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="222" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Prestamos</field><field name="code">222</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="223" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Obligaciones a Pagar</field><field name="code">223</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="224" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Intereses a Pagar</field><field name="code">224</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="225" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Letras de Cambio Emitidos</field><field name="code">225</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="23" model="account.account.template"><field name="name">Deudas Fiscales</field><field name="code">23</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>            
-            <record id="231" model="account.account.template"><field name="name">Deudas Fiscales / IVA a Pagar</field><field name="code">231</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type"/></record>
-            <record id="232" model="account.account.template"><field name="name">Deudas Fiscales / Impuesto a las Transacciones IT a Pagar</field><field name="code">232</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type"/></record>
-            <record id="233" model="account.account.template"><field name="name">Deudas Fiscales / Impuesto a las Utilidades de Empresas IUE a Pagar</field><field name="code">233</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type"/></record>
-            <record id="24" model="account.account.template"><field name="name">Deudas Sociales</field><field name="code">24</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/><field name="type">view</field><field ref="2" name="parent_id"/></record>
-            <record id="241" model="account.account.template"><field name="name">Deudas Sociales / Sueldos a Pagar</field><field name="code">241</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type"/></record>
-            <record id="242" model="account.account.template"><field name="name">Deudas Sociales / Cargas Sociales a Pagar</field><field name="code">242</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type"/></record>
-            <record id="243" model="account.account.template"><field name="name">Deudas Sociales / Provisión para Sueldo Anual Complementario</field><field name="code">243</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type"/></record>
-            <record id="244" model="account.account.template"><field name="name">Deudas Sociales / Retenciones a Depositar</field><field name="code">244</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type"/></record>
-            <record id="25" model="account.account.template"><field name="name">Otras Deudas</field><field name="code">25</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="251" model="account.account.template"><field name="name">Otras Deudas / Acreedores Varios</field><field name="code">251</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="252" model="account.account.template"><field name="name">Otras Deudas / Dividendos a Pagar</field><field name="code">252</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="253" model="account.account.template"><field name="name">Otras Deudas / Cobros por Adelantado</field><field name="code">253</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="254" model="account.account.template"><field name="name">Otras Deudas / Honorarios Directores y Síndicos a Pagar</field><field name="code">254</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="26" model="account.account.template"><field name="name">Previsiones</field><field name="code">26</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="261" model="account.account.template"><field name="name">Previsiones / Previsión Indemnización por Despidos</field><field name="code">261</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="262" model="account.account.template"><field name="name">Previsiones / Previsión para juicios Pendientes</field><field name="code">262</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="263" model="account.account.template"><field name="name">Previsiones / Previsión para Garantías por Service</field><field name="code">263</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="3" model="account.account.template"><field name="name">PATRIMONIO NETO</field><field name="code">3</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="31" model="account.account.template"><field name="name">Capital Social</field><field name="code">31</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="311" model="account.account.template"><field name="name">Capital social / Capital Suscripto</field><field name="code">311</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="312" model="account.account.template"><field name="name">Capital social / Acciones en Circulación</field><field name="code">312</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="313" model="account.account.template"><field name="name">Capital social / Dividendos a Distribuir en Acciones</field><field name="code">313</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="314" model="account.account.template"><field name="name">Capital social / (-) Descuento de Emisión de Acciones</field><field name="code">314</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="32" model="account.account.template"><field name="name">Aportes No Capitalizados</field><field name="code">32</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="321" model="account.account.template"><field name="name">Aportes No Capitalizados / Primas de Emsión</field><field name="code">321</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="322" model="account.account.template"><field name="name">Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones</field><field name="code">322</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="33" model="account.account.template"><field name="name">Ajustes al Patrimonio</field><field name="code">33</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="331" model="account.account.template"><field name="name">Ajustes al Patrimonio / Revaluo Técnico de Bienes de Uso</field><field name="code">331</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="34" model="account.account.template"><field name="name">Ganancias Reservadas</field><field name="code">34</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="341" model="account.account.template"><field name="name">Reserva Legal</field><field name="code">341</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="342" model="account.account.template"><field name="name">Reserva Estatutaria</field><field name="code">342</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="343" model="account.account.template"><field name="name">Reserva Facultativa</field><field name="code">343</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="344" model="account.account.template"><field name="name">Reserva para Renovación de Bienes de Uso</field><field name="code">344</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="35" model="account.account.template"><field name="name">Resultados No Asignados</field><field name="code">35</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="351" model="account.account.template"><field name="name">Resultados Acumulados</field><field name="code">351</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="352" model="account.account.template"><field name="name">Resultados Acumulados del Ejercicio Anterior</field><field name="code">352</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="353" model="account.account.template"><field name="name">Ganancias y Pérdidas del Ejercicio</field><field name="code">353</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="354" model="account.account.template"><field name="name">Resultado del Ejercicio</field><field name="code">354</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
+			<record id="1" model="account.account.template"><field name="name">ACTIVO</field><field name="code">1</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+			<record id="11" model="account.account.template"><field name="name">Caja y Bancos</field><field name="code">11</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="111" model="account.account.template"><field name="name">Caja y Bancos - Caja</field><field name="code">111</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="111_001" model="account.account.template"><field name="name">Caja y bancos - Caja / efectivo en BOB</field><field name="code">111.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="112" model="account.account.template"><field name="name">Caja y Bancos - Moneda Extranjera</field><field name="code">112</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="112_001" model="account.account.template"><field name="name">Caja y bancos - Caja / efectivo USD</field><field name="code">112.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/><field name="currency_id" ref="base.USD"/></record>
+            <record id="113" model="account.account.template"><field name="name">Caja y Bancos - Fondos fijos</field><field name="code">113</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="113_001" model="account.account.template"><field name="name">Caja y ...- Fondos fijos / caja chica 01 BOB</field><field name="code">113.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="114" model="account.account.template"><field name="name">Caja y Bancos - Cuentas Corrientes</field><field name="code">114</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="114_001" model="account.account.template"><field name="name">Caja y Bancos.../ BCO. CTA CTE BOB</field><field name="code">114.001</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="115" model="account.account.template"><field name="name">Caja y bancos - Valores a Depositar </field><field name="code">115</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="116" model="account.account.template"><field name="name">Caja y bancos - Recaudaciones a Depositar </field><field name="code">116</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="12" model="account.account.template"><field name="name">Créditos fiscal IVA</field><field name="code">12</field><field name="reconcile" eval="True"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="121" model="account.account.template"><field name="name">Créditos fiscal IVA / Deudores por Ventas</field><field name="code">121</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="122" model="account.account.template"><field name="name">Créditos fiscal IVA / Deudores Morosos</field><field name="code">122</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="123" model="account.account.template"><field name="name">Créditos fiscal IVA / Deudores en Gestión Judicial</field><field name="code">123</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/></record>
+            <record id="124" model="account.account.template"><field name="name">Créditos fiscal IVA / Deudores Varios</field><field name="code">124</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/></record>
+            <record id="125" model="account.account.template"><field name="name">Créditos fiscal IVA / (-) Previsión para Ds. Incobrables</field><field name="code">125</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="13" model="account.account.template"><field name="name">Otros Créditos</field><field name="code">13</field><field name="reconcile" eval="True"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="131" model="account.account.template"><field name="name">Otros Créditos / Préstamos otorgados</field><field name="code">131</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="132" model="account.account.template"><field name="name">Otros Créditos / Anticipos a Proveedores</field><field name="code">132</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="133" model="account.account.template"><field name="name">Otros Créditos / Anticipo de Impuestos</field><field name="code">133</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="134" model="account.account.template"><field name="name">Otros Créditos / Anticipo al Personal</field><field name="code">134</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="135" model="account.account.template"><field name="name">Otros Créditos / Alquileres Pagados por Adelantado</field><field name="code">135</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="136" model="account.account.template"><field name="name">Otros Créditos / Intereses Pagados por Adelantado</field><field name="code">136</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="137" model="account.account.template"><field name="name">Otros Créditos / Accionistas</field><field name="code">137</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="138" model="account.account.template"><field name="name">Otros Créditos / (-) Previsión para Descuentos</field><field name="code">138</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="139" model="account.account.template"><field name="name">Otros Créditos / (-) Intereses (+) a Devengar</field><field name="code">139</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="14" model="account.account.template"><field name="name">Inversiones</field><field name="code">14</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="141" model="account.account.template"><field name="name">Inversiones / Acciones Transitorias</field><field name="code">141</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type_id"/></record>
+            <record id="142" model="account.account.template"><field name="name">Inversiones / Acciones Permanentes</field><field name="code">142</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type_id"/></record>
+            <record id="143" model="account.account.template"><field name="name">Inversiones / Títulos Públicos</field><field name="code">143</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type_id"/></record>
+            <record id="144" model="account.account.template"><field name="name">Inversiones / (-) Previsión para Devalorización de Acciones</field><field name="code">144</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type_id"/></record>
+            <record id="15" model="account.account.template"><field name="name">Bienes de Cambio o Realizables</field><field name="code">15</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="151" model="account.account.template"><field name="name">Bienes de Cambio - Mercaderías</field><field name="code">151</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="151_01" model="account.account.template"><field name="name">Bienes de Cambio - Existencia de Mercaderías / Categoria de productos 01</field><field name="code">151.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="152" model="account.account.template"><field name="name">Bienes de Cambio - Mercaderías en Tránsito</field><field name="code">152</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="153" model="account.account.template"><field name="name">Materias primas</field><field name="code">153</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="154" model="account.account.template"><field name="name">Productos en Curso de Elaboración</field><field name="code">154</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="155" model="account.account.template"><field name="name">Productos Elaborados</field><field name="code">155</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="156" model="account.account.template"><field name="name">Materiales Varios </field><field name="code">156</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="157" model="account.account.template"><field name="name">(-) Desvalorización de Existencias</field><field name="code">157</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="16" model="account.account.template"><field name="name">Bienes de Uso</field><field name="code">16</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="161" model="account.account.template"><field name="name">Bienes de Uso / Inmuebles</field><field name="code">161</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="162" model="account.account.template"><field name="name">Bienes de Uso / Maquinaria</field><field name="code">162</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="163" model="account.account.template"><field name="name">Bienes de Uso / Equipos</field><field name="code">163</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="164" model="account.account.template"><field name="name">Bienes de Uso / Vehículos</field><field name="code">164</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="165" model="account.account.template"><field name="name">Bienes de Uso / (-) Depreciación Acumulada Bienes de Uso</field><field name="code">165</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="17" model="account.account.template"><field name="name">Bienes Intangibles</field><field name="code">17</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="171" model="account.account.template"><field name="name">Bienes Intangibles / Marcas de Fábrica</field><field name="code">171</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="172" model="account.account.template"><field name="name">Bienes Intangibles / Concesiones y Franquicias</field><field name="code">172</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="173" model="account.account.template"><field name="name">Bienes Intangibles / Patentes de Invención</field><field name="code">173</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="174" model="account.account.template"><field name="name">Bienes Intangibles / (-) Amortización Acumulada</field><field name="code">174</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="2" model="account.account.template"><field name="name">PASIVO</field><field name="code">2</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="21" model="account.account.template"><field name="name">Deudas Comerciales</field><field name="code">21</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="211" model="account.account.template"><field name="name">Deudas Comerciales / Proveedores</field><field name="code">211</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="212" model="account.account.template"><field name="name">Deudas Comerciales / Anticipos de Clientes</field><field name="code">212</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="213" model="account.account.template"><field name="name">Deudas Comerciales / (-) Intereses a Devengar por Compras al Crédito</field><field name="code">213</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="22" model="account.account.template"><field name="name">Deudas Bancarias y Financieras</field><field name="code">22</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="221" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente</field><field name="code">221</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="222" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Prestamos</field><field name="code">222</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="223" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Obligaciones a Pagar</field><field name="code">223</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="224" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Intereses a Pagar</field><field name="code">224</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="225" model="account.account.template"><field name="name">Deudas Bancarias y Financieras / Letras de Cambio Emitidos</field><field name="code">225</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="23" model="account.account.template"><field name="name">Deudas Fiscales</field><field name="code">23</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>            
+            <record id="231" model="account.account.template"><field name="name">Deudas Fiscales / IVA a Pagar</field><field name="code">231</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type_id"/></record>
+            <record id="232" model="account.account.template"><field name="name">Deudas Fiscales / Impuesto a las Transacciones IT a Pagar</field><field name="code">232</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type_id"/></record>
+            <record id="233" model="account.account.template"><field name="name">Deudas Fiscales / Impuesto a las Utilidades de Empresas IUE a Pagar</field><field name="code">233</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type_id"/></record>
+            <record id="24" model="account.account.template"><field name="name">Deudas Sociales</field><field name="code">24</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/><field name="type">view</field><field ref="2" name="parent_id"/></record>
+            <record id="241" model="account.account.template"><field name="name">Deudas Sociales / Sueldos a Pagar</field><field name="code">241</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type_id"/></record>
+            <record id="242" model="account.account.template"><field name="name">Deudas Sociales / Cargas Sociales a Pagar</field><field name="code">242</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type_id"/></record>
+            <record id="243" model="account.account.template"><field name="name">Deudas Sociales / Provisión para Sueldo Anual Complementario</field><field name="code">243</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type_id"/></record>
+            <record id="244" model="account.account.template"><field name="name">Deudas Sociales / Retenciones a Depositar</field><field name="code">244</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type_id"/></record>
+            <record id="25" model="account.account.template"><field name="name">Otras Deudas</field><field name="code">25</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="251" model="account.account.template"><field name="name">Otras Deudas / Acreedores Varios</field><field name="code">251</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="252" model="account.account.template"><field name="name">Otras Deudas / Dividendos a Pagar</field><field name="code">252</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="253" model="account.account.template"><field name="name">Otras Deudas / Cobros por Adelantado</field><field name="code">253</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="254" model="account.account.template"><field name="name">Otras Deudas / Honorarios Directores y Síndicos a Pagar</field><field name="code">254</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="26" model="account.account.template"><field name="name">Previsiones</field><field name="code">26</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="261" model="account.account.template"><field name="name">Previsiones / Previsión Indemnización por Despidos</field><field name="code">261</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="262" model="account.account.template"><field name="name">Previsiones / Previsión para juicios Pendientes</field><field name="code">262</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="263" model="account.account.template"><field name="name">Previsiones / Previsión para Garantías por Service</field><field name="code">263</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="3" model="account.account.template"><field name="name">PATRIMONIO NETO</field><field name="code">3</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="31" model="account.account.template"><field name="name">Capital Social</field><field name="code">31</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="311" model="account.account.template"><field name="name">Capital social / Capital Suscripto</field><field name="code">311</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="312" model="account.account.template"><field name="name">Capital social / Acciones en Circulación</field><field name="code">312</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="313" model="account.account.template"><field name="name">Capital social / Dividendos a Distribuir en Acciones</field><field name="code">313</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="314" model="account.account.template"><field name="name">Capital social / (-) Descuento de Emisión de Acciones</field><field name="code">314</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="32" model="account.account.template"><field name="name">Aportes No Capitalizados</field><field name="code">32</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="321" model="account.account.template"><field name="name">Aportes No Capitalizados / Primas de Emsión</field><field name="code">321</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="322" model="account.account.template"><field name="name">Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones</field><field name="code">322</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="33" model="account.account.template"><field name="name">Ajustes al Patrimonio</field><field name="code">33</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="331" model="account.account.template"><field name="name">Ajustes al Patrimonio / Revaluo Técnico de Bienes de Uso</field><field name="code">331</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="34" model="account.account.template"><field name="name">Ganancias Reservadas</field><field name="code">34</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="341" model="account.account.template"><field name="name">Reserva Legal</field><field name="code">341</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="342" model="account.account.template"><field name="name">Reserva Estatutaria</field><field name="code">342</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="343" model="account.account.template"><field name="name">Reserva Facultativa</field><field name="code">343</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="344" model="account.account.template"><field name="name">Reserva para Renovación de Bienes de Uso</field><field name="code">344</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="35" model="account.account.template"><field name="name">Resultados No Asignados</field><field name="code">35</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="351" model="account.account.template"><field name="name">Resultados Acumulados</field><field name="code">351</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="352" model="account.account.template"><field name="name">Resultados Acumulados del Ejercicio Anterior</field><field name="code">352</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="353" model="account.account.template"><field name="name">Ganancias y Pérdidas del Ejercicio</field><field name="code">353</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="354" model="account.account.template"><field name="name">Resultado del Ejercicio</field><field name="code">354</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
             
 		<record model="account.account.template" id="_2_GP">
 		  <field name="name">Cuentas de Resultado</field>
 		  <field name="code">.2.GP</field>
 		  <field name="reconcile" eval="False"/>
-		  <field ref="account_account_type_view" name="user_type"/>
+		  <field ref="account_account_type_view" name="user_type_id"/>
 		</record>
-            <record id="4" model="account.account.template"><field name="name">RESULTADOS POSITIVOS</field><field name="code">4</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="41" model="account.account.template"><field name="name">Resultados Positivos Ordinarios</field><field name="code">41</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="411" model="account.account.template"><field name="name">Ventas</field><field name="code">411</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="411_01" model="account.account.template"><field name="name">Ventas - Categoria de productos 01</field><field name="code">411.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_010" name="user_type"/></record>
-            <record id="412" model="account.account.template"><field name="name">Intereses gananados, obtenidos, percibidos</field><field name="code">412</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_060" name="user_type"/></record>
-            <record id="413" model="account.account.template"><field name="name">Alquileres gananados, obtenidos, percibidos</field><field name="code">413</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="414" model="account.account.template"><field name="name">Comisiones gananados, obtenidos, percibidos</field><field name="code">414</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="415" model="account.account.template"><field name="name">Descuentos gananados, obtenidos, percibidos</field><field name="code">415</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="416" model="account.account.template"><field name="name">Renta de Títulos Públicos</field><field name="code">416</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="417" model="account.account.template"><field name="name">Honorarios gananados, obtenidos, percibidos</field><field name="code">417</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="418" model="account.account.template"><field name="name">Ganancia Venta de Acciones</field><field name="code">418</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="42" model="account.account.template"><field name="name">Resultados Positivos Extraordinarios</field><field name="code">42</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="421" model="account.account.template"><field name="name">Recupero de Rezagos</field><field name="code">421</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="422" model="account.account.template"><field name="name">Recupero de Deudores Incobrables</field><field name="code">422</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="423" model="account.account.template"><field name="name">Ganancia Venta de Bienes de Uso</field><field name="code">423</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="424" model="account.account.template"><field name="name">Donaciones obtenidas, ganandas, percibidas</field><field name="code">424</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="425" model="account.account.template"><field name="name">Ganancia Venta Inversiones Permanentes</field><field name="code">425</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="5" model="account.account.template"><field name="name">RESULTADOS NEGATIVOS</field><field name="code">5</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="51" model="account.account.template"><field name="name">Resultados Negativos Ordinarios</field><field name="code">51</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="511" model="account.account.template"><field name="name">Costo de Mercaderías Vendidas</field><field name="code">511</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="511_01" model="account.account.template"><field name="name">Costo de Mercaderías Vendidas - Categoria de productos 01</field><field name="code">511.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_030" name="user_type"/></record>
-            <record id="512" model="account.account.template"><field name="name">Gastos en Depreciación de Bienes de Uso</field><field name="code">512</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
-            <record id="513" model="account.account.template"><field name="name">Gastos en Amortización</field><field name="code">513</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
-            <record id="514" model="account.account.template"><field name="name">Gastos en Sueldos y Jormales</field><field name="code">514</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type"/></record>
-            <record id="515" model="account.account.template"><field name="name">Gastos en Cargas Sociales</field><field name="code">515</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type"/></record>
-            <record id="516" model="account.account.template"><field name="name">Gastos en Impuestos</field><field name="code">516</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="517" model="account.account.template"><field name="name">Gastos Bancarios</field><field name="code">517</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="518" model="account.account.template"><field name="name">Gastos en Servicios Públicos</field><field name="code">518</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="519" model="account.account.template"><field name="name">Gastos de Publicidad y Propaganda</field><field name="code">519</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_050" name="user_type"/></record>
-            <record id="52" model="account.account.template"><field name="name">Resultados Negativos Extraordinarios</field><field name="code">52</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="521" model="account.account.template"><field name="name">Gastos en Siniestros</field><field name="code">521</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
-            <record id="522" model="account.account.template"><field name="name">Donaciones Cedidas, Otorgadas</field><field name="code">522</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
-            <record id="523" model="account.account.template"><field name="name">Pérdida Venta Bienes de Uso</field><field name="code">523</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
+            <record id="4" model="account.account.template"><field name="name">RESULTADOS POSITIVOS</field><field name="code">4</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="41" model="account.account.template"><field name="name">Resultados Positivos Ordinarios</field><field name="code">41</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="411" model="account.account.template"><field name="name">Ventas</field><field name="code">411</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="411_01" model="account.account.template"><field name="name">Ventas - Categoria de productos 01</field><field name="code">411.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_010" name="user_type_id"/></record>
+            <record id="412" model="account.account.template"><field name="name">Intereses gananados, obtenidos, percibidos</field><field name="code">412</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_060" name="user_type_id"/></record>
+            <record id="413" model="account.account.template"><field name="name">Alquileres gananados, obtenidos, percibidos</field><field name="code">413</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="414" model="account.account.template"><field name="name">Comisiones gananados, obtenidos, percibidos</field><field name="code">414</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="415" model="account.account.template"><field name="name">Descuentos gananados, obtenidos, percibidos</field><field name="code">415</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="416" model="account.account.template"><field name="name">Renta de Títulos Públicos</field><field name="code">416</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="417" model="account.account.template"><field name="name">Honorarios gananados, obtenidos, percibidos</field><field name="code">417</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="418" model="account.account.template"><field name="name">Ganancia Venta de Acciones</field><field name="code">418</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="42" model="account.account.template"><field name="name">Resultados Positivos Extraordinarios</field><field name="code">42</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="421" model="account.account.template"><field name="name">Recupero de Rezagos</field><field name="code">421</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="422" model="account.account.template"><field name="name">Recupero de Deudores Incobrables</field><field name="code">422</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="423" model="account.account.template"><field name="name">Ganancia Venta de Bienes de Uso</field><field name="code">423</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="424" model="account.account.template"><field name="name">Donaciones obtenidas, ganandas, percibidas</field><field name="code">424</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="425" model="account.account.template"><field name="name">Ganancia Venta Inversiones Permanentes</field><field name="code">425</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="5" model="account.account.template"><field name="name">RESULTADOS NEGATIVOS</field><field name="code">5</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="51" model="account.account.template"><field name="name">Resultados Negativos Ordinarios</field><field name="code">51</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="511" model="account.account.template"><field name="name">Costo de Mercaderías Vendidas</field><field name="code">511</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="511_01" model="account.account.template"><field name="name">Costo de Mercaderías Vendidas - Categoria de productos 01</field><field name="code">511.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_030" name="user_type_id"/></record>
+            <record id="512" model="account.account.template"><field name="name">Gastos en Depreciación de Bienes de Uso</field><field name="code">512</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
+            <record id="513" model="account.account.template"><field name="name">Gastos en Amortización</field><field name="code">513</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
+            <record id="514" model="account.account.template"><field name="name">Gastos en Sueldos y Jormales</field><field name="code">514</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type_id"/></record>
+            <record id="515" model="account.account.template"><field name="name">Gastos en Cargas Sociales</field><field name="code">515</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type_id"/></record>
+            <record id="516" model="account.account.template"><field name="name">Gastos en Impuestos</field><field name="code">516</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="517" model="account.account.template"><field name="name">Gastos Bancarios</field><field name="code">517</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="518" model="account.account.template"><field name="name">Gastos en Servicios Públicos</field><field name="code">518</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="519" model="account.account.template"><field name="name">Gastos de Publicidad y Propaganda</field><field name="code">519</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_050" name="user_type_id"/></record>
+            <record id="52" model="account.account.template"><field name="name">Resultados Negativos Extraordinarios</field><field name="code">52</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="521" model="account.account.template"><field name="name">Gastos en Siniestros</field><field name="code">521</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
+            <record id="522" model="account.account.template"><field name="name">Donaciones Cedidas, Otorgadas</field><field name="code">522</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
+            <record id="523" model="account.account.template"><field name="name">Pérdida Venta Bienes de Uso</field><field name="code">523</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
             
         <record model="account.account.template" id="_3_CC">
 		  <field name="name">Cuentas de Movimiento</field>
 		  <field name="code">.3.CC</field>
 		  <field name="reconcile" eval="False"/>
-		  <field ref="account_account_type_view" name="user_type"/>
+		  <field ref="account_account_type_view" name="user_type_id"/>
 		</record>
-            <record id="61" model="account.account.template"><field name="name">Compras</field><field name="code">61</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="61_01" model="account.account.template"><field name="name">Compras - Categoria de productos 01</field><field name="code">61.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_NA_010" name="user_type"/></record>
-            <record id="62" model="account.account.template"><field name="name">Costos de Producción</field><field name="code">62</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_030" name="user_type"/></record>
-            <record id="63" model="account.account.template"><field name="name">Gastos de Administración</field><field name="code">63</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type"/></record>
-            <record id="64" model="account.account.template"><field name="name">Gastos de Comercialización</field><field name="code">64</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_050" name="user_type"/></record>
+            <record id="61" model="account.account.template"><field name="name">Compras</field><field name="code">61</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="61_01" model="account.account.template"><field name="name">Compras - Categoria de productos 01</field><field name="code">61.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_NA_010" name="user_type_id"/></record>
+            <record id="62" model="account.account.template"><field name="name">Costos de Producción</field><field name="code">62</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_030" name="user_type_id"/></record>
+            <record id="63" model="account.account.template"><field name="name">Gastos de Administración</field><field name="code">63</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type_id"/></record>
+            <record id="64" model="account.account.template"><field name="name">Gastos de Comercialización</field><field name="code">64</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_050" name="user_type_id"/></record>
         
         <record model="account.account.template" id="_4_CO">
 		  <field name="name">Cuentas de Orden</field>
 		  <field name="code">.4.CO</field>
 		  <field name="reconcile" eval="False"/>
-		  <field ref="account_account_type_view" name="user_type"/>
+		  <field ref="account_account_type_view" name="user_type_id"/>
 		</record>
-            <record id="71" model="account.account.template"><field name="name">CUENTAS DE ORDEN DEUDORAS</field><field name="code">71</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="711" model="account.account.template"><field name="name">Mercaderias Recibidas en Consignación</field><field name="code">711</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="712" model="account.account.template"><field name="name">Depósito de Valores Recibos en Garantía</field><field name="code">712</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="713" model="account.account.template"><field name="name">Garantias Otorgadas</field><field name="code">713</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="714" model="account.account.template"><field name="name">Documentos Descontados</field><field name="code">714</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="715" model="account.account.template"><field name="name">Documentos Endosados</field><field name="code">715</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="72" model="account.account.template"><field name="name">CUENTAS DE ORDEN ACREEDORAS</field><field name="code">72</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="721" model="account.account.template"><field name="name">Comitente por Mercaderias Recibidas en Consignación</field><field name="code">721</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="722" model="account.account.template"><field name="name">Acreedor por Garantías Otorgadas</field><field name="code">722</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="723" model="account.account.template"><field name="name">Acreedor por Documentos Descontados</field><field name="code">723</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
+            <record id="71" model="account.account.template"><field name="name">CUENTAS DE ORDEN DEUDORAS</field><field name="code">71</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="711" model="account.account.template"><field name="name">Mercaderias Recibidas en Consignación</field><field name="code">711</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="712" model="account.account.template"><field name="name">Depósito de Valores Recibos en Garantía</field><field name="code">712</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="713" model="account.account.template"><field name="name">Garantias Otorgadas</field><field name="code">713</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="714" model="account.account.template"><field name="name">Documentos Descontados</field><field name="code">714</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="715" model="account.account.template"><field name="name">Documentos Endosados</field><field name="code">715</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="72" model="account.account.template"><field name="name">CUENTAS DE ORDEN ACREEDORAS</field><field name="code">72</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="721" model="account.account.template"><field name="name">Comitente por Mercaderias Recibidas en Consignación</field><field name="code">721</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="722" model="account.account.template"><field name="name">Acreedor por Garantías Otorgadas</field><field name="code">722</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="723" model="account.account.template"><field name="name">Acreedor por Documentos Descontados</field><field name="code">723</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
             
 	<record id="bo_chart_template" model="account.chart.template">
 	  <field name="name">Bolivia - Plan de Cuentas</field>
 	  <field name="account_root_id" ref="pcge"/>
 	  <field name="bank_account_view_id" ref="111"/>
-	  <field name="property_account_receivable" ref="121"/>
-	  <field name="property_account_payable" ref="211"/>
-	  <field name="property_account_expense_categ" ref="61_01"/>
-	  <field name="property_account_income_categ" ref="411_01"/>
+	  <field name="property_account_receivable_id" ref="121"/>
+	  <field name="property_account_payable_id" ref="211"/>
+	  <field name="property_account_expense_categ_id" ref="61_01"/>
+	  <field name="property_account_income_categ_id" ref="411_01"/>
 	  <field name="currency_id" ref="base.BOB"/>
 	</record>	
 

addons/l10n_br/data/account_chart_template.xml

@@ -6,10 +6,10 @@
 			<field name="name">Planilha de Contas Brasileira</field>
 			<field name="account_root_id" ref="account_template_0" />
 			<field name="bank_account_view_id" ref="account_template_101010200"/>
-			<field name="property_account_receivable" ref="account_template_101050200"/>
-			<field name="property_account_payable" ref="account_template_201010100" />
-			<field name="property_account_expense_categ" ref="account_template_3010103010000" />
-			<field name="property_account_income_categ" ref="account_template_3010101010200" />
+			<field name="property_account_receivable_id" ref="account_template_101050200"/>
+			<field name="property_account_payable_id" ref="account_template_201010100" />
+			<field name="property_account_expense_categ_id" ref="account_template_3010103010000" />
+			<field name="property_account_income_categ_id" ref="account_template_3010101010200" />
 			<field name="currency_id" ref="base.BRL"/>
 		</record>
 	

addons/l10n_ca/account_chart_en.xml

@@ -6,170 +6,170 @@
         <record id="chart0_en" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Account Chart CA EN</field>
-            <field name="user_type" ref="account.data_account_type_view"/>
+            <field name="user_type_id" ref="account.data_account_type_view"/>
         </record>
 
 	<!-- ASSET -->
 
 	<record id="chart1_en" model="account.account.template">
 		<field name="code">1</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ASSETS</field>
 	</record>
 	
 	<record id="chart11_en" model="account.account.template">
 		<field name="code">11</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT ASSETS</field>
 	</record>
 	
 	<record id="chart111_en" model="account.account.template">
 		<field name="code">111</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CASH</field>
 	</record>
 
 	<record id="chart112_en" model="account.account.template">
 		<field name="code">112</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">TREASURY OR TREASURY EQUIVALENTS</field>
 	</record>
 
 	<record id="chart113_en" model="account.account.template">
 		<field name="code">113</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CERTIFICATES OF DEPOSITS</field>
 	</record>
 
 	<record id="chart114_en" model="account.account.template">
 		<field name="code">114</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">STOCKS</field>
 	</record>
 
 	<record id="chart1141_en" model="account.account.template">
 		<field name="code">1141</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="name">Stock In Hand</field>
 	</record>
 
 	<record id="chart1145_en" model="account.account.template">
 		<field name="code">1145</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="name">Stock Delivered But Not Billed</field>
 	</record>
 
 	<record id="chart115_en" model="account.account.template">
 		<field name="code">115</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ACCOUNTS RECEIVABLES</field>
 	</record>
 
 	<record id="chart1151_en" model="account.account.template">
 		<field name="code">1151</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="user_type_id" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Customers Account</field>
 	</record>
 
 	<record id="chart1152_en" model="account.account.template">
 		<field name="code">1152</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ALLOWANCE FOR DOUBTFUL ACCOUNTS</field>
 	</record>
 
 	<record id="chart116_en" model="account.account.template">
 		<field name="code">116</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PREPAID EXPENSES</field>
 	</record>
 
 	<record id="chart117_en" model="account.account.template">
 		<field name="code">117</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">INVESTMENTS HELD FOR TRADING</field>
 	</record>
 
 	<record id="chart118_en" model="account.account.template">
 		<field name="code">118</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">TAXES RECEIVABLES</field>
 	</record>
 
 	<record id="chart1181_en" model="account.account.template">
 		<field name="code">1181</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="user_type_id" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">GST receivable</field>
 	</record>
 
 	<record id="chart1182_en" model="account.account.template">
 		<field name="code">1182</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="user_type_id" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">PST/QST receivable</field>
 	</record>
 
 	<record id="chart1183_en" model="account.account.template">
 		<field name="code">1183</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">HST receivable</field>
 	</record>
 
 	<record id="chart11831_en" model="account.account.template">
 		<field name="code">11831</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="user_type_id" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">HST receivable - 13%</field>
 	</record>
 
 	<record id="chart11832_en" model="account.account.template">
 		<field name="code">11832</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="user_type_id" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">HST receivable - 14%</field>
 	</record>
 
 	<record id="chart11833_en" model="account.account.template">
 		<field name="code">11833</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="user_type_id" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">HST receivable - 15%</field>
 	</record>
 
 	<record id="chart15_en" model="account.account.template">
 		<field name="code">15</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT ASSETS</field>
 	</record>
 
 	<record id="chart151_en" model="account.account.template">
 		<field name="code">151</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">INVESTMENTS AVAILABLE FOR SALE</field>
 	</record>
 
 	<record id="chart152_en" model="account.account.template">
 		<field name="code">152</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">TANGIBLE ASSETS</field>
 	</record>
 
 	<record id="chart1527_en" model="account.account.template">
 		<field name="code">1527</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ACCUMULATED DEPRECIATIONS</field>
 	</record>
 
 	<record id="chart153_en" model="account.account.template">
 		<field name="code">153</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">INTANGIBLE ASSETS</field>
 	</record>
 
 	<record id="chart1531_en" model="account.account.template">
 		<field name="code">1531</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PATENTS, TRADEMARKS AND COPYRIGHTS</field>
 	</record>
 
@@ -177,355 +177,355 @@
 
 	<record id="chart2_en" model="account.account.template">
 		<field name="code">2</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">LIABILITIES</field>
 	</record>
 
 	<record id="chart21_en" model="account.account.template">
 		<field name="code">21</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT LIABILITIES</field>
 	</record>
 
 	<record id="chart211_en" model="account.account.template">
 		<field name="code">211</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ACCOUNTS PAYABLES</field>
 	</record>
 
 	<record id="chart2111_en" model="account.account.template">
 		<field name="code">2111</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="user_type_id" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Suppliers Account</field>
 	</record>
 
         <record id="chart212_en" model="account.account.template">
                 <field name="code">212</field>
-                <field name="user_type" ref="account.data_account_type_view"/>
+                <field name="user_type_id" ref="account.data_account_type_view"/>
                 <field name="name">OTHER ACCOUNTS PAYABLES</field>
         </record>
 
 	<record id="chart213_en" model="account.account.template">
 		<field name="code">213</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">TAXES PAYABLES</field>
 	</record>
 
 	<record id="chart2131_en" model="account.account.template">
 		<field name="code">2131</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="user_type_id" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">GST to pay</field>
 	</record>
 
 	<record id="chart2132_en" model="account.account.template">
 		<field name="code">2132</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="user_type_id" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">PST/QST to pay</field>
 	</record>
 
 	<record id="chart2133_en" model="account.account.template">
 		<field name="code">2133</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">HST to pay</field>
 	</record>
 
 	<record id="chart21331_en" model="account.account.template">
 		<field name="code">21331</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="user_type_id" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">HST to pay - 13%</field>
 	</record>
 
 	<record id="chart21332_en" model="account.account.template">
 		<field name="code">21332</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="user_type_id" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">HST to pay - 14%</field>
 	</record>
 
 	<record id="chart21333_en" model="account.account.template">
 		<field name="code">21333</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="user_type_id" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">HST to pay - 15%</field>
 	</record>
 
 	<record id="chart214_en" model="account.account.template">
 		<field name="code">214</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">LABOUR TAXES TO PAY</field>
 	</record>
 
     <record id="chart2141_en" model="account.account.template">
         <field name="code">2141</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">CANADA REVENUE AGENCY</field>
     </record>
 
     <record id="chart21411_en" model="account.account.template">
         <field name="code">21411</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">EMPLOYMENT INSURANCE TO PAY</field>
     </record>
 
     <record id="chart214111_en" model="account.account.template">
         <field name="code">214111</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">EI - Employees Contribution</field>
     </record>
 
     <record id="chart214112_en" model="account.account.template">
         <field name="code">214112</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">EI - Employer Contribution</field>
     </record>
 
     <record id="chart21412_en" model="account.account.template">
         <field name="code">21412</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Federal Income Tax</field>
     </record>
 
     <record id="chart21413_en" model="account.account.template">
         <field name="code">21413</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">CANADA PENSION PLAN TO PAY</field>
     </record>
 
     <record id="chart214131_en" model="account.account.template">
         <field name="code">214131</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">CPP - Employees Contribution</field>
     </record>
 
     <record id="chart214132_en" model="account.account.template">
         <field name="code">214132</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">CPP - Employer Contribution</field>
     </record>
 
     <record id="chart2142_en" model="account.account.template">
         <field name="code">2142</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">PROVINCIAL REVENU AGENCY</field>
     </record>
 
     <record id="chart21421_en" model="account.account.template">
         <field name="code">21421</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Health Services Fund to pay</field>
     </record>
 
     <record id="chart21422_en" model="account.account.template">
         <field name="code">21422</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">PROVINCIAL PENSION PLAN TO PAY</field>
     </record>
 
     <record id="chart214221_en" model="account.account.template">
         <field name="code">214221</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Provincial Pension Plan - Employees Contribution</field>
     </record>
 
     <record id="chart214222_en" model="account.account.template">
         <field name="code">214222</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Provincial Pension Plan - Employer Contribution</field>
     </record>
 
     <record id="chart21423_en" model="account.account.template">
         <field name="code">21423</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">PROVINCIAL PARENTAL INSURANCE PLAN TO PAY</field>
     </record>
 
     <record id="chart214231_en" model="account.account.template">
         <field name="code">214231</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Parental Insurance Plan - Employee Contribution</field>
     </record>
 
     <record id="chart214232_en" model="account.account.template">
         <field name="code">214232</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Parental Insurance Plan - Employer Contribution</field>
     </record>
 
     <record id="chart21424_en" model="account.account.template">
         <field name="code">21424</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Labour Health and Safety to pay</field>
     </record>
 
     <record id="chart21425_en" model="account.account.template">
         <field name="code">21425</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Labour Standards to pay</field>
     </record>
 
     <record id="chart21426_en" model="account.account.template">
         <field name="code">21426</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Provincial Income Tax</field>
     </record>
 
 	<record id="chart215_en" model="account.account.template">
 		<field name="code">215</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CURRENT FINANCIAL DEBTS</field>
 	</record>
 
         <record id="chart216_en" model="account.account.template">
                 <field name="code">216</field>
-                <field name="user_type" ref="account.data_account_type_view"/>
+                <field name="user_type_id" ref="account.data_account_type_view"/>
                 <field name="name">LIABILITIES ASSETS HELD FOR TRANSFER</field>
         </record>
 
 	<record id="chart217_en" model="account.account.template">
 		<field name="code">217</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">STOCK LIABILITIES</field>
 	</record>
 
 	<record id="chart2171_en" model="account.account.template">
 		<field name="code">2171</field>
-		<field name="user_type" ref="account.data_account_type_current_liabilities"/>
+		<field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
 		<field name="name">Stock Received But Not Billed</field>
 	</record>
 
     <record id="chart218_en" model="account.account.template">
         <field name="code">218</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">CURRENT LIABILITIES RELATED TO SALARIES</field>
     </record>
 
     <record id="chart2181_en" model="account.account.template">
         <field name="code">2181</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Salaries to pay</field>
     </record>
 
     <record id="chart2183_en" model="account.account.template">
         <field name="code">2183</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Bonus to pay</field>
     </record>
 
     <record id="chart2184_en" model="account.account.template">
         <field name="code">2184</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Retroactive Payment to pay</field>
     </record>
 
     <record id="chart2185_en" model="account.account.template">
         <field name="code">2185</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">GROUP PENSION PLAN TO PAY</field>
     </record>
 
     <record id="chart218501_en" model="account.account.template">
         <field name="code">218501</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Group Pension Plan to pay - Employees Contribution</field>
     </record>
 
     <record id="chart218502_en" model="account.account.template">
         <field name="code">218502</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Group Pension Plan to pay - Employer Contribution</field>
     </record>
 
     <record id="chart2186_en" model="account.account.template">
         <field name="code">2186</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">EMPLOYEE BENEFITS</field>
     </record>
 
     <record id="chart218601_en" model="account.account.template">
         <field name="code">218601</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Employee Benefits Provision - Employees Contribution</field>
     </record>
 
     <record id="chart218602_en" model="account.account.template">
         <field name="code">218602</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Employee Benefits Provision - Employer Contribution</field>
     </record>
 
 	<record id="chart25_en" model="account.account.template">
 		<field name="code">25</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT LIABILITIES</field>
 	</record>
 
 	<record id="chart251_en" model="account.account.template">
 		<field name="code">251</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">NON-CURRENT FINANCIAL DEBTS</field>
 	</record>
 
 	<record id="chart252_en" model="account.account.template">
 		<field name="code">252</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
 	</record>
 
     <record id="chart2521_en" model="account.account.template">
         <field name="code">2521</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Provision for pension plans</field>
     </record>
 
 	<record id="chart253_en" model="account.account.template">
 		<field name="code">253</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">DEFERRED TAXES</field>
 	</record>
 
     <record id="chart254_en" model="account.account.template">
         <field name="code">254</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">NON-CURRENT LIABILITIES RELATED TO SALARIES</field>
     </record>
 
     <record id="chart2541_en" model="account.account.template">
         <field name="code">2541</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">Leaves Accruded</field>
     </record>
 
     <record id="chart254101_en" model="account.account.template">
         <field name="code">254101</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Vacations Accruded</field>
     </record>
 
     <record id="chart254102_en" model="account.account.template">
         <field name="code">254102</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Compensatory Days Accruded</field>
     </record>
 
     <record id="chart254103_en" model="account.account.template">
         <field name="code">254103</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Sick Leaves Accruded</field>
     </record>
 
     <record id="chart2542_en" model="account.account.template">
         <field name="code">2542</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Bonus Accruded</field>
     </record>
 
 	<record id="chart259_en" model="account.account.template">
 		<field name="code">259</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-CURRENT LIABILITIES</field>
 	</record>
 
@@ -533,43 +533,43 @@
 
 	<record id="chart3_en" model="account.account.template">
 		<field name="code">3</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">EQUITY</field>
 	</record>
 
 	<record id="chart31_en" model="account.account.template">
 		<field name="code">31</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">SHARE CAPITAL</field>
 	</record>
 
 	<record id="chart32_en" model="account.account.template">
 		<field name="code">32</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PREMIUMS</field>
 	</record>
 
 	<record id="chart33_en" model="account.account.template">
 		<field name="code">33</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">RETAINED EARNINGS</field>
 	</record>
 
 	<record id="chart34_en" model="account.account.template">
 		<field name="code">34</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">DIVIDENDS</field>
 	</record>
 
 	<record id="chart35_en" model="account.account.template">
 		<field name="code">35</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">TRANSLATION ADJUSTMENTS</field>
 	</record>
 
 	<record id="chart36_en" model="account.account.template">
 		<field name="code">36</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CONTRIBUTED SURPLUS</field>
 	</record>
 
@@ -577,61 +577,61 @@
 
 	<record id="chart4_en" model="account.account.template">
 		<field name="code">4</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">INCOMES</field>
 	</record>
 
 	<record id="chart41_en" model="account.account.template">
 		<field name="code">41</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">OPERATING INCOMES</field>
 	</record>
 
 	<record id="chart411_en" model="account.account.template">
 		<field name="code">411</field>
-		<field name="user_type" ref="account.data_account_type_revenue"/>
+		<field name="user_type_id" ref="account.data_account_type_revenue"/>
 		<field name="name">Inside Sales</field>
 	</record>
 
         <record id="chart412_en" model="account.account.template">
                 <field name="code">412</field>
-                <field name="user_type" ref="account.data_account_type_revenue"/>
+                <field name="user_type_id" ref="account.data_account_type_revenue"/>
                 <field name="name">Harmonized Provinces Sales</field>
         </record>
 
         <record id="chart413_en" model="account.account.template">
                 <field name="code">413</field>
-                <field name="user_type" ref="account.data_account_type_revenue"/>
+                <field name="user_type_id" ref="account.data_account_type_revenue"/>
                 <field name="name">Non-Harmonized Provinces Sales</field>
         </record>
 
         <record id="chart414_en" model="account.account.template">
                 <field name="code">414</field>
-                <field name="user_type" ref="account.data_account_type_revenue"/>
+                <field name="user_type_id" ref="account.data_account_type_revenue"/>
                 <field name="name">International Sales</field>
         </record>
 
 	<record id="chart419_en" model="account.account.template">
 		<field name="code">419</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">OTHER OPERATING INCOMES</field>
 	</record>
 
 	<record id="chart42_en" model="account.account.template">
 		<field name="code">42</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">NON-OPERATING INCOMES</field>
 	</record>
 
 	<record id="chart425_en" model="account.account.template">
 		<field name="code">425</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">INTERESTS</field>
 	</record>
 
 	<record id="chart429_en" model="account.account.template">
 		<field name="code">429</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-OPERATING INCOMES</field>
 	</record>
 
@@ -639,206 +639,206 @@
 
 	<record id="chart5_en" model="account.account.template">
 		<field name="code">5</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">EXPENSES</field>
 	</record>
 
 	<record id="chart51_en" model="account.account.template">
 		<field name="code">51</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">OPERATING EXPENSES</field>
 	</record>
 
 	<record id="chart511_en" model="account.account.template">
 		<field name="code">511</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">COST OF GOODS SOLD</field>
 	</record>
 
 	<record id="chart5111_en" model="account.account.template">
 		<field name="code">5111</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
 		<field name="name">Inside Purchases</field>
 	</record>
 
 	<record id="chart5112_en" model="account.account.template">
 		<field name="code">5112</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
 		<field name="name">Purchases in harmonized provinces</field>
 	</record>
 
 	<record id="chart5113_en" model="account.account.template">
 		<field name="code">5113</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
 		<field name="name">Purchases in non-harmonized provinces</field>
 	</record>
 
 	<record id="chart5114_en" model="account.account.template">
 		<field name="code">5114</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
 		<field name="name">International Purchases</field>
 	</record>
 
     <record id="chart512_en" model="account.account.template">
         <field name="code">512</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">LABOUR EXPENSES</field>
     </record>
 
     <record id="chart5121_en" model="account.account.template">
         <field name="code">5121</field>
         
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">Salaries</field>
     </record>
 
     <record id="chart512101_en" model="account.account.template">
         <field name="code">512101</field>
 
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Regular Salaries</field>
     </record>
 
     <record id="chart512102_en" model="account.account.template">
         <field name="code">512102</field>
-	<field name="user_type" ref="account.data_account_type_expenses"/>
+	<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Bonus</field>
     </record>
 
     <record id="chart512103_en" model="account.account.template">
         <field name="code">512103</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Retroactive Pay</field>
     </record>
 
     <record id="chart5122_en" model="account.account.template">
         <field name="code">5122</field>
         
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">Leaves Accruded</field>
     </record>
 
     <record id="chart512201_en" model="account.account.template">
         <field name="code">512201</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Vacations Accruded</field>
     </record>
 
     <record id="chart512202_en" model="account.account.template">
         <field name="code">512202</field>
-	<field name="user_type" ref="account.data_account_type_expenses"/>
+	<field name="user_type_id" ref="account.data_account_type_expenses"/>
 
         <field name="name">Compensatory Days Accruded</field>
     </record>
 
     <record id="chart512203_en" model="account.account.template">
         <field name="code">512203</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Sick Leaves Accruded</field>
     </record>
 
     <record id="chart5123_en" model="account.account.template">
         <field name="code">5123</field>
 
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">Employer Contributions</field>
     </record>
 
     <record id="chart512301_en" model="account.account.template">
         <field name="code">512301</field>
 
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Canada Pension Plan</field>
     </record>
 
     <record id="chart512302_en" model="account.account.template">
         <field name="code">512302</field>
 
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Employment Insurance</field>
     </record>
 
     <record id="chart512303_en" model="account.account.template">
         <field name="code">512303</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Group Pension Plan</field>
     </record>
 
     <record id="chart512304_en" model="account.account.template">
         <field name="code">512304</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Employee benefits expense</field>
     </record>
 
     <record id="chart512310_en" model="account.account.template">
         <field name="code">512310</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Provincial Pension Plan</field>
     </record>
 
     <record id="chart512311_en" model="account.account.template">
         <field name="code">512311</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Provincial Parental Insurance Plan</field>
     </record>
 
     <record id="chart512312_en" model="account.account.template">
         <field name="code">512312</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Labour Health and Safety</field>
     </record>
 
     <record id="chart512313_en" model="account.account.template">
         <field name="code">512313</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Labour Standards</field>
     </record>
 
     <record id="chart512314_en" model="account.account.template">
         <field name="code">512314</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Health Service Fund</field>
     </record>
 
 	<record id="chart513_en" model="account.account.template">
 		<field name="code">513</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">SALES EXPENSES</field>
 	</record>
 
 	<record id="chart514_en" model="account.account.template">
 		<field name="code">514</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">GENERAL EXPENSES</field>
 	</record>
 
 	<record id="chart515_en" model="account.account.template">
 		<field name="code">515</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">RESEARCH AND DEVELOPMENT EXPENSES</field>
 	</record>
 
 	<record id="chart519_en" model="account.account.template">
 		<field name="code">519</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">OTHER OPERATING EXPENSES</field>
 	</record>
 
 	<record id="chart55_en" model="account.account.template">
 		<field name="code">55</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">NON-OPERATING EXPENSES</field>
 	</record>
 
 	<record id="chart551_en" model="account.account.template">
 		<field name="code">551</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">INTERESTS EXPENSES</field>
 	</record>
 
 	<record id="chart559_en" model="account.account.template">
 		<field name="code">559</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">OTHER NON-OPERATING EXPENSES</field>
 	</record>
 

addons/l10n_ca/account_chart_fr.xml

@@ -5,7 +5,7 @@
 	<!-- Account Templates-->
         <record id="chart0_fr" model="account.account.template">
             <field name="code">0</field>
-            <field name="user_type" ref="account.data_account_type_view"/>
+            <field name="user_type_id" ref="account.data_account_type_view"/>
             <field name="name">Account Chart CA FR</field>
         </record>
 
@@ -13,163 +13,163 @@
 
 	<record id="chart1_fr" model="account.account.template">
 		<field name="code">1</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ACTIF</field>
 	</record>
 	
 	<record id="chart11_fr" model="account.account.template">
 		<field name="code">11</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ACTIFS COURANTS</field>
 	</record>
 	
 	<record id="chart111_fr" model="account.account.template">
 		<field name="code">111</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ENCAISSE</field>
 	</record>
 
 	<record id="chart112_fr" model="account.account.template">
 		<field name="code">112</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE</field>
 	</record>
 
 	<record id="chart113_fr" model="account.account.template">
 		<field name="code">113</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CERTIFICATS DE DÉPÔTS</field>
 	</record>
 
 	<record id="chart114_fr" model="account.account.template">
 		<field name="code">114</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">STOCKS</field>
 	</record>
 
 	<record id="chart1141_fr" model="account.account.template">
 		<field name="code">1141</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="name">Stock</field>
 	</record>
 
 	<record id="chart1145_fr" model="account.account.template">
 		<field name="code">1145</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="name">Stock expédié non-facturé</field>
 	</record>
 
 	<record id="chart115_fr" model="account.account.template">
 		<field name="code">115</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">COMPTES CLIENTS</field>
 	</record>
 
 	<record id="chart1151_fr" model="account.account.template">
 		<field name="code">1151</field>
-		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="user_type_id" ref="account.data_account_type_receivable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Comptes clients</field>
 	</record>
 
 	<record id="chart1152_fr" model="account.account.template">
 		<field name="code">1152</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PROVISION POUR CRÉANCES DOUTEUSES</field>
 	</record>
 
 	<record id="chart116_fr" model="account.account.template">
 		<field name="code">116</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS PAYÉS D'AVANCE</field>
 	</record>
 
 	<record id="chart117_fr" model="account.account.template">
 		<field name="code">117</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION</field>
 	</record>
 
 	<record id="chart118_fr" model="account.account.template">
 		<field name="code">118</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">IMPÔTS À RECEVOIR</field>
 	</record>
 
 	<record id="chart1181_fr" model="account.account.template">
 		<field name="code">1181</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TPS à recevoir</field>
 	</record>
 
 	<record id="chart1182_fr" model="account.account.template">
 		<field name="code">1182</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TVP/TVQ à recevoir</field>
 	</record>
 
 	<record id="chart1183_fr" model="account.account.template">
 		<field name="code">1183</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">TVH à recevoir</field>
 	</record>
 
 	<record id="chart11831_fr" model="account.account.template">
 		<field name="code">11831</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TVH à recevoir - 13%</field>
 	</record>
 
 	<record id="chart11832_fr" model="account.account.template">
 		<field name="code">11832</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TVH à recevoir - 14%</field>
 	</record>
 
 	<record id="chart11833_fr" model="account.account.template">
 		<field name="code">11833</field>
-		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="user_type_id" ref="account.data_account_type_asset"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TVH à recevoir - 15%</field>
 	</record>
 
 	<record id="chart15_fr" model="account.account.template">
 		<field name="code">15</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ACTIFS NON-COURANTS</field>
 	</record>
 
 	<record id="chart151_fr" model="account.account.template">
 		<field name="code">151</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PLACEMENTS DISPONIBLES À LA VENTE</field>
 	</record>
 
 	<record id="chart152_fr" model="account.account.template">
 		<field name="code">152</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">IMMOBILISATIONS CORPORELLES</field>
 	</record>
 
 	<record id="chart1527_fr" model="account.account.template">
 		<field name="code">1527</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">AMORTISSEMENTS CUMULÉS</field>
 	</record>
 
 	<record id="chart153_fr" model="account.account.template">
 		<field name="code">153</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">IMMOBILISATIONS INCORPORELLES</field>
 	</record>
 
 	<record id="chart1531_fr" model="account.account.template">
 		<field name="code">1531</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS</field>
 	</record>
 
@@ -177,352 +177,352 @@
 
 	<record id="chart2_fr" model="account.account.template">
 		<field name="code">2</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PASSIF</field>
 	</record>
 
 	<record id="chart21_fr" model="account.account.template">
 		<field name="code">21</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS COURANTS</field>
 	</record>
 
 	<record id="chart211_fr" model="account.account.template">
 		<field name="code">211</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">FOURNISSEURS ET COMPTES RATTACHÉS</field>
 	</record>
 
 	<record id="chart2111_fr" model="account.account.template">
 		<field name="code">2111</field>
-		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="user_type_id" ref="account.data_account_type_payable"/>
 		<field name="reconcile" eval="True"/>
 		<field name="name">Comptes fournisseurs</field>
 	</record>
 
 	<record id="chart212_fr" model="account.account.template">
 		<field name="code">212</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES COMPTES CRÉDITEURS</field>
 	</record>
 
 	<record id="chart213_fr" model="account.account.template">
 		<field name="code">213</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">IMPÔTS À PAYER</field>
 	</record>
 
 	<record id="chart2131_fr" model="account.account.template">
 		<field name="code">2131</field>
-		<field name="user_type" ref="account.data_account_type_current_liabilities"/>
+		<field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TPS à payer</field>
 	</record>
 
 	<record id="chart2132_fr" model="account.account.template">
 		<field name="code">2132</field>
-		<field name="user_type" ref="account.data_account_type_current_liabilities"/>
+		<field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TVP/TVQ à payer</field>
 	</record>
 
 	<record id="chart2133_fr" model="account.account.template">
 		<field name="code">2133</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">TVH à payer</field>
 	</record>
 
 	<record id="chart21331_fr" model="account.account.template">
 		<field name="code">21331</field>
-		<field name="user_type" ref="account.data_account_type_current_liabilities"/>
+		<field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TVH à payer - 13%</field>
 	</record>
 
 	<record id="chart21332_fr" model="account.account.template">
 		<field name="code">21332</field>
-		<field name="user_type" ref="account.data_account_type_current_liabilities"/>
+		<field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TVH à payer - 14%</field>
 	</record>
 
 	<record id="chart21333_fr" model="account.account.template">
 		<field name="code">21333</field>
-		<field name="user_type" ref="account.data_account_type_current_liabilities"/>
+		<field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
 		<field name="reconcile" eval="False"/>
 		<field name="name">TVH à payer - 15%</field>
 	</record>
 
     <record id="chart214_fr" model="account.account.template">
         <field name="code">214</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">DAS ET CONTRIBUTIONS DE L'EMPLOYEUR À PAYER</field>
     </record>
 
     <record id="chart2141_fr" model="account.account.template">
         <field name="code">2141</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">AGENCE DU REVENU DU CANADA</field>
     </record>
 
     <record id="chart21411_fr" model="account.account.template">
         <field name="code">21411</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">ASSURANCE EMPLOI À PAYER</field>
     </record>
 
     <record id="chart214111_fr" model="account.account.template">
         <field name="code">214111</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">AE - Contribution des employés</field>
     </record>
 
     <record id="chart214112_fr" model="account.account.template">
         <field name="code">214112</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">AE - Contribution de l'employeur</field>
     </record>
 
     <record id="chart21412_fr" model="account.account.template">
         <field name="code">21412</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Impôt fédéral sur les revenus</field>
     </record>
 
     <record id="chart21413_fr" model="account.account.template">
         <field name="code">21413</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">RÉGIME DE PENSIONS DU CANADA À PAYER</field>
     </record>
 
     <record id="chart214131_fr" model="account.account.template">
         <field name="code">214131</field>
 
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">RPC - Contribution des employés</field>
     </record>
 
     <record id="chart214132_fr" model="account.account.template">
         <field name="code">214132</field>
 
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">RPC - Contribution de l'employeur</field>
     </record>
 
     <record id="chart2142_fr" model="account.account.template">
         <field name="code">2142</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">AGENCE PROVINCIALE</field>
     </record>
 
     <record id="chart21421_fr" model="account.account.template">
         <field name="code">21421</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Fond des Services de Santé à payer</field>
     </record>
 
     <record id="chart21422_fr" model="account.account.template">
         <field name="code">21422</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">RÉGIME DE PENSION PROVINCIAL À PAYER</field>
     </record>
 
     <record id="chart214221_fr" model="account.account.template">
         <field name="code">214221</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Régime de pension provincial - Contribution des employés</field>
     </record>
 
     <record id="chart214222_fr" model="account.account.template">
         <field name="code">214222</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Régime de pension provincial - Contribution de l'employeur</field>
     </record>
 
     <record id="chart21423_fr" model="account.account.template">
         <field name="code">21423</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">RÉGIME PROVINCIAL D'ASSURANCE PARENTALE À PAYER</field>
     </record>
 
     <record id="chart214231_fr" model="account.account.template">
         <field name="code">214231</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Assurance parentale - Contribution des employés</field>
     </record>
 
     <record id="chart214232_fr" model="account.account.template">
         <field name="code">214232</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Assurance parentale - Contribution de l'employeur</field>
     </record>
 
     <record id="chart21424_fr" model="account.account.template">
         <field name="code">21424</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Santé et Sécurité au Travail à payer</field>
     </record>
 
     <record id="chart21425_fr" model="account.account.template">
         <field name="code">21425</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Normes du Travail à payer</field>
     </record>
 
     <record id="chart21426_fr" model="account.account.template">
         <field name="code">21426</field>
-                <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+                <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Impôt provincial sur les revenus</field>
     </record>
 
 	<record id="chart215_fr" model="account.account.template">
 		<field name="code">215</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">DETTES FINANCIÈRES COURANTES</field>
 	</record>
 
 	<record id="chart216_fr" model="account.account.template">
 		<field name="code">216</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION</field>
 	</record>
 
 	<record id="chart217_fr" model="account.account.template">
 		<field name="code">217</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS DE STOCK</field>
 	</record>
 
 	<record id="chart2171_fr" model="account.account.template">
 		<field name="code">2171</field>
-		<field name="user_type" ref="account.data_account_type_current_liabilities"/>
+		<field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
 		<field name="name">Stock reçu non facturé</field>
 	</record>
 
     <record id="chart218_fr" model="account.account.template">
         <field name="code">218</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">PASSIFS COURANTS LIÉS AUX SALAIRES</field>
     </record>
 
     <record id="chart2181_fr" model="account.account.template">
         <field name="code">2181</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Salaires à payer</field>
     </record>
 
     <record id="chart2183_fr" model="account.account.template">
         <field name="code">2183</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Bonis à payer</field>
     </record>
 
     <record id="chart2184_fr" model="account.account.template">
         <field name="code">2184</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Paie Rétroactive à payer</field>
     </record>
 
     <!-- Montants à verser dans un RVER, RPA ou autre régime collectif -->
     <record id="chart2185_fr" model="account.account.template">
         <field name="code">2185</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">RÉGIMES DE PENSION COLLECTIFS À PAYER</field>
     </record>
 
     <record id="chart218501_fr" model="account.account.template">
         <field name="code">218501</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Régimes de pension collectifs à payer - Contribution des employés</field>
     </record>
 
     <record id="chart218502_fr" model="account.account.template">
         <field name="code">218502</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Régimes de pension collectifs à payer - Contribution de l'employeur</field>
     </record>
 
     <record id="chart2186_fr" model="account.account.template">
         <field name="code">2186</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">PROVISION POUR AVANTAGES SOCIAUX</field>
     </record>
 
     <record id="chart218601_fr" model="account.account.template">
         <field name="code">218601</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Provision pour avantages sociaux - Contribution de l'employé</field>
     </record>
 
     <record id="chart218602_fr" model="account.account.template">
         <field name="code">218602</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Provision pour avantages sociaux - Contribution de l'employeur</field>
     </record>
 
 	<record id="chart25_fr" model="account.account.template">
 		<field name="code">25</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PASSIFS NON-COURANTS</field>
 	</record>
 
 	<record id="chart251_fr" model="account.account.template">
 		<field name="code">251</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">DETTES FINANCIÈRES NON-COURANTES</field>
 	</record>
 
 	<record id="chart252_fr" model="account.account.template">
 		<field name="code">252</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI</field>
 	</record>
 
     <record id="chart253_fr" model="account.account.template">
         <field name="code">253</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">IMPÔTS DIFFÉRÉS</field>
     </record>
 
     <record id="chart254_fr" model="account.account.template">
         <field name="code">254</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">PASSIFS NON-COURANTS LIÉS AUX SALAIRES</field>
     </record>
 
     <record id="chart2541_fr" model="account.account.template">
         <field name="code">2541</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">Congés Accumulés</field>
     </record>
 
     <record id="chart254101_fr" model="account.account.template">
         <field name="code">254101</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Vacances Accumulées</field>
     </record>
 
     <record id="chart254102_fr" model="account.account.template">
         <field name="code">254102</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Jours Compensatoires Accumulés</field>
     </record>
 
     <record id="chart254103_fr" model="account.account.template">
         <field name="code">254103</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Congés de Maladie Accumulés</field>
     </record>
 
     <record id="chart2542_fr" model="account.account.template">
         <field name="code">2542</field>
-        <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="name">Bonis Accumulés</field>
     </record>
 
     <record id="chart259_fr" model="account.account.template">
         <field name="code">259</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">AUTRES PASSIFS NON-COURANTS</field>
     </record>
 
@@ -530,49 +530,49 @@
 
 	<record id="chart3_fr" model="account.account.template">
 		<field name="code">3</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CAPITAUX PROPRES</field>
 	</record>
 
 	<record id="chart31_fr" model="account.account.template">
 		<field name="code">31</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CAPITAL-ACTIONS</field>
 	</record>
 
 	<record id="chart32_fr" model="account.account.template">
 		<field name="code">32</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PRIMES</field>
 	</record>
 
 	<record id="chart33_fr" model="account.account.template">
 		<field name="code">33</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">BÉNÉFICES NON RÉPARTIS</field>
 	</record>
 
 	<record id="chart34_fr" model="account.account.template">
 		<field name="code">34</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">DIVIDENDES</field>
 	</record>
 
 	<record id="chart35_fr" model="account.account.template">
 		<field name="code">35</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">ÉCARTS DE CONVERSION</field>
 	</record>
 
 	<record id="chart36_fr" model="account.account.template">
 		<field name="code">36</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">SURPLUS D'APPORT</field>
 	</record>
 
 	<record id="chart39_fr" model="account.account.template">
 		<field name="code">39</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL</field>
 	</record>
 
@@ -580,61 +580,61 @@
 
 	<record id="chart4_fr" model="account.account.template">
 		<field name="code">4</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS</field>
 	</record>
 
 	<record id="chart41_fr" model="account.account.template">
 		<field name="code">41</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS D'EXPLOITATION</field>
 	</record>
 
 	<record id="chart411_fr" model="account.account.template">
 		<field name="code">411</field>
-		<field name="user_type" ref="account.data_account_type_revenue"/>
+		<field name="user_type_id" ref="account.data_account_type_revenue"/>
 		<field name="name">Ventes</field>
 	</record>
 
 	<record id="chart412_fr" model="account.account.template">
 		<field name="code">412</field>
-		<field name="user_type" ref="account.data_account_type_revenue"/>
+		<field name="user_type_id" ref="account.data_account_type_revenue"/>
 		<field name="name">Ventes avec des provinces harmonisées</field>
 	</record>
 	
 	<record id="chart413_fr" model="account.account.template">
 		<field name="code">413</field>
-		<field name="user_type" ref="account.data_account_type_revenue"/>
+		<field name="user_type_id" ref="account.data_account_type_revenue"/>
 		<field name="name">Ventes avec des provinces non-harmonisées</field>
 	</record>
 
 	<record id="chart414_fr" model="account.account.template">
 		<field name="code">414</field>
-		<field name="user_type" ref="account.data_account_type_revenue"/>
+		<field name="user_type_id" ref="account.data_account_type_revenue"/>
 		<field name="name">Ventes à l'étranger</field>
 	</record>
 
 	<record id="chart419_fr" model="account.account.template">
 		<field name="code">419</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES PRODUITS D'EXPLOITATION</field>
 	</record>
 
 	<record id="chart42_fr" model="account.account.template">
 		<field name="code">42</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">PRODUITS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
 	<record id="chart425_fr" model="account.account.template">
 		<field name="code">425</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">INTÉRÊTS</field>
 	</record>
 
 	<record id="chart429_fr" model="account.account.template">
 		<field name="code">429</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
@@ -642,205 +642,205 @@
 
 	<record id="chart5_fr" model="account.account.template">
 		<field name="code">5</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CHARGES</field>
 	</record>
 
 	<record id="chart51_fr" model="account.account.template">
 		<field name="code">51</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">CHARGES D'EXPLOITATION</field>
 	</record>
 
 	<record id="chart511_fr" model="account.account.template">
 		<field name="code">511</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">COÛT DES PRODUITS VENDUS</field>
 	</record>
 	
         <record id="chart5111_fr" model="account.account.template">
 		<field name="code">5111</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
 		<field name="name">Achats</field>
 	</record>
 
 	<record id="chart5112_fr" model="account.account.template">
 		<field name="code">5112</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
 		<field name="name">Achats dans des provinces harmonisées</field>
 	</record>
 	
 	<record id="chart5113_fr" model="account.account.template">
 		<field name="code">5113</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
 		<field name="name">Achats dans des provinces non-harmonisées</field>
 	</record>
 
 	<record id="chart5114_fr" model="account.account.template">
 		<field name="code">5114</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
 		<field name="name">Achats à l'étranger</field>
 	</record>
 
     <record id="chart512_fr" model="account.account.template">
         <field name="code">512</field>
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">SALAIRES ET CHARGES SOCIALES</field>
     </record>
 
     <record id="chart5121_fr" model="account.account.template">
         <field name="code">5121</field>
 		
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">Salaires</field>
     </record>
 
     <record id="chart512101_fr" model="account.account.template">
         <field name="code">512101</field>
-         <field name="user_type" ref="account.data_account_type_expenses"/>
+         <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Salaires Réguliers</field>
     </record>
 
     <record id="chart512102_fr" model="account.account.template">
         <field name="code">512102</field>
 
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Bonis</field>
     </record>
 
     <record id="chart512103_fr" model="account.account.template">
         <field name="code">512103</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Paies Rétroactives</field>
     </record>
 
     <record id="chart5122_fr" model="account.account.template">
         <field name="code">5122</field>
 
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">Congés Accumulées</field>
     </record>
 
     <record id="chart512201_fr" model="account.account.template">
         <field name="code">512201</field>
-<field name="user_type" ref="account.data_account_type_expenses"/>
+<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Vacances Accumulées</field>
     </record>
 
     <record id="chart512202_fr" model="account.account.template">
         <field name="code">512202</field>
 
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Jours Compensatoires Accumulées</field>
     </record>
 
     <record id="chart512203_fr" model="account.account.template">
         <field name="code">512203</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Congés de Maladie Accumulés</field>
     </record>
 
     <record id="chart5123_fr" model="account.account.template">
         <field name="code">5123</field>
         
-        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="user_type_id" ref="account.data_account_type_view"/>
         <field name="name">Contributions de l'Employeur</field>
     </record>
 
     <record id="chart512301_fr" model="account.account.template">
         <field name="code">512301</field>
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Régime de Pensions du Canada</field>
     </record>
 
     <record id="chart512302_fr" model="account.account.template">
         <field name="code">512302</field>
         
-        <field name="user_type" ref="account.data_account_type_expenses"/>
+        <field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Assurance Emploi</field>
     </record>
 
     <record id="chart512303_fr" model="account.account.template">
         <field name="code">512303</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Régimes de pension collectifs</field>
     </record>
 
     <record id="chart512304_fr" model="account.account.template">
         <field name="code">512304</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Dépense d'avantages sociaux</field>
     </record>
 
     <record id="chart512310_fr" model="account.account.template">
         <field name="code">512310</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Régime de pension provincial</field>
     </record>
 
     <record id="chart512311_fr" model="account.account.template">
         <field name="code">512311</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Régime d'assurance parental provincial</field>
     </record>
 
     <record id="chart512312_fr" model="account.account.template">
         <field name="code">512312</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Santé et sécurité au travail</field>
     </record>
 
     <record id="chart512313_fr" model="account.account.template">
         <field name="code">512313</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Normes du travail</field>
     </record>
 
     <record id="chart512314_fr" model="account.account.template">
         <field name="code">512314</field>
-		<field name="user_type" ref="account.data_account_type_expenses"/>
+		<field name="user_type_id" ref="account.data_account_type_expenses"/>
         <field name="name">Fonds des services de santé</field>
     </record>
 
 	<record id="chart513_fr" model="account.account.template">
 		<field name="code">513</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS SUR VENTE</field>
 	</record>
 
 	<record id="chart514_fr" model="account.account.template">
 		<field name="code">514</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS GÉNÉRAUX</field>
 	</record>
 
 	<record id="chart515_fr" model="account.account.template">
 		<field name="code">515</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS DE RECHERCHE ET DÉVELOPPEMENT</field>
 	</record>
 
 	<record id="chart519_fr" model="account.account.template">
 		<field name="code">519</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES FRAIS D'EXPLOITATION</field>
 	</record>
 
 	<record id="chart52_fr" model="account.account.template">
 		<field name="code">52</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">FRAIS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 
 	<record id="chart521_fr" model="account.account.template">
 		<field name="code">521</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">INTÉRÊTS DÉBITEURS</field>
 	</record>
 
 	<record id="chart529_fr" model="account.account.template">
 		<field name="code">529</field>
-		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="user_type_id" ref="account.data_account_type_view"/>
 		<field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
 	</record>
 

addons/l10n_ca/account_chart_template_en.xml

@@ -8,12 +8,12 @@
         <field name="name">Canada - Chart of Accounts for english-speaking provinces</field>
         <field name="account_root_id" ref="chart0_en"/>
         <field name="bank_account_view_id" ref="chart111_en"/>
-        <field name="property_account_receivable" ref="chart1151_en"/>
-        <field name="property_account_payable" ref="chart2111_en"/>
-        <field name="property_account_income_categ" ref="chart411_en"/>
-        <field name="property_account_expense_categ" ref="chart5111_en"/>
-        <field name="property_stock_account_input_categ" ref="chart2141_en"/>
-        <field name="property_stock_account_output_categ" ref="chart1145_en"/>
+        <field name="property_account_receivable_id" ref="chart1151_en"/>
+        <field name="property_account_payable_id" ref="chart2111_en"/>
+        <field name="property_account_income_categ_id" ref="chart411_en"/>
+        <field name="property_account_expense_categ_id" ref="chart5111_en"/>
+        <field name="property_stock_account_input_categ_id" ref="chart2141_en"/>
+        <field name="property_stock_account_output_categ_id" ref="chart1145_en"/>
         <field name="property_stock_valuation_account_id" ref="chart1141_en"/>
         <field name="currency_id" ref="base.CAD"/>
         <field name="use_anglo_saxon" eval="True"/>

addons/l10n_ca/account_chart_template_fr.xml

@@ -7,12 +7,12 @@
         <field name="name">Canada - Plan comptable pour les provinces francophones</field>
         <field name="account_root_id" ref="chart0_fr"/>
         <field name="bank_account_view_id" ref="chart111_fr"/>
-        <field name="property_account_receivable" ref="chart1151_fr"/>
-        <field name="property_account_payable" ref="chart2111_fr"/>
-        <field name="property_account_income_categ" ref="chart411_fr"/>
-        <field name="property_account_expense_categ" ref="chart5111_fr"/>
-        <field name="property_stock_account_input_categ" ref="chart2171_fr"/>
-        <field name="property_stock_account_output_categ" ref="chart1145_fr"/>
+        <field name="property_account_receivable_id" ref="chart1151_fr"/>
+        <field name="property_account_payable_id" ref="chart2111_fr"/>
+        <field name="property_account_income_categ_id" ref="chart411_fr"/>
+        <field name="property_account_expense_categ_id" ref="chart5111_fr"/>
+        <field name="property_stock_account_input_categ_id" ref="chart2171_fr"/>
+        <field name="property_stock_account_output_categ_id" ref="chart1145_fr"/>
         <field name="property_stock_valuation_account_id" ref="chart1141_fr"/>
         <field name="currency_id" ref="base.CAD"/>
         <field name="use_anglo_saxon" eval="True"/>

addons/l10n_cl/l10n_cl_chart.xml

@@ -50,194 +50,194 @@
 	<record model="account.account.template" id="pcge">
 	  <field name="name">Chile</field>
 	  <field name="code">pcge</field>
-	  <field ref="account_account_type_view" name="user_type"/>
+	  <field ref="account_account_type_view" name="user_type_id"/>
 	</record>
 		<record model="account.account.template" id="_1_BG">
 		  <field name="name">inventario del Balance General</field>
 		  <field name="code">.1.BG</field>
 		  <field name="reconcile" eval="False"/>
-		  <field ref="account_account_type_view" name="user_type"/>
+		  <field ref="account_account_type_view" name="user_type_id"/>
 		</record>
-			<record id="1" model="account.account.template"><field name="name">ACTIVOS</field><field name="code">1</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-			<record id="11" model="account.account.template"><field name="name">Activo Circulante</field><field name="code">11</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="111" model="account.account.template"><field name="name">Activo Circulante - Caja</field><field name="code">111</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="111_001" model="account.account.template"><field name="name">Activo Circulante - Caja / efectivo CLP</field><field name="code">111.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="112" model="account.account.template"><field name="name">Activo Circulante - Moneda Extranjera</field><field name="code">112</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="112_001" model="account.account.template"><field name="name">Activo Circulante - Caja / efectivo USD</field><field name="code">112.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/><field name="currency_id" ref="base.USD"/></record>
-            <record id="113" model="account.account.template"><field name="name">Activo Circulante - Fondos fijos</field><field name="code">113</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="113_001" model="account.account.template"><field name="name">Activo Circulante - Fondos fijos / caja chica 01 CLP</field><field name="code">113.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="114" model="account.account.template"><field name="name">Activo Circulante - Bancos</field><field name="code">114</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="114_001" model="account.account.template"><field name="name">Activo Circulante.../ BCO. CTA CTE CLP</field><field name="code">114.001</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="115" model="account.account.template"><field name="name">Activo Circulante - Valores a Depositar </field><field name="code">115</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="116" model="account.account.template"><field name="name">Activo Circulante - Recaudaciones a Depositar </field><field name="code">116</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type"/></record>
-            <record id="12" model="account.account.template"><field name="name">Documentos por Cobrar</field><field name="code">12</field><field name="reconcile" eval="True"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="121" model="account.account.template"><field name="name">Documentos por Cobrar / Deudores por Ventas</field><field name="code">121</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="122" model="account.account.template"><field name="name">Documentos por Cobrar / Deudores Morosos</field><field name="code">122</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="123" model="account.account.template"><field name="name">Documentos por Cobrar / Deudores en Gestión Judicial</field><field name="code">123</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/></record>
-            <record id="124" model="account.account.template"><field name="name">Documentos por Cobrar / Deudores Varios</field><field name="code">124</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/></record>
-            <record id="125" model="account.account.template"><field name="name">Documentos por Cobrar / (-) Previsión para Incobrables</field><field name="code">125</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="13" model="account.account.template"><field name="name">Cuentas por Cobrar</field><field name="code">13</field><field name="reconcile" eval="True"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="131" model="account.account.template"><field name="name">Cuentas por Cobrar / Préstamos otorgados</field><field name="code">131</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="132" model="account.account.template"><field name="name">Cuentas por Cobrar / Anticipos a Proveedores</field><field name="code">132</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="133" model="account.account.template"><field name="name">Cuentas por Cobrar / Anticipo de Impuestos</field><field name="code">133</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="134" model="account.account.template"><field name="name">Cuentas por Cobrar / Anticipo al Personal</field><field name="code">134</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="135" model="account.account.template"><field name="name">Cuentas por Cobrar / Alquileres Pagados por Adelantado</field><field name="code">135</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="136" model="account.account.template"><field name="name">Cuentas por Cobrar / Intereses Pagados por Adelantado</field><field name="code">136</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="137" model="account.account.template"><field name="name">Cuentas por Cobrar / Accionistas</field><field name="code">137</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="138" model="account.account.template"><field name="name">Cuentas por Cobrar / (-) Previsión para Descuentos</field><field name="code">138</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="139" model="account.account.template"><field name="name">Cuentas por Cobrar / (-) Intereses (+) a Devengar</field><field name="code">139</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type"/></record>
-            <record id="14" model="account.account.template"><field name="name">Inversiones Financieras</field><field name="code">14</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="141" model="account.account.template"><field name="name">Inversiones / Acciones Transitorias</field><field name="code">141</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type"/></record>
-            <record id="142" model="account.account.template"><field name="name">Inversiones / Acciones Permanentes</field><field name="code">142</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type"/></record>
-            <record id="143" model="account.account.template"><field name="name">Inversiones / Títulos Públicos</field><field name="code">143</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type"/></record>
-            <record id="144" model="account.account.template"><field name="name">Inversiones / (-) Previsión para Devalorización de Acciones</field><field name="code">144</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type"/></record>
-            <record id="15" model="account.account.template"><field name="name">Existencias</field><field name="code">15</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="151" model="account.account.template"><field name="name">Existencias - Mercaderías</field><field name="code">151</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="151_01" model="account.account.template"><field name="name">Existencias - Mercaderías / Categoria de productos 01</field><field name="code">151.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="152" model="account.account.template"><field name="name">Existencias - Mercaderías en Tránsito</field><field name="code">152</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="153" model="account.account.template"><field name="name">Materias primas</field><field name="code">153</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="154" model="account.account.template"><field name="name">Productos en Curso de Elaboración</field><field name="code">154</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="155" model="account.account.template"><field name="name">Productos Elaborados</field><field name="code">155</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="156" model="account.account.template"><field name="name">Materiales Varios </field><field name="code">156</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="157" model="account.account.template"><field name="name">(-) Previsión para Desvalorización de Existencias</field><field name="code">157</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type"/></record>
-            <record id="16" model="account.account.template"><field name="name">Activo Fijo</field><field name="code">16</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="161" model="account.account.template"><field name="name">Activo Fijo / Inmuebles</field><field name="code">161</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="162" model="account.account.template"><field name="name">Activo Fijo / Maquinaria</field><field name="code">162</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="163" model="account.account.template"><field name="name">Activo Fijo / Equipos</field><field name="code">163</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="164" model="account.account.template"><field name="name">Activo Fijo / Material Rodante Motorizado</field><field name="code">164</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="165" model="account.account.template"><field name="name">Activo Fijo / (-) Depreciación Acumulada</field><field name="code">165</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="17" model="account.account.template"><field name="name">Activo Intangible</field><field name="code">17</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="171" model="account.account.template"><field name="name">Activo Intangible / Derecho de Llaves</field><field name="code">171</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="172" model="account.account.template"><field name="name">Activo Intangible / Concesiones y Franquicias</field><field name="code">172</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="173" model="account.account.template"><field name="name">Activo Intangible / Marcas y Patentes de Invención</field><field name="code">173</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="174" model="account.account.template"><field name="name">Activo Intangible / (-) Amortización Acumulada</field><field name="code">174</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type"/></record>
-            <record id="2" model="account.account.template"><field name="name">PASIVOS</field><field name="code">2</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="21" model="account.account.template"><field name="name">Cuentas por Pagar</field><field name="code">21</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="211" model="account.account.template"><field name="name">Cuentas por Pagar / Proveedores</field><field name="code">211</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="212" model="account.account.template"><field name="name">Cuentas por Pagar / Anticipos de Clientes</field><field name="code">212</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="213" model="account.account.template"><field name="name">Cuentas por Pagar / (-) Intereses a Devengar por Compras al Crédito</field><field name="code">213</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type"/><field name="reconcile">1</field></record>
-            <record id="22" model="account.account.template"><field name="name">Pasivo Circulante</field><field name="code">22</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="221" model="account.account.template"><field name="name">Pasivo Circulante / Adelantos en Cuenta Corriente</field><field name="code">221</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="222" model="account.account.template"><field name="name">Pasivo Circulante / Prestamos</field><field name="code">222</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="223" model="account.account.template"><field name="name">Pasivo Circulante / Obligaciones a Pagar</field><field name="code">223</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="224" model="account.account.template"><field name="name">Pasivo Circulante / Intereses a Pagar</field><field name="code">224</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="225" model="account.account.template"><field name="name">Pasivo Circulante / Debentures Emitidos</field><field name="code">225</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type"/></record>
-            <record id="23" model="account.account.template"><field name="name">Impuestos por Pagar</field><field name="code">23</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="231" model="account.account.template"><field name="name">Impuestos por Pagar / IVA a Pagar</field><field name="code">231</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type"/></record>
-            <record id="232" model="account.account.template"><field name="name">Impuestos por Pagar / Impuesto a la Renta a Pagar</field><field name="code">232</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type"/></record>
-            <record id="24" model="account.account.template"><field name="name">Remuneraciones por Pagar</field><field name="code">24</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="241" model="account.account.template"><field name="name">Remuneraciones por Pagar / Sueldos a Pagar</field><field name="code">241</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type"/></record>
-            <record id="242" model="account.account.template"><field name="name">Remuneraciones por Pagar / Cargas Sociales a Pagar</field><field name="code">242</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type"/></record>
-            <record id="243" model="account.account.template"><field name="name">Remuneraciones por Pagar / Provisión para Sueldo Anual Complementario</field><field name="code">243</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type"/></record>
-            <record id="244" model="account.account.template"><field name="name">Remuneraciones por Pagar / Retenciones a Depositar</field><field name="code">244</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type"/></record>
-            <record id="25" model="account.account.template"><field name="name">Otras Cuentas por Pagar</field><field name="code">25</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="251" model="account.account.template"><field name="name">Otras Cuentas por Pagar / Acreedores Varios</field><field name="code">251</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="252" model="account.account.template"><field name="name">Otras Cuentas por Pagar / Dividendos a Pagar</field><field name="code">252</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="253" model="account.account.template"><field name="name">Otras Cuentas por Pagar / Cobros por Adelantado</field><field name="code">253</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="254" model="account.account.template"><field name="name">Otras Cuentas por Pagar / Honorarios Directores y Síndicos a Pagar</field><field name="code">254</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="26" model="account.account.template"><field name="name">Provisiones</field><field name="code">26</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="261" model="account.account.template"><field name="name">Provisiones / Previsión Indemnización por Despidos</field><field name="code">261</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="262" model="account.account.template"><field name="name">Provisiones / Previsión para juicios Pendientes</field><field name="code">262</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="263" model="account.account.template"><field name="name">Provisiones / Previsión para Garantías por Service</field><field name="code">263</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type"/></record>
-            <record id="3" model="account.account.template"><field name="name">PATRIMONIO</field><field name="code">3</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="31" model="account.account.template"><field name="name">Capital</field><field name="code">31</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="311" model="account.account.template"><field name="name">Capital / Capital Propio</field><field name="code">311</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="312" model="account.account.template"><field name="name">Capital / Acciones en Circulación</field><field name="code">312</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="313" model="account.account.template"><field name="name">Capital / Dividendos a Distribuir en Acciones</field><field name="code">313</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="314" model="account.account.template"><field name="name">Capital / (-) Descuento de Emisión de Acciones</field><field name="code">314</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="32" model="account.account.template"><field name="name">Aportes No Capitalizados</field><field name="code">32</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="321" model="account.account.template"><field name="name">Aportes No Capitalizados / Primas de Emsión</field><field name="code">321</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="322" model="account.account.template"><field name="name">Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones</field><field name="code">322</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="33" model="account.account.template"><field name="name">Ajustes al Patrimonio</field><field name="code">33</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="331" model="account.account.template"><field name="name">Ajustes al Patrimonio / Revaluo Técnico de Activo Fijo</field><field name="code">331</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="34" model="account.account.template"><field name="name">Futuras Eventualidades</field><field name="code">34</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="341" model="account.account.template"><field name="name">Reserva Legal</field><field name="code">341</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="342" model="account.account.template"><field name="name">Reserva Estatutaria</field><field name="code">342</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="343" model="account.account.template"><field name="name">Reserva Facultativa</field><field name="code">343</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="344" model="account.account.template"><field name="name">Reserva para Renovación de Activo Fijo</field><field name="code">344</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="35" model="account.account.template"><field name="name">Resultados No Asignados</field><field name="code">35</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="351" model="account.account.template"><field name="name">Resultados Acumulados</field><field name="code">351</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="352" model="account.account.template"><field name="name">Resultados Acumulados del Ejercicio Anterior</field><field name="code">352</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="353" model="account.account.template"><field name="name">Utilidades y Pérdidas del Ejercicio</field><field name="code">353</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
-            <record id="354" model="account.account.template"><field name="name">Resultado del Ejercicio</field><field name="code">354</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type"/></record>
+			<record id="1" model="account.account.template"><field name="name">ACTIVOS</field><field name="code">1</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+			<record id="11" model="account.account.template"><field name="name">Activo Circulante</field><field name="code">11</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="111" model="account.account.template"><field name="name">Activo Circulante - Caja</field><field name="code">111</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="111_001" model="account.account.template"><field name="name">Activo Circulante - Caja / efectivo CLP</field><field name="code">111.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="112" model="account.account.template"><field name="name">Activo Circulante - Moneda Extranjera</field><field name="code">112</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="112_001" model="account.account.template"><field name="name">Activo Circulante - Caja / efectivo USD</field><field name="code">112.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/><field name="currency_id" ref="base.USD"/></record>
+            <record id="113" model="account.account.template"><field name="name">Activo Circulante - Fondos fijos</field><field name="code">113</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="113_001" model="account.account.template"><field name="name">Activo Circulante - Fondos fijos / caja chica 01 CLP</field><field name="code">113.001</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="114" model="account.account.template"><field name="name">Activo Circulante - Bancos</field><field name="code">114</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="114_001" model="account.account.template"><field name="name">Activo Circulante.../ BCO. CTA CTE CLP</field><field name="code">114.001</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="115" model="account.account.template"><field name="name">Activo Circulante - Valores a Depositar </field><field name="code">115</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="116" model="account.account.template"><field name="name">Activo Circulante - Recaudaciones a Depositar </field><field name="code">116</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_10" name="user_type_id"/></record>
+            <record id="12" model="account.account.template"><field name="name">Documentos por Cobrar</field><field name="code">12</field><field name="reconcile" eval="True"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="121" model="account.account.template"><field name="name">Documentos por Cobrar / Deudores por Ventas</field><field name="code">121</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="122" model="account.account.template"><field name="name">Documentos por Cobrar / Deudores Morosos</field><field name="code">122</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="123" model="account.account.template"><field name="name">Documentos por Cobrar / Deudores en Gestión Judicial</field><field name="code">123</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/></record>
+            <record id="124" model="account.account.template"><field name="name">Documentos por Cobrar / Deudores Varios</field><field name="code">124</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/></record>
+            <record id="125" model="account.account.template"><field name="name">Documentos por Cobrar / (-) Previsión para Incobrables</field><field name="code">125</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_ACC_30" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="13" model="account.account.template"><field name="name">Cuentas por Cobrar</field><field name="code">13</field><field name="reconcile" eval="True"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="131" model="account.account.template"><field name="name">Cuentas por Cobrar / Préstamos otorgados</field><field name="code">131</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="132" model="account.account.template"><field name="name">Cuentas por Cobrar / Anticipos a Proveedores</field><field name="code">132</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="133" model="account.account.template"><field name="name">Cuentas por Cobrar / Anticipo de Impuestos</field><field name="code">133</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="134" model="account.account.template"><field name="name">Cuentas por Cobrar / Anticipo al Personal</field><field name="code">134</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="135" model="account.account.template"><field name="name">Cuentas por Cobrar / Alquileres Pagados por Adelantado</field><field name="code">135</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="136" model="account.account.template"><field name="name">Cuentas por Cobrar / Intereses Pagados por Adelantado</field><field name="code">136</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="137" model="account.account.template"><field name="name">Cuentas por Cobrar / Accionistas</field><field name="code">137</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="138" model="account.account.template"><field name="name">Cuentas por Cobrar / (-) Previsión para Descuentos</field><field name="code">138</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="139" model="account.account.template"><field name="name">Cuentas por Cobrar / (-) Intereses (+) a Devengar</field><field name="code">139</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_50" name="user_type_id"/></record>
+            <record id="14" model="account.account.template"><field name="name">Inversiones Financieras</field><field name="code">14</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="141" model="account.account.template"><field name="name">Inversiones / Acciones Transitorias</field><field name="code">141</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type_id"/></record>
+            <record id="142" model="account.account.template"><field name="name">Inversiones / Acciones Permanentes</field><field name="code">142</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type_id"/></record>
+            <record id="143" model="account.account.template"><field name="name">Inversiones / Títulos Públicos</field><field name="code">143</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type_id"/></record>
+            <record id="144" model="account.account.template"><field name="name">Inversiones / (-) Previsión para Devalorización de Acciones</field><field name="code">144</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_20" name="user_type_id"/></record>
+            <record id="15" model="account.account.template"><field name="name">Existencias</field><field name="code">15</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="151" model="account.account.template"><field name="name">Existencias - Mercaderías</field><field name="code">151</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="151_01" model="account.account.template"><field name="name">Existencias - Mercaderías / Categoria de productos 01</field><field name="code">151.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="152" model="account.account.template"><field name="name">Existencias - Mercaderías en Tránsito</field><field name="code">152</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="153" model="account.account.template"><field name="name">Materias primas</field><field name="code">153</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="154" model="account.account.template"><field name="name">Productos en Curso de Elaboración</field><field name="code">154</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="155" model="account.account.template"><field name="name">Productos Elaborados</field><field name="code">155</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="156" model="account.account.template"><field name="name">Materiales Varios </field><field name="code">156</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="157" model="account.account.template"><field name="name">(-) Previsión para Desvalorización de Existencias</field><field name="code">157</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACC_60" name="user_type_id"/></record>
+            <record id="16" model="account.account.template"><field name="name">Activo Fijo</field><field name="code">16</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="161" model="account.account.template"><field name="name">Activo Fijo / Inmuebles</field><field name="code">161</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="162" model="account.account.template"><field name="name">Activo Fijo / Maquinaria</field><field name="code">162</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="163" model="account.account.template"><field name="name">Activo Fijo / Equipos</field><field name="code">163</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="164" model="account.account.template"><field name="name">Activo Fijo / Material Rodante Motorizado</field><field name="code">164</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="165" model="account.account.template"><field name="name">Activo Fijo / (-) Depreciación Acumulada</field><field name="code">165</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="17" model="account.account.template"><field name="name">Activo Intangible</field><field name="code">17</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="171" model="account.account.template"><field name="name">Activo Intangible / Derecho de Llaves</field><field name="code">171</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="172" model="account.account.template"><field name="name">Activo Intangible / Concesiones y Franquicias</field><field name="code">172</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="173" model="account.account.template"><field name="name">Activo Intangible / Marcas y Patentes de Invención</field><field name="code">173</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="174" model="account.account.template"><field name="name">Activo Intangible / (-) Amortización Acumulada</field><field name="code">174</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_ACN_50" name="user_type_id"/></record>
+            <record id="2" model="account.account.template"><field name="name">PASIVOS</field><field name="code">2</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="21" model="account.account.template"><field name="name">Cuentas por Pagar</field><field name="code">21</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="211" model="account.account.template"><field name="name">Cuentas por Pagar / Proveedores</field><field name="code">211</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="212" model="account.account.template"><field name="name">Cuentas por Pagar / Anticipos de Clientes</field><field name="code">212</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="213" model="account.account.template"><field name="name">Cuentas por Pagar / (-) Intereses a Devengar por Compras al Crédito</field><field name="code">213</field><field name="reconcile" eval="True"/><field ref="account_account_type_BG_PAC_20" name="user_type_id"/><field name="reconcile">1</field></record>
+            <record id="22" model="account.account.template"><field name="name">Pasivo Circulante</field><field name="code">22</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="221" model="account.account.template"><field name="name">Pasivo Circulante / Adelantos en Cuenta Corriente</field><field name="code">221</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="222" model="account.account.template"><field name="name">Pasivo Circulante / Prestamos</field><field name="code">222</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="223" model="account.account.template"><field name="name">Pasivo Circulante / Obligaciones a Pagar</field><field name="code">223</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="224" model="account.account.template"><field name="name">Pasivo Circulante / Intereses a Pagar</field><field name="code">224</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="225" model="account.account.template"><field name="name">Pasivo Circulante / Debentures Emitidos</field><field name="code">225</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_10" name="user_type_id"/></record>
+            <record id="23" model="account.account.template"><field name="name">Impuestos por Pagar</field><field name="code">23</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="231" model="account.account.template"><field name="name">Impuestos por Pagar / IVA a Pagar</field><field name="code">231</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type_id"/></record>
+            <record id="232" model="account.account.template"><field name="name">Impuestos por Pagar / Impuesto a la Renta a Pagar</field><field name="code">232</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_40" name="user_type_id"/></record>
+            <record id="24" model="account.account.template"><field name="name">Remuneraciones por Pagar</field><field name="code">24</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="241" model="account.account.template"><field name="name">Remuneraciones por Pagar / Sueldos a Pagar</field><field name="code">241</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type_id"/></record>
+            <record id="242" model="account.account.template"><field name="name">Remuneraciones por Pagar / Cargas Sociales a Pagar</field><field name="code">242</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type_id"/></record>
+            <record id="243" model="account.account.template"><field name="name">Remuneraciones por Pagar / Provisión para Sueldo Anual Complementario</field><field name="code">243</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type_id"/></record>
+            <record id="244" model="account.account.template"><field name="name">Remuneraciones por Pagar / Retenciones a Depositar</field><field name="code">244</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_35" name="user_type_id"/></record>
+            <record id="25" model="account.account.template"><field name="name">Otras Cuentas por Pagar</field><field name="code">25</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="251" model="account.account.template"><field name="name">Otras Cuentas por Pagar / Acreedores Varios</field><field name="code">251</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="252" model="account.account.template"><field name="name">Otras Cuentas por Pagar / Dividendos a Pagar</field><field name="code">252</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="253" model="account.account.template"><field name="name">Otras Cuentas por Pagar / Cobros por Adelantado</field><field name="code">253</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="254" model="account.account.template"><field name="name">Otras Cuentas por Pagar / Honorarios Directores y Síndicos a Pagar</field><field name="code">254</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="26" model="account.account.template"><field name="name">Provisiones</field><field name="code">26</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="261" model="account.account.template"><field name="name">Provisiones / Previsión Indemnización por Despidos</field><field name="code">261</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="262" model="account.account.template"><field name="name">Provisiones / Previsión para juicios Pendientes</field><field name="code">262</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="263" model="account.account.template"><field name="name">Provisiones / Previsión para Garantías por Service</field><field name="code">263</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PAC_45" name="user_type_id"/></record>
+            <record id="3" model="account.account.template"><field name="name">PATRIMONIO</field><field name="code">3</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="31" model="account.account.template"><field name="name">Capital</field><field name="code">31</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="311" model="account.account.template"><field name="name">Capital / Capital Propio</field><field name="code">311</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="312" model="account.account.template"><field name="name">Capital / Acciones en Circulación</field><field name="code">312</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="313" model="account.account.template"><field name="name">Capital / Dividendos a Distribuir en Acciones</field><field name="code">313</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="314" model="account.account.template"><field name="name">Capital / (-) Descuento de Emisión de Acciones</field><field name="code">314</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="32" model="account.account.template"><field name="name">Aportes No Capitalizados</field><field name="code">32</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="321" model="account.account.template"><field name="name">Aportes No Capitalizados / Primas de Emsión</field><field name="code">321</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="322" model="account.account.template"><field name="name">Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones</field><field name="code">322</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="33" model="account.account.template"><field name="name">Ajustes al Patrimonio</field><field name="code">33</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="331" model="account.account.template"><field name="name">Ajustes al Patrimonio / Revaluo Técnico de Activo Fijo</field><field name="code">331</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="34" model="account.account.template"><field name="name">Futuras Eventualidades</field><field name="code">34</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="341" model="account.account.template"><field name="name">Reserva Legal</field><field name="code">341</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="342" model="account.account.template"><field name="name">Reserva Estatutaria</field><field name="code">342</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="343" model="account.account.template"><field name="name">Reserva Facultativa</field><field name="code">343</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="344" model="account.account.template"><field name="name">Reserva para Renovación de Activo Fijo</field><field name="code">344</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="35" model="account.account.template"><field name="name">Resultados No Asignados</field><field name="code">35</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="351" model="account.account.template"><field name="name">Resultados Acumulados</field><field name="code">351</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="352" model="account.account.template"><field name="name">Resultados Acumulados del Ejercicio Anterior</field><field name="code">352</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="353" model="account.account.template"><field name="name">Utilidades y Pérdidas del Ejercicio</field><field name="code">353</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
+            <record id="354" model="account.account.template"><field name="name">Resultado del Ejercicio</field><field name="code">354</field><field name="reconcile" eval="False"/><field ref="account_account_type_BG_PTN_10" name="user_type_id"/></record>
             
 		<record model="account.account.template" id="_2_GP">
 		  <field name="name">Cuentas de Resultado</field>
 		  <field name="code">.2.GP</field>
 		  <field name="reconcile" eval="False"/>
-		  <field ref="account_account_type_view" name="user_type"/>
+		  <field ref="account_account_type_view" name="user_type_id"/>
 		</record>
-            <record id="4" model="account.account.template"><field name="name">RESULTADO GANANCIA</field><field name="code">4</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="41" model="account.account.template"><field name="name">Ingresos de Explotación</field><field name="code">41</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="411" model="account.account.template"><field name="name">Ventas</field><field name="code">411</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="411_01" model="account.account.template"><field name="name">Ventas - Categoria de productos 01</field><field name="code">411.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_010" name="user_type"/></record>
-            <record id="412" model="account.account.template"><field name="name">Intereses gananados, obtenidos, percibidos</field><field name="code">412</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_060" name="user_type"/></record>
-            <record id="413" model="account.account.template"><field name="name">Alquileres gananados, obtenidos, percibidos</field><field name="code">413</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="414" model="account.account.template"><field name="name">Comisiones gananados, obtenidos, percibidos</field><field name="code">414</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="415" model="account.account.template"><field name="name">Descuentos gananados, obtenidos, percibidos</field><field name="code">415</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="416" model="account.account.template"><field name="name">Interese sobre Inversiones</field><field name="code">416</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="417" model="account.account.template"><field name="name">Honorarios gananados, obtenidos, percibidos</field><field name="code">417</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="418" model="account.account.template"><field name="name">Ganancia Venta de Acciones</field><field name="code">418</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="42" model="account.account.template"><field name="name">Ingresos Fuera de Explotación</field><field name="code">42</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="421" model="account.account.template"><field name="name">Recupero de Rezagos</field><field name="code">421</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="422" model="account.account.template"><field name="name">Recupero de Deudores Incobrables</field><field name="code">422</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="423" model="account.account.template"><field name="name">Ganancia Venta de Activo Fijo</field><field name="code">423</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="424" model="account.account.template"><field name="name">Donaciones obtenidas, ganandas, percibidas</field><field name="code">424</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="425" model="account.account.template"><field name="name">Ganancia Venta Inversiones Permanentes</field><field name="code">425</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type"/></record>
-            <record id="5" model="account.account.template"><field name="name">RESULTADO PÉRDIDA</field><field name="code">5</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="51" model="account.account.template"><field name="name">Egresos de Explotación</field><field name="code">51</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="511" model="account.account.template"><field name="name">Costo de Mercaderías Vendidas</field><field name="code">511</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="511_01" model="account.account.template"><field name="name">Costo de Mercaderías Vendidas - Categoria de productos 01</field><field name="code">511.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_030" name="user_type"/></record>
-            <record id="512" model="account.account.template"><field name="name">Gastos en Depreciación de Activo Fijo</field><field name="code">512</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
-            <record id="513" model="account.account.template"><field name="name">Gastos en Amortización</field><field name="code">513</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
-            <record id="514" model="account.account.template"><field name="name">Gastos en Sueldos y Jornales</field><field name="code">514</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type"/></record>
-            <record id="515" model="account.account.template"><field name="name">Gastos en Cargas Sociales</field><field name="code">515</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type"/></record>
-            <record id="516" model="account.account.template"><field name="name">Gastos en Impuestos</field><field name="code">516</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="517" model="account.account.template"><field name="name">Gastos Bancarios</field><field name="code">517</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="518" model="account.account.template"><field name="name">Gastos en Servicios Públicos</field><field name="code">518</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="519" model="account.account.template"><field name="name">Gastos de Publicidad y Propaganda</field><field name="code">519</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_050" name="user_type"/></record>
-            <record id="52" model="account.account.template"><field name="name">Egresos Fuera de Explotación</field><field name="code">52</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="521" model="account.account.template"><field name="name">Gastos en Siniestros</field><field name="code">521</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
-            <record id="522" model="account.account.template"><field name="name">Donaciones Cedidas, Otorgadas</field><field name="code">522</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
-            <record id="523" model="account.account.template"><field name="name">Pérdida Venta Activo Fijo</field><field name="code">523</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type"/></record>
+            <record id="4" model="account.account.template"><field name="name">RESULTADO GANANCIA</field><field name="code">4</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="41" model="account.account.template"><field name="name">Ingresos de Explotación</field><field name="code">41</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="411" model="account.account.template"><field name="name">Ventas</field><field name="code">411</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="411_01" model="account.account.template"><field name="name">Ventas - Categoria de productos 01</field><field name="code">411.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_010" name="user_type_id"/></record>
+            <record id="412" model="account.account.template"><field name="name">Intereses gananados, obtenidos, percibidos</field><field name="code">412</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_060" name="user_type_id"/></record>
+            <record id="413" model="account.account.template"><field name="name">Alquileres gananados, obtenidos, percibidos</field><field name="code">413</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="414" model="account.account.template"><field name="name">Comisiones gananados, obtenidos, percibidos</field><field name="code">414</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="415" model="account.account.template"><field name="name">Descuentos gananados, obtenidos, percibidos</field><field name="code">415</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="416" model="account.account.template"><field name="name">Interese sobre Inversiones</field><field name="code">416</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="417" model="account.account.template"><field name="name">Honorarios gananados, obtenidos, percibidos</field><field name="code">417</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="418" model="account.account.template"><field name="name">Ganancia Venta de Acciones</field><field name="code">418</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="42" model="account.account.template"><field name="name">Ingresos Fuera de Explotación</field><field name="code">42</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="421" model="account.account.template"><field name="name">Recupero de Rezagos</field><field name="code">421</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="422" model="account.account.template"><field name="name">Recupero de Deudores Incobrables</field><field name="code">422</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="423" model="account.account.template"><field name="name">Ganancia Venta de Activo Fijo</field><field name="code">423</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="424" model="account.account.template"><field name="name">Donaciones obtenidas, ganandas, percibidas</field><field name="code">424</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="425" model="account.account.template"><field name="name">Ganancia Venta Inversiones Permanentes</field><field name="code">425</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_080" name="user_type_id"/></record>
+            <record id="5" model="account.account.template"><field name="name">RESULTADO PÉRDIDA</field><field name="code">5</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="51" model="account.account.template"><field name="name">Egresos de Explotación</field><field name="code">51</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="511" model="account.account.template"><field name="name">Costo de Mercaderías Vendidas</field><field name="code">511</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="511_01" model="account.account.template"><field name="name">Costo de Mercaderías Vendidas - Categoria de productos 01</field><field name="code">511.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_030" name="user_type_id"/></record>
+            <record id="512" model="account.account.template"><field name="name">Gastos en Depreciación de Activo Fijo</field><field name="code">512</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
+            <record id="513" model="account.account.template"><field name="name">Gastos en Amortización</field><field name="code">513</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
+            <record id="514" model="account.account.template"><field name="name">Gastos en Sueldos y Jornales</field><field name="code">514</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type_id"/></record>
+            <record id="515" model="account.account.template"><field name="name">Gastos en Cargas Sociales</field><field name="code">515</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type_id"/></record>
+            <record id="516" model="account.account.template"><field name="name">Gastos en Impuestos</field><field name="code">516</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="517" model="account.account.template"><field name="name">Gastos Bancarios</field><field name="code">517</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="518" model="account.account.template"><field name="name">Gastos en Servicios Públicos</field><field name="code">518</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="519" model="account.account.template"><field name="name">Gastos de Publicidad y Propaganda</field><field name="code">519</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_050" name="user_type_id"/></record>
+            <record id="52" model="account.account.template"><field name="name">Egresos Fuera de Explotación</field><field name="code">52</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="521" model="account.account.template"><field name="name">Gastos en Siniestros</field><field name="code">521</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
+            <record id="522" model="account.account.template"><field name="name">Donaciones Cedidas, Otorgadas</field><field name="code">522</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
+            <record id="523" model="account.account.template"><field name="name">Pérdida Venta Activo Fijo</field><field name="code">523</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_090" name="user_type_id"/></record>
             
         <record model="account.account.template" id="_3_CC">
 		  <field name="name">Cuentas de Movimiento</field>
 		  <field name="code">.3.CC</field>
 		  <field name="reconcile" eval="False"/>
-		  <field ref="account_account_type_view" name="user_type"/>
+		  <field ref="account_account_type_view" name="user_type_id"/>
 		</record>
-            <record id="61" model="account.account.template"><field name="name">Compras</field><field name="code">61</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="61_01" model="account.account.template"><field name="name">Compras - Categoria de productos 01</field><field name="code">61.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_NA_010" name="user_type"/></record>
-            <record id="62" model="account.account.template"><field name="name">Costos de Producción</field><field name="code">62</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_030" name="user_type"/></record>
-            <record id="63" model="account.account.template"><field name="name">Gastos de Administración</field><field name="code">63</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type"/></record>
-            <record id="64" model="account.account.template"><field name="name">Gastos de Comercialización</field><field name="code">64</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_050" name="user_type"/></record>
+            <record id="61" model="account.account.template"><field name="name">Compras</field><field name="code">61</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="61_01" model="account.account.template"><field name="name">Compras - Categoria de productos 01</field><field name="code">61.01</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_NA_010" name="user_type_id"/></record>
+            <record id="62" model="account.account.template"><field name="name">Costos de Producción</field><field name="code">62</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_030" name="user_type_id"/></record>
+            <record id="63" model="account.account.template"><field name="name">Gastos de Administración</field><field name="code">63</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_040" name="user_type_id"/></record>
+            <record id="64" model="account.account.template"><field name="name">Gastos de Comercialización</field><field name="code">64</field><field name="reconcile" eval="False"/><field ref="account_account_type_EGP_FU_050" name="user_type_id"/></record>
         
         <record model="account.account.template" id="_4_CO">
 		  <field name="name">Cuentas de Orden</field>
 		  <field name="code">.4.CO</field>
 		  <field name="reconcile" eval="False"/>
-		  <field ref="account_account_type_view" name="user_type"/>
+		  <field ref="account_account_type_view" name="user_type_id"/>
 		</record>
-            <record id="71" model="account.account.template"><field name="name">CUENTAS DE ORDEN DEUDORAS</field><field name="code">71</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="711" model="account.account.template"><field name="name">Mercaderias Recibidas en Consignación</field><field name="code">711</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="712" model="account.account.template"><field name="name">Depósito de Valores Recibos en Garantía</field><field name="code">712</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="713" model="account.account.template"><field name="name">Garantias Otorgadas</field><field name="code">713</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="714" model="account.account.template"><field name="name">Documentos Descontados</field><field name="code">714</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="715" model="account.account.template"><field name="name">Documentos Endosados</field><field name="code">715</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="72" model="account.account.template"><field name="name">CUENTAS DE ORDEN ACREEDORAS</field><field name="code">72</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type"/></record>
-            <record id="721" model="account.account.template"><field name="name">Comitente por Mercaderias Recibidas en Consignación</field><field name="code">721</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="722" model="account.account.template"><field name="name">Acreedor por Garantías Otorgadas</field><field name="code">722</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
-            <record id="723" model="account.account.template"><field name="name">Acreedor por Documentos Descontados</field><field name="code">723</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type"/></record>
+            <record id="71" model="account.account.template"><field name="name">CUENTAS DE ORDEN DEUDORAS</field><field name="code">71</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="711" model="account.account.template"><field name="name">Mercaderias Recibidas en Consignación</field><field name="code">711</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="712" model="account.account.template"><field name="name">Depósito de Valores Recibos en Garantía</field><field name="code">712</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="713" model="account.account.template"><field name="name">Garantias Otorgadas</field><field name="code">713</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="714" model="account.account.template"><field name="name">Documentos Descontados</field><field name="code">714</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="715" model="account.account.template"><field name="name">Documentos Endosados</field><field name="code">715</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="72" model="account.account.template"><field name="name">CUENTAS DE ORDEN ACREEDORAS</field><field name="code">72</field><field name="reconcile" eval="False"/><field ref="account_account_type_view" name="user_type_id"/></record>
+            <record id="721" model="account.account.template"><field name="name">Comitente por Mercaderias Recibidas en Consignación</field><field name="code">721</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="722" model="account.account.template"><field name="name">Acreedor por Garantías Otorgadas</field><field name="code">722</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
+            <record id="723" model="account.account.template"><field name="name">Acreedor por Documentos Descontados</field><field name="code">723</field><field name="reconcile" eval="False"/><field ref="account_account_type_NCLASIFICADO" name="user_type_id"/></record>
             
 	<record id="cl_chart_template" model="account.chart.template">
 	  <field name="name">Chile - Plan de Cuentas</field>
 	  <field name="account_root_id" ref="pcge"/>
 	  <field name="bank_account_view_id" ref="111"/>
-	  <field name="property_account_receivable" ref="121"/>
-	  <field name="property_account_payable" ref="211"/>
-	  <field name="property_account_expense_categ" ref="61_01"/>
-	  <field name="property_account_income_categ" ref="411_01"/>
+	  <field name="property_account_receivable_id" ref="121"/>
+	  <field name="property_account_payable_id" ref="211"/>
+	  <field name="property_account_expense_categ_id" ref="61_01"/>
+	  <field name="property_account_income_categ_id" ref="411_01"/>
 	  <field name="currency_id" ref="base.CLP"/>
 	</record>	
 

addons/l10n_cn/account_chart_small_business_template.xml

@@ -18,7 +18,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="cn_small_business_root" model="account.account.template">
             <field name="name">会计科目</field>
             <field name="code">0</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
 
         <!-- 资产类 -->
@@ -26,203 +26,203 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">1001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">现金</field>
-            <field name="user_type" ref="user_type_bs1"/>
+            <field name="user_type_id" ref="user_type_bs1"/>
         </record>
         <record id="small_business_chart1002" model="account.account.template">
             <field name="code">1002</field>
             <field eval="False" name="reconcile"/>
             <field name="name">银行存款</field>
-            <field name="user_type" ref="user_type_bs1"/>
+            <field name="user_type_id" ref="user_type_bs1"/>
         </record>
         <record id="small_business_chart1012" model="account.account.template">
             <field name="code">1012</field>
             <field eval="False" name="reconcile"/>
             <field name="name">其他货币资金</field>
-            <field name="user_type" ref="user_type_bs1"/>
+            <field name="user_type_id" ref="user_type_bs1"/>
         </record>
 
         <record id="small_business_chart1101" model="account.account.template">
             <field name="code">1101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">短期投资</field>
-            <field name="user_type" ref="user_type_bs2"/>
+            <field name="user_type_id" ref="user_type_bs2"/>
         </record>
 
         <record id="small_business_chart1121" model="account.account.template">
             <field name="code">1121</field>
             <field eval="True" name="reconcile"/>
             <field name="name">应收票据</field>
-            <field name="user_type" ref="user_type_bs3"/>
+            <field name="user_type_id" ref="user_type_bs3"/>
         </record>
         <record id="small_business_chart1122" model="account.account.template">
             <field name="code">1122</field>
             <field eval="True" name="reconcile"/>
             <field name="name">应收账款</field>
-            <field name="user_type" ref="user_type_bs6"/>
+            <field name="user_type_id" ref="user_type_bs6"/>
         </record>
         <record id="small_business_chart1123" model="account.account.template">
             <field name="code">1123</field>
             <field eval="True" name="reconcile"/>
             <field name="name">预付账款</field>
-            <field name="user_type" ref="user_type_bs6"/>
+            <field name="user_type_id" ref="user_type_bs6"/>
         </record>
         <record id="small_business_chart1131" model="account.account.template">
             <field name="code">1131</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应收股利</field>
-            <field name="user_type" ref="user_type_bs4"/>
+            <field name="user_type_id" ref="user_type_bs4"/>
         </record>
         <record id="small_business_chart1132" model="account.account.template">
             <field name="code">1132</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应收利息</field>
-            <field name="user_type" ref="user_type_bs5"/>
+            <field name="user_type_id" ref="user_type_bs5"/>
         </record>
         <record id="small_business_chart1221" model="account.account.template">
             <field name="code">1221</field>
             <field eval="True" name="reconcile"/>
             <field name="name">其他应收款</field>
-            <field name="user_type" ref="user_type_bs7"/>
+            <field name="user_type_id" ref="user_type_bs7"/>
         </record>
 
         <record id="small_business_chart1401" model="account.account.template">
             <field name="code">1401</field>
             <field eval="False" name="reconcile"/>
             <field name="name">材料采购</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="small_business_chart1402" model="account.account.template">
             <field name="code">1402</field>
             <field eval="False" name="reconcile"/>
             <field name="name">在途物资</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="small_business_chart1403" model="account.account.template">
             <field name="code">1403</field>
             <field eval="False" name="reconcile"/>
             <field name="name">原材料</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="small_business_chart1404" model="account.account.template">
             <field name="code">1404</field>
             <field eval="False" name="reconcile"/>
             <field name="name">材料成本差异</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="small_business_chart1405" model="account.account.template">
             <field name="code">1405</field>
             <field eval="False" name="reconcile"/>
             <field name="name">库存商品</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
 
         <record id="small_business_chart1407" model="account.account.template">
             <field name="code">1407</field>
             <field eval="False" name="reconcile"/>
             <field name="name">商品进销差价</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="small_business_chart1408" model="account.account.template">
             <field name="code">1408</field>
             <field eval="False" name="reconcile"/>
             <field name="name">委托加工物资</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
 
         <record id="small_business_chart1411" model="account.account.template">
             <field name="code">1411</field>
             <field eval="False" name="reconcile"/>
             <field name="name">周转材料</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
 
         <record id="small_business_chart1421" model="account.account.template">
             <field name="code">1421</field>
             <field eval="False" name="reconcile"/>
             <field name="name">消耗性生物资产</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
 
         <record id="small_business_chart1501" model="account.account.template">
             <field name="code">1501</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期债券投资</field>
-            <field name="user_type" ref="user_type_bs34"/>
+            <field name="user_type_id" ref="user_type_bs34"/>
         </record>
 
         <record id="small_business_chart1511" model="account.account.template">
             <field name="code">1511</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期股权投资</field>
-            <field name="user_type" ref="user_type_bs32"/>
+            <field name="user_type_id" ref="user_type_bs32"/>
         </record>
 
         <record id="small_business_chart1601" model="account.account.template">
             <field name="code">1601</field>
             <field eval="False" name="reconcile"/>
             <field name="name">固定资产</field>
-            <field name="user_type" ref="user_type_bs39"/>
+            <field name="user_type_id" ref="user_type_bs39"/>
         </record>
         <record id="small_business_chart1602" model="account.account.template">
             <field name="code">1602</field>
             <field eval="False" name="reconcile"/>
             <field name="name">累计折旧</field>
-            <field name="user_type" ref="user_type_bs40"/>
+            <field name="user_type_id" ref="user_type_bs40"/>
         </record>
 
         <record id="small_business_chart1604" model="account.account.template">
             <field name="code">1604</field>
             <field eval="False" name="reconcile"/>
             <field name="name">在建工程</field>
-            <field name="user_type" ref="user_type_bs45"/>
+            <field name="user_type_id" ref="user_type_bs45"/>
         </record>
         <record id="small_business_chart1605" model="account.account.template">
             <field name="code">1605</field>
             <field eval="False" name="reconcile"/>
             <field name="name">工程物资</field>
-            <field name="user_type" ref="user_type_bs44"/>
+            <field name="user_type_id" ref="user_type_bs44"/>
         </record>
 
         <record id="small_business_chart1606" model="account.account.template">
             <field name="code">1606</field>
             <field eval="False" name="reconcile"/>
             <field name="name">固定资产清理</field>
-            <field name="user_type" ref="user_type_bs39"/>
+            <field name="user_type_id" ref="user_type_bs39"/>
         </record>
 
         <record id="small_business_chart1621" model="account.account.template">
             <field name="code">1621</field>
             <field eval="False" name="reconcile"/>
             <field name="name">生产性生物资产</field>
-            <field name="user_type" ref="user_type_bs39"/>
+            <field name="user_type_id" ref="user_type_bs39"/>
         </record>
 
         <record id="small_business_chart1602" model="account.account.template">
             <field name="code">1622</field>
             <field eval="False" name="reconcile"/>
             <field name="name">生产性生物资产累计折旧</field>
-            <field name="user_type" ref="user_type_bs40"/>
+            <field name="user_type_id" ref="user_type_bs40"/>
         </record>
 
         <record id="small_business_chart1701" model="account.account.template">
             <field name="code">1701</field>
             <field eval="False" name="reconcile"/>
             <field name="name">无形资产</field>
-            <field name="user_type" ref="user_type_bs51"/>
+            <field name="user_type_id" ref="user_type_bs51"/>
         </record>
 
         <record id="small_business_chart1702" model="account.account.template">
             <field name="code">1702</field>
             <field eval="False" name="reconcile"/>
             <field name="name">累计摊销</field>
-            <field name="user_type" ref="user_type_bs51"/>
+            <field name="user_type_id" ref="user_type_bs51"/>
         </record>
 
         <record id="small_business_chart1801" model="account.account.template">
             <field name="code">1801</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期待摊费用</field>
-            <field name="user_type" ref="user_type_bs52"/>
+            <field name="user_type_id" ref="user_type_bs52"/>
         </record>
 
 
@@ -230,7 +230,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">1901</field>
             <field eval="False" name="reconcile"/>
             <field name="name">待处理财产损溢</field>
-            <field name="user_type" ref="user_type_bs44"/>
+            <field name="user_type_id" ref="user_type_bs44"/>
         </record>
         
         
@@ -239,78 +239,78 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">2001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">短期借款</field>
-            <field name="user_type" ref="user_type_bs68"/>
+            <field name="user_type_id" ref="user_type_bs68"/>
         </record>
 
         <record id="small_business_chart2201" model="account.account.template">
             <field name="code">2201</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应付票据</field>
-            <field name="user_type" ref="user_type_bs69"/>
+            <field name="user_type_id" ref="user_type_bs69"/>
         </record>
         <record id="small_business_chart2202" model="account.account.template">
             <field name="code">2202</field>
             <field eval="True" name="reconcile"/>
             <field name="name">应付账款</field>
-            <field name="user_type" ref="user_type_bs70"/>
+            <field name="user_type_id" ref="user_type_bs70"/>
         </record>
         <record id="small_business_chart2203" model="account.account.template">
             <field name="code">2203</field>
             <field eval="True" name="reconcile"/>
             <field name="name">预收账款</field>
-            <field name="user_type" ref="user_type_bs71"/>
+            <field name="user_type_id" ref="user_type_bs71"/>
         </record>
         <record id="small_business_chart2211" model="account.account.template">
             <field name="code">2211</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应付职工薪酬</field>
-            <field name="user_type" ref="user_type_bs72"/>
+            <field name="user_type_id" ref="user_type_bs72"/>
         </record>
         <record id="small_business_chart2221" model="account.account.template">
             <field name="code">2221</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交税费</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
 
         <record id="small_business_chart2231" model="account.account.template">
             <field name="code">2231</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应付利息</field>
-            <field name="user_type" ref="user_type_bs74"/>
+            <field name="user_type_id" ref="user_type_bs74"/>
         </record>
         <record id="small_business_chart2232" model="account.account.template">
             <field name="code">2232</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应付利润</field>
-            <field name="user_type" ref="user_type_bs74"/>
+            <field name="user_type_id" ref="user_type_bs74"/>
         </record>
 
         <record id="small_business_chart2241" model="account.account.template">
             <field name="code">2241</field>
             <field eval="True" name="reconcile"/>
             <field name="name">其他应付款</field>
-            <field name="user_type" ref="user_type_bs70"/>
+            <field name="user_type_id" ref="user_type_bs70"/>
         </record>
 
         <record id="small_business_chart2401" model="account.account.template">
             <field name="code">2401</field>
             <field eval="False" name="reconcile"/>
             <field name="name">递延收益</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <record id="small_business_chart2501" model="account.account.template">
             <field name="code">2501</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期借款</field>
-            <field name="user_type" ref="user_type_bs101"/>
+            <field name="user_type_id" ref="user_type_bs101"/>
         </record>
 
         <record id="small_business_chart2701" model="account.account.template">
             <field name="code">2701</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期应付款</field>
-            <field name="user_type" ref="user_type_bs103"/>
+            <field name="user_type_id" ref="user_type_bs103"/>
         </record>
 
 
@@ -319,31 +319,31 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">3001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">实收资本</field>
-            <field name="user_type" ref="user_type_bs115"/>
+            <field name="user_type_id" ref="user_type_bs115"/>
         </record>
         <record id="small_business_chart3002" model="account.account.template">
             <field name="code">3002</field>
             <field eval="False" name="reconcile"/>
             <field name="name">资本公积</field>
-            <field name="user_type" ref="user_type_bs118"/>
+            <field name="user_type_id" ref="user_type_bs118"/>
         </record>
         <record id="small_business_chart3101" model="account.account.template">
             <field name="code">3101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">盈余公积</field>
-            <field name="user_type" ref="user_type_bs119"/>
+            <field name="user_type_id" ref="user_type_bs119"/>
         </record>
         <record id="small_business_chart3103" model="account.account.template">
             <field name="code">3103</field>
             <field eval="False" name="reconcile"/>
             <field name="name">本年利润</field>
-            <field name="user_type" ref="user_type_bs121"/>
+            <field name="user_type_id" ref="user_type_bs121"/>
         </record>
         <record id="small_business_chart3104" model="account.account.template">
             <field name="code">3104</field>
             <field eval="False" name="reconcile"/>
             <field name="name">利润分配</field>
-            <field name="user_type" ref="user_type_bs121"/>
+            <field name="user_type_id" ref="user_type_bs121"/>
         </record>
 
         <!-- 成本类 -->
@@ -351,34 +351,34 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">4001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">生产成本</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <record id="small_business_chart4101" model="account.account.template">
             <field name="code">4101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">制造费用</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
 
         <record id="small_business_chart4301" model="account.account.template">
             <field name="code">4301</field>
             <field eval="False" name="reconcile"/>
             <field name="name">研发支出</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
 
         <record id="small_business_chart4401" model="account.account.template">
             <field name="code">4401</field>
             <field eval="False" name="reconcile"/>
             <field name="name">工程施工</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
 
         <record id="small_business_chart4403" model="account.account.template">
             <field name="code">4403</field>
             <field eval="False" name="reconcile"/>
             <field name="name">机械作业</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
 
 
@@ -387,77 +387,77 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">5001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">主营业务收入</field>
-            <field name="user_type" ref="user_type_pl1"/>
+            <field name="user_type_id" ref="user_type_pl1"/>
         </record>
         <record id="small_business_chart5051" model="account.account.template">
             <field name="code">5051</field>
             <field eval="False" name="reconcile"/>
             <field name="name">其他业务收入</field>
-            <field name="user_type" ref="user_type_pl23"/>
+            <field name="user_type_id" ref="user_type_pl23"/>
         </record>
 
         <record id="small_business_chart5111" model="account.account.template">
             <field name="code">5111</field>
             <field eval="False" name="reconcile"/>
             <field name="name">投资收益</field>
-            <field name="user_type" ref="user_type_pl19"/>
+            <field name="user_type_id" ref="user_type_pl19"/>
         </record>
         <record id="small_business_chart5301" model="account.account.template">
             <field name="code">5301</field>
             <field eval="False" name="reconcile"/>
             <field name="name">营业外收入</field>
-            <field name="user_type" ref="user_type_pl23"/>
+            <field name="user_type_id" ref="user_type_pl23"/>
         </record>
 
         <record id="small_business_chart5401" model="account.account.template">
             <field name="code">5401</field>
             <field eval="False" name="reconcile"/>
             <field name="name">主营业务成本</field>
-            <field name="user_type" ref="user_type_pl3"/>
+            <field name="user_type_id" ref="user_type_pl3"/>
         </record>
         <record id="small_business_chart5402" model="account.account.template">
             <field name="code">5402</field>
             <field eval="False" name="reconcile"/>
             <field name="name">其他业务成本</field>
-            <field name="user_type" ref="user_type_pl3"/>
+            <field name="user_type_id" ref="user_type_pl3"/>
         </record>
 
         <record id="small_business_chart5403" model="account.account.template">
             <field name="code">5403</field>
             <field eval="False" name="reconcile"/>
             <field name="name">营业税金及附加</field>
-            <field name="user_type" ref="user_type_pl5"/>
+            <field name="user_type_id" ref="user_type_pl5"/>
         </record>
         <record id="small_business_chart5601" model="account.account.template">
             <field name="code">5601</field>
             <field eval="False" name="reconcile"/>
             <field name="name">销售费用</field>
-            <field name="user_type" ref="user_type_pl11"/>
+            <field name="user_type_id" ref="user_type_pl11"/>
         </record>
         <record id="small_business_chart5602" model="account.account.template">
             <field name="code">5602</field>
             <field eval="False" name="reconcile"/>
             <field name="name">管理费用</field>
-            <field name="user_type" ref="user_type_pl13"/>
+            <field name="user_type_id" ref="user_type_pl13"/>
         </record>
         <record id="small_business_chart5603" model="account.account.template">
             <field name="code">5603</field>
             <field eval="False" name="reconcile"/>
             <field name="name">财务费用</field>
-            <field name="user_type" ref="user_type_pl15"/>
+            <field name="user_type_id" ref="user_type_pl15"/>
         </record>
 
         <record id="small_business_chart5711" model="account.account.template">
             <field name="code">5711</field>
             <field eval="False" name="reconcile"/>
             <field name="name">营业外支出</field>
-            <field name="user_type" ref="user_type_pl25"/>
+            <field name="user_type_id" ref="user_type_pl25"/>
         </record>
         <record id="small_business_chart5801" model="account.account.template">
             <field name="code">5801</field>
             <field eval="False" name="reconcile"/>
             <field name="name">所得税</field>
-            <field name="user_type" ref="user_type_pl29"/>
+            <field name="user_type_id" ref="user_type_pl29"/>
         </record>
 
 
@@ -467,10 +467,10 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="account_root_id" ref="cn_small_business_root"/>
             <field name="code_digits" eval="4"/>
             <field name="bank_account_view_id" ref="small_business_chart1002"/>
-            <field name="property_account_receivable" ref="small_business_chart1122"/>
-            <field name="property_account_payable" ref="small_business_chart2202"/>
-            <field name="property_account_expense_categ" ref="small_business_chart1401"/>
-            <field name="property_account_income_categ" ref="small_business_chart5001"/>
+            <field name="property_account_receivable_id" ref="small_business_chart1122"/>
+            <field name="property_account_payable_id" ref="small_business_chart2202"/>
+            <field name="property_account_expense_categ_id" ref="small_business_chart1401"/>
+            <field name="property_account_income_categ_id" ref="small_business_chart5001"/>
         </record>
 
         <record id="l10n_chart_china_small_business_value" model="ir.values">

addons/l10n_cn/account_chart_template.xml

@@ -15,622 +15,622 @@
         <record id="cn_root" model="account.account.template">
             <field name="name">会计科目</field>
             <field name="code">0</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <!-- 资产类 -->
         <record id="chart1001" model="account.account.template">
             <field name="code">1001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">现金</field>
-            <field name="user_type" ref="user_type_bs1"/>
+            <field name="user_type_id" ref="user_type_bs1"/>
         </record>
         <record id="chart1002" model="account.account.template">
             <field name="code">1002</field>
             <field eval="False" name="reconcile"/>
             <field name="name">银行存款</field>
-            <field name="user_type" ref="user_type_bs1"/>
+            <field name="user_type_id" ref="user_type_bs1"/>
         </record>
         <record id="chart1015" model="account.account.template">
             <field name="code">1015</field>
             <field eval="False" name="reconcile"/>
             <field name="name">其他货币资金</field>
-            <field name="user_type" ref="user_type_bs1"/>
+            <field name="user_type_id" ref="user_type_bs1"/>
         </record>
         <record id="chart1101" model="account.account.template">
             <field name="code">1101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">交易性金融资产</field>
-            <field name="user_type" ref="user_type_bs2"/>
+            <field name="user_type_id" ref="user_type_bs2"/>
         </record>
         <record id="chart1121" model="account.account.template">
             <field name="code">1121</field>
             <field eval="True" name="reconcile"/>
             <field name="name">应收票据</field>
-            <field name="user_type" ref="user_type_bs3"/>
+            <field name="user_type_id" ref="user_type_bs3"/>
         </record>
         <record id="chart1122" model="account.account.template">
             <field name="code">1122</field>
             <field eval="True" name="reconcile"/>
             <field name="name">应收账款</field>
-            <field name="user_type" ref="user_type_bs6"/>
+            <field name="user_type_id" ref="user_type_bs6"/>
         </record>
         <record id="chart1123" model="account.account.template">
             <field name="code">1123</field>
             <field eval="True" name="reconcile"/>
             <field name="name">预付账款</field>
-            <field name="user_type" ref="user_type_bs6"/>
+            <field name="user_type_id" ref="user_type_bs6"/>
         </record>
         <record id="chart1131" model="account.account.template">
             <field name="code">1131</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应收股利</field>
-            <field name="user_type" ref="user_type_bs4"/>
+            <field name="user_type_id" ref="user_type_bs4"/>
         </record>
         <record id="chart1132" model="account.account.template">
             <field name="code">1132</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应收利息</field>
-            <field name="user_type" ref="user_type_bs5"/>
+            <field name="user_type_id" ref="user_type_bs5"/>
         </record>
         <record id="chart1231" model="account.account.template">
             <field name="code">1231</field>
             <field eval="True" name="reconcile"/>
             <field name="name">其他应收款</field>
-            <field name="user_type" ref="user_type_bs7"/>
+            <field name="user_type_id" ref="user_type_bs7"/>
         </record>
         <record id="chart1241" model="account.account.template">
             <field name="code">1241</field>
             <field eval="False" name="reconcile"/>
             <field name="name">坏账准备</field>
-            <field name="user_type" ref="user_type_bs6"/>
+            <field name="user_type_id" ref="user_type_bs6"/>
         </record>
         <record id="chart1401" model="account.account.template">
             <field name="code">1401</field>
             <field eval="False" name="reconcile"/>
             <field name="name">材料采购</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1402" model="account.account.template">
             <field name="code">1402</field>
             <field eval="False" name="reconcile"/>
             <field name="name">在途物资</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1403" model="account.account.template">
             <field name="code">1403</field>
             <field eval="False" name="reconcile"/>
             <field name="name">原材料</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1404" model="account.account.template">
             <field name="code">1404</field>
             <field eval="False" name="reconcile"/>
             <field name="name">材料成本差异</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1406" model="account.account.template">
             <field name="code">1406</field>
             <field eval="False" name="reconcile"/>
             <field name="name">库存商品</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1407" model="account.account.template">
             <field name="code">1407</field>
             <field eval="False" name="reconcile"/>
             <field name="name">发出商品</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1410" model="account.account.template">
             <field name="code">1410</field>
             <field eval="False" name="reconcile"/>
             <field name="name">商品进销差价</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1411" model="account.account.template">
             <field name="code">1411</field>
             <field eval="False" name="reconcile"/>
             <field name="name">委托加工物资</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1412" model="account.account.template">
             <field name="code">1412</field>
             <field eval="False" name="reconcile"/>
             <field name="name">包装物及低值易耗品</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1461" model="account.account.template">
             <field name="code">1461</field>
             <field eval="False" name="reconcile"/>
             <field name="name">存货跌价准备</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record>
         <record id="chart1501" model="account.account.template">
             <field name="code">1501</field>
             <field eval="False" name="reconcile"/>
             <field name="name">待摊费用</field>
-            <field name="user_type" ref="user_type_bs11"/>
+            <field name="user_type_id" ref="user_type_bs11"/>
         </record>
         <record id="chart1521" model="account.account.template">
             <field name="code">1521</field>
             <field eval="False" name="reconcile"/>
             <field name="name">持有至到期投资</field>
-            <field name="user_type" ref="user_type_bs21"/>
+            <field name="user_type_id" ref="user_type_bs21"/>
         </record>
         <record id="chart1522" model="account.account.template">
             <field name="code">1522</field>
             <field eval="False" name="reconcile"/>
             <field name="name">持有至到期投资减值准备</field>
-            <field name="user_type" ref="user_type_bs21"/>
+            <field name="user_type_id" ref="user_type_bs21"/>
         </record>
         <record id="chart1524" model="account.account.template">
             <field name="code">1524</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期股权投资</field>
-            <field name="user_type" ref="user_type_bs32"/>
+            <field name="user_type_id" ref="user_type_bs32"/>
         </record>
         <record id="chart1525" model="account.account.template">
             <field name="code">1525</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期投资减值准备</field>
-            <field name="user_type" ref="user_type_bs32"/>
+            <field name="user_type_id" ref="user_type_bs32"/>
         </record>
         <record id="chart1421" model="account.account.template">
             <field name="code">1531</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期应收款</field>
-            <field name="user_type" ref="user_type_bs34"/>
+            <field name="user_type_id" ref="user_type_bs34"/>
         </record>
         <record id="chart1601" model="account.account.template">
             <field name="code">1601</field>
             <field eval="False" name="reconcile"/>
             <field name="name">固定资产</field>
-            <field name="user_type" ref="user_type_bs39"/>
+            <field name="user_type_id" ref="user_type_bs39"/>
         </record>
         <record id="chart1602" model="account.account.template">
             <field name="code">1602</field>
             <field eval="False" name="reconcile"/>
             <field name="name">累计折旧</field>
-            <field name="user_type" ref="user_type_bs40"/>
+            <field name="user_type_id" ref="user_type_bs40"/>
         </record>
         <record id="chart1603" model="account.account.template">
             <field name="code">1603</field>
             <field eval="False" name="reconcile"/>
             <field name="name">固定资产减值准备</field>
-            <field name="user_type" ref="user_type_bs42"/>
+            <field name="user_type_id" ref="user_type_bs42"/>
         </record>
         <record id="chart1604" model="account.account.template">
             <field name="code">1604</field>
             <field eval="False" name="reconcile"/>
             <field name="name">在建工程</field>
-            <field name="user_type" ref="user_type_bs45"/>
+            <field name="user_type_id" ref="user_type_bs45"/>
         </record>
         <record id="chart1605" model="account.account.template">
             <field name="code">1605</field>
             <field eval="False" name="reconcile"/>
             <field name="name">工程物资</field>
-            <field name="user_type" ref="user_type_bs44"/>
+            <field name="user_type_id" ref="user_type_bs44"/>
         </record>
         <record id="chart1606" model="account.account.template">
             <field name="code">1606</field>
             <field eval="False" name="reconcile"/>
             <field name="name">固定资产清理</field>
-            <field name="user_type" ref="user_type_bs46"/>
+            <field name="user_type_id" ref="user_type_bs46"/>
         </record>
         <record id="chart1701" model="account.account.template">
             <field name="code">1701</field>
             <field eval="False" name="reconcile"/>
             <field name="name">无形资产</field>
-            <field name="user_type" ref="user_type_bs51"/>
+            <field name="user_type_id" ref="user_type_bs51"/>
         </record>
         <record id="chart1703" model="account.account.template">
             <field name="code">1703</field>
             <field eval="False" name="reconcile"/>
             <field name="name">无形资产减值准备</field>
-            <field name="user_type" ref="user_type_bs51"/>
+            <field name="user_type_id" ref="user_type_bs51"/>
         </record>
         <record id="chart1711" model="account.account.template">
             <field name="code">1711</field>
             <field eval="False" name="reconcile"/>
             <field name="name">商誉</field>
-            <field name="user_type" ref="user_type_bs51"/>
+            <field name="user_type_id" ref="user_type_bs51"/>
         </record>
         <record id="chart1801" model="account.account.template">
             <field name="code">1801</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期待摊费用</field>
-            <field name="user_type" ref="user_type_bs52"/>
+            <field name="user_type_id" ref="user_type_bs52"/>
         </record>
         <record id="chart1811" model="account.account.template">
             <field name="code">1811</field>
             <field eval="False" name="reconcile"/>
             <field name="name">递延所得税资产</field>
-            <field name="user_type" ref="user_type_bs61"/>
+            <field name="user_type_id" ref="user_type_bs61"/>
         </record>
         <record id="chart1901" model="account.account.template">
             <field name="code">1901</field>
             <field eval="False" name="reconcile"/>
             <field name="name">待处理财产损溢</field>
-            <field name="user_type" ref="user_type_bs10"/>
+            <field name="user_type_id" ref="user_type_bs10"/>
         </record><!-- 负债类 -->
         <record id="chart2001" model="account.account.template">
             <field name="code">2001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">短期借款</field>
-            <field name="user_type" ref="user_type_bs68"/>
+            <field name="user_type_id" ref="user_type_bs68"/>
         </record>
         <record id="chart2101" model="account.account.template">
             <field name="code">2101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">交易性金融负债</field>
-            <field name="user_type" ref="user_type_bs68"/>
+            <field name="user_type_id" ref="user_type_bs68"/>
         </record>
         <record id="chart2201" model="account.account.template">
             <field name="code">2201</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应付票据</field>
-            <field name="user_type" ref="user_type_bs69"/>
+            <field name="user_type_id" ref="user_type_bs69"/>
         </record>
         <record id="chart2202" model="account.account.template">
             <field name="code">2202</field>
             <field eval="True" name="reconcile"/>
             <field name="name">应付账款</field>
-            <field name="user_type" ref="user_type_bs70"/>
+            <field name="user_type_id" ref="user_type_bs70"/>
         </record>
         <record id="chart2205" model="account.account.template">
             <field name="code">2205</field>
             <field eval="True" name="reconcile"/>
             <field name="name">预收账款</field>
-            <field name="user_type" ref="user_type_bs71"/>
+            <field name="user_type_id" ref="user_type_bs71"/>
         </record>
         <record id="chart2211" model="account.account.template">
             <field name="code">2211</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应付职工薪酬</field>
-            <field name="user_type" ref="user_type_bs72"/>
+            <field name="user_type_id" ref="user_type_bs72"/>
         </record>
         <record id="chart2221" model="account.account.template">
             <field name="code">2221</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交税费</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222101" model="account.account.template">
             <field name="code">222101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交增值税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210101" model="account.account.template">
             <field name="code">22210101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">进项税额</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210102" model="account.account.template">
             <field name="code">22210102</field>
             <field eval="False" name="reconcile"/>
             <field name="name">已交税金</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210103" model="account.account.template">
             <field name="code">22210103</field>
             <field eval="False" name="reconcile"/>
             <field name="name">转出未交增值税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210104" model="account.account.template">
             <field name="code">22210104</field>
             <field eval="False" name="reconcile"/>
             <field name="name">减免税款</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210105" model="account.account.template">
             <field name="code">22210105</field>
             <field eval="False" name="reconcile"/>
             <field name="name">销项税额</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210106" model="account.account.template">
             <field name="code">22210106</field>
             <field eval="False" name="reconcile"/>
             <field name="name">出口退税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210107" model="account.account.template">
             <field name="code">22210107</field>
             <field eval="False" name="reconcile"/>
             <field name="name">进项税额转出</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210108" model="account.account.template">
             <field name="code">22210108</field>
             <field eval="False" name="reconcile"/>
             <field name="name">出口抵减内销产品应纳税额</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210109" model="account.account.template">
             <field name="code">22210109</field>
             <field eval="False" name="reconcile"/>
             <field name="name">转出多交增值税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart22210110" model="account.account.template">
             <field name="code">22210110</field>
             <field eval="False" name="reconcile"/>
             <field name="name">未交增值税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222102" model="account.account.template">
             <field name="code">222102</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交营业税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222103" model="account.account.template">
             <field name="code">222103</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交消费税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222104" model="account.account.template">
             <field name="code">222104</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交资源税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222105" model="account.account.template">
             <field name="code">222105</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交所得税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222106" model="account.account.template">
             <field name="code">222106</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交土地增值税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222107" model="account.account.template">
             <field name="code">222107</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交城市维护建设税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222108" model="account.account.template">
             <field name="code">222108</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交房产税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222109" model="account.account.template">
             <field name="code">222109</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交土地使用税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222110" model="account.account.template">
             <field name="code">222110</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交车船使用税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart222111" model="account.account.template">
             <field name="code">222111</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应交个人所得税</field>
-            <field name="user_type" ref="user_type_bs75"/>
+            <field name="user_type_id" ref="user_type_bs75"/>
         </record>
         <record id="chart2231" model="account.account.template">
             <field name="code">2231</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应付股利</field>
-            <field name="user_type" ref="user_type_bs74"/>
+            <field name="user_type_id" ref="user_type_bs74"/>
         </record>
         <record id="chart2232" model="account.account.template">
             <field name="code">2232</field>
             <field eval="False" name="reconcile"/>
             <field name="name">应付利息</field>
-            <field name="user_type" ref="user_type_bs74"/>
+            <field name="user_type_id" ref="user_type_bs74"/>
         </record>
         <record id="chart2401" model="account.account.template">
             <field name="code">2401</field>
             <field eval="True" name="reconcile"/>
             <field name="name">预提费用</field>
-            <field name="user_type" ref="user_type_bs82"/>
+            <field name="user_type_id" ref="user_type_bs82"/>
         </record>
         <record id="chart2601" model="account.account.template">
             <field name="code">2601</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期借款</field>
-            <field name="user_type" ref="user_type_bs101"/>
+            <field name="user_type_id" ref="user_type_bs101"/>
         </record>
         <record id="chart2602" model="account.account.template">
             <field name="code">2602</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期债券</field>
-            <field name="user_type" ref="user_type_bs102"/>
+            <field name="user_type_id" ref="user_type_bs102"/>
         </record>
         <record id="chart2801" model="account.account.template">
             <field name="code">2801</field>
             <field eval="False" name="reconcile"/>
             <field name="name">长期应付款</field>
-            <field name="user_type" ref="user_type_bs103"/>
+            <field name="user_type_id" ref="user_type_bs103"/>
         </record>
         <record id="chart2901" model="account.account.template">
             <field name="code">2901</field>
             <field eval="False" name="reconcile"/>
             <field name="name">递延所得税负债</field>
-            <field name="user_type" ref="user_type_bs103"/>
+            <field name="user_type_id" ref="user_type_bs103"/>
         </record><!-- 共同类 -->
         <record id="chart3101" model="account.account.template">
             <field name="code">3101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">衍生工具</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <record id="chart3102" model="account.account.template">
             <field name="code">3102</field>
             <field eval="False" name="reconcile"/>
             <field name="name">套期工具</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <record id="chart3202" model="account.account.template">
             <field name="code">3202</field>
             <field eval="False" name="reconcile"/>
             <field name="name">被套期项目</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record><!-- 所有者权益类 -->
         <record id="chart4001" model="account.account.template">
             <field name="code">4001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">实收资本</field>
-            <field name="user_type" ref="user_type_bs115"/>
+            <field name="user_type_id" ref="user_type_bs115"/>
         </record>
         <record id="chart4002" model="account.account.template">
             <field name="code">4002</field>
             <field eval="False" name="reconcile"/>
             <field name="name">资本公积</field>
-            <field name="user_type" ref="user_type_bs118"/>
+            <field name="user_type_id" ref="user_type_bs118"/>
         </record>
         <record id="chart4101" model="account.account.template">
             <field name="code">4101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">盈余公积</field>
-            <field name="user_type" ref="user_type_bs119"/>
+            <field name="user_type_id" ref="user_type_bs119"/>
         </record>
         <record id="chart4103" model="account.account.template">
             <field name="code">4103</field>
             <field eval="False" name="reconcile"/>
             <field name="name">本年利润</field>
-            <field name="user_type" ref="user_type_bs121"/>
+            <field name="user_type_id" ref="user_type_bs121"/>
         </record>
         <record id="chart4104" model="account.account.template">
             <field name="code">4104</field>
             <field eval="False" name="reconcile"/>
             <field name="name">利润分配</field>
-            <field name="user_type" ref="user_type_bs121"/>
+            <field name="user_type_id" ref="user_type_bs121"/>
         </record>
         <record id="chart4201" model="account.account.template">
             <field name="code">4201</field>
             <field eval="False" name="reconcile"/>
             <field name="name">库存股</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <!-- 成本类 -->
         <record id="chart5001" model="account.account.template">
             <field name="code">5001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">生产成本</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <record id="chart5101" model="account.account.template">
             <field name="code">5101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">制造费用</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <record id="chart5201" model="account.account.template">
             <field name="code">5201</field>
             <field eval="False" name="reconcile"/>
             <field name="name">劳务成本</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
         <record id="chart5301" model="account.account.template">
             <field name="code">5301</field>
             <field eval="False" name="reconcile"/>
             <field name="name">研发支出</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type_id" ref="user_type_all"/>
         </record>
        <!-- 损益类 -->
         <record id="chart6001" model="account.account.template">
             <field name="code">6001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">主营业务收入</field>
-            <field name="user_type" ref="user_type_pl1"/>
+            <field name="user_type_id" ref="user_type_pl1"/>
         </record>
         <record id="chart6051" model="account.account.template">
             <field name="code">6051</field>
             <field eval="False" name="reconcile"/>
             <field name="name">其他业务收入</field>
-            <field name="user_type" ref="user_type_pl9"/>
+            <field name="user_type_id" ref="user_type_pl9"/>
         </record>
         <record id="chart6101" model="account.account.template">
             <field name="code">6101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">公允价值变动损益</field>
-            <field name="user_type" ref="user_type_pl9"/>
+            <field name="user_type_id" ref="user_type_pl9"/>
         </record>
         <record id="chart6111" model="account.account.template">
             <field name="code">6111</field>
             <field eval="False" name="reconcile"/>
             <field name="name">投资收益</field>
-            <field name="user_type" ref="user_type_pl19"/>
+            <field name="user_type_id" ref="user_type_pl19"/>
         </record>
         <record id="chart6301" model="account.account.template">
             <field name="code">6301</field>
             <field eval="False" name="reconcile"/>
             <field name="name">营业外收入</field>
-            <field name="user_type" ref="user_type_pl23"/>
+            <field name="user_type_id" ref="user_type_pl23"/>
         </record>
         <record id="chart6401" model="account.account.template">
             <field name="code">6401</field>
             <field eval="False" name="reconcile"/>
             <field name="name">主营业务成本</field>
-            <field name="user_type" ref="user_type_pl3"/>
+            <field name="user_type_id" ref="user_type_pl3"/>
         </record>
         <record id="chart6402" model="account.account.template">
             <field name="code">6402</field>
             <field eval="False" name="reconcile"/>
             <field name="name">其他业务支出</field>
-            <field name="user_type" ref="user_type_pl9"/>
+            <field name="user_type_id" ref="user_type_pl9"/>
         </record>
         <record id="chart6405" model="account.account.template">
             <field name="code">6405</field>
             <field eval="False" name="reconcile"/>
             <field name="name">营业税金及附加</field>
-            <field name="user_type" ref="user_type_pl5"/>
+            <field name="user_type_id" ref="user_type_pl5"/>
         </record>
         <record id="chart6601" model="account.account.template">
             <field name="code">6601</field>
             <field eval="False" name="reconcile"/>
             <field name="name">销售费用</field>
-            <field name="user_type" ref="user_type_pl11"/>
+            <field name="user_type_id" ref="user_type_pl11"/>
         </record>
         <record id="chart6602" model="account.account.template">
             <field name="code">6602</field>
             <field eval="False" name="reconcile"/>
             <field name="name">管理费用</field>
-            <field name="user_type" ref="user_type_pl13"/>
+            <field name="user_type_id" ref="user_type_pl13"/>
         </record>
         <record id="chart6603" model="account.account.template">
             <field name="code">6603</field>
             <field eval="False" name="reconcile"/>
             <field name="name">财务费用</field>
-            <field name="user_type" ref="user_type_pl15"/>
+            <field name="user_type_id" ref="user_type_pl15"/>
         </record>
         <record id="chart6701" model="account.account.template">
             <field name="code">6701</field>
             <field eval="False" name="reconcile"/>
             <field name="name">资产减值损失</field>
-            <field name="user_type" ref="user_type_pl25"/>
+            <field name="user_type_id" ref="user_type_pl25"/>
         </record>
         <record id="chart6711" model="account.account.template">
             <field name="code">6711</field>
             <field eval="False" name="reconcile"/>
             <field name="name">营业外支出</field>
-            <field name="user_type" ref="user_type_pl25"/>
+            <field name="user_type_id" ref="user_type_pl25"/>
         </record>
         <record id="chart6801" model="account.account.template">
             <field name="code">6801</field>
             <field eval="False" name="reconcile"/>
             <field name="name">所得税</field>
-            <field name="user_type" ref="user_type_pl29"/>
+            <field name="user_type_id" ref="user_type_pl29"/>
         </record>
         <record id="chart6901" model="account.account.template">
             <field name="code">6901</field>
             <field eval="False" name="reconcile"/>
             <field name="name">以前年度损益调整</field>
-            <field name="user_type" ref="user_type_bs121"/>
+            <field name="user_type_id" ref="user_type_bs121"/>
         </record>
 
         <!-- Chart template -->
@@ -639,10 +639,10 @@
             <field name="account_root_id" ref="cn_root"/>
             <field name="code_digits" eval="4"/>
             <field name="bank_account_view_id" ref="chart1002"/>
-            <field name="property_account_receivable" ref="chart1122"/>
-            <field name="property_account_payable" ref="chart2202"/>
-            <field name="property_account_expense_categ" ref="chart1401"/>
-            <field name="property_account_income_categ" ref="chart6001"/>
+            <field name="property_account_receivable_id" ref="chart1122"/>
+            <field name="property_account_payable_id" ref="chart2202"/>
+            <field name="property_account_expense_categ_id" ref="chart1401"/>
+            <field name="property_account_income_categ_id" ref="chart6001"/>
         </record>
 
         <record id="l10n_chart_china_value" model="ir.values">

addons/l10n_co/data/account_chart_template.xml

@@ -6,11 +6,11 @@
             <field name="name">Colombian - Generic Chart of Accounts</field>
             <field name="account_root_id" ref="co_puc_root"/>
             <field name="bank_account_view_id" ref="co_puc_1110"/>
-            <field name="property_account_receivable" ref="co_puc_130505"/>
-            <field name="property_account_payable" ref="co_puc_220505"/>
-            <field name="property_account_expense_categ" ref="co_puc_613595"/>
-            <field name="property_account_income_categ" ref="co_puc_413595"/>
+            <field name="property_account_receivable_id" ref="co_puc_130505"/>
+            <field name="property_account_payable_id" ref="co_puc_220505"/>
+            <field name="property_account_expense_categ_id" ref="co_puc_613595"/>
+            <field name="property_account_income_categ_id" ref="co_puc_413595"/>
             <field name="currency_id" ref="base.COP"/>
         </record>
     </data>
-</openerp>
+</openerp>

addons/l10n_cr/data/account_chart_template.xml

@@ -9,24 +9,24 @@
             <field name="name">Costa Rica - Company 0</field>
             <field name="account_root_id" ref="account_account_template_0_000000"/>
             <field name="bank_account_view_id" ref="account_account_template_0_111200"/>
-            <field name="property_account_receivable" ref="account_account_template_0_112001"/>
-            <field name="property_account_payable" ref="account_account_template_0_211001"/>
-            <field name="property_account_income" ref="account_account_template_0_410001"/>
-            <field name="property_account_expense" ref="account_account_template_0_511301"/>
-            <field name="property_account_income_categ" ref="account_account_template_0_410001"/>
-            <field name="property_account_expense_categ" ref="account_account_template_0_511301"/>
+            <field name="property_account_receivable_id" ref="account_account_template_0_112001"/>
+            <field name="property_account_payable_id" ref="account_account_template_0_211001"/>
+            <field name="property_account_income_id" ref="account_account_template_0_410001"/>
+            <field name="property_account_expense_id" ref="account_account_template_0_511301"/>
+            <field name="property_account_income_categ_id" ref="account_account_template_0_410001"/>
+            <field name="property_account_expense_categ_id" ref="account_account_template_0_511301"/>
             <field name="currency_id" ref="base.CRC"/>
         </record>
         <record id="account_chart_template_x" model="account.chart.template">
             <field name="name">Costa Rica - Company 1</field>
             <field name="account_root_id" ref="account_account_template_x000000"/>
             <field name="bank_account_view_id" ref="account_account_template_x111200"/>
-            <field name="property_account_receivable" ref="account_account_template_x112001"/>
-            <field name="property_account_payable" ref="account_account_template_x211001"/>
-            <field name="property_account_income" ref="account_account_template_x410001"/>
-            <field name="property_account_expense" ref="account_account_template_x511301"/>
-            <field name="property_account_income_categ" ref="account_account_template_x410001"/>
-            <field name="property_account_expense_categ" ref="account_account_template_x511301"/>
+            <field name="property_account_receivable_id" ref="account_account_template_x112001"/>
+            <field name="property_account_payable_id" ref="account_account_template_x211001"/>
+            <field name="property_account_income_id" ref="account_account_template_x410001"/>
+            <field name="property_account_expense_id" ref="account_account_template_x511301"/>
+            <field name="property_account_income_categ_id" ref="account_account_template_x410001"/>
+            <field name="property_account_expense_categ_id" ref="account_account_template_x511301"/>
             <field name="currency_id" ref="base.CRC"/>
         </record>
     </data>

addons/l10n_de/account_chart_template_skr03.xml

@@ -7,10 +7,10 @@
             <field name="name">Deutscher Kontenplan SKR03</field>
             <field name="account_root_id" ref="root_de"/>
             <field name="bank_account_view_id" ref="account_1200"/>
-            <field name="property_account_receivable" ref="account_1410"/>
-            <field name="property_account_payable" ref="account_1610"/>
-            <field name="property_account_expense_categ" ref="account_3400"/>
-            <field name="property_account_income_categ" ref="account_8400"/>
+            <field name="property_account_receivable_id" ref="account_1410"/>
+            <field name="property_account_payable_id" ref="account_1610"/>
+            <field name="property_account_expense_categ_id" ref="account_3400"/>
+            <field name="property_account_income_categ_id" ref="account_8400"/>
             <field name="currency_id" ref="base.EUR"/>
         </record>
    </data>

addons/l10n_de/account_chart_template_skr04.xml

@@ -7,10 +7,10 @@
             <field name="name">Deutscher Kontenplan SKR04</field>
             <field name="account_root_id" ref="chart_skr04"/>
             <field name="bank_account_view_id" ref="chart_skr04_1800"/>
-            <field name="property_account_receivable" ref="chart_skr04_1206"/>
-            <field name="property_account_payable" ref="chart_skr04_3301"/>
-            <field name="property_account_expense_categ" ref="chart_skr04_5400"/>
-            <field name="property_account_income_categ" ref="chart_skr04_4400"/>
+            <field name="property_account_receivable_id" ref="chart_skr04_1206"/>
+            <field name="property_account_payable_id" ref="chart_skr04_3301"/>
+            <field name="property_account_expense_categ_id" ref="chart_skr04_5400"/>
+            <field name="property_account_income_categ_id" ref="chart_skr04_4400"/>
             <field name="currency_id" ref="base.EUR"/>
         </record>
    </data>

addons/l10n_do/data/account_chart_template.xml

@@ -6,12 +6,12 @@
             <field name="name">Catálogo de Cuentas Empresas Privadas</field>
             <field name="account_root_id" ref="default_chart_a_account_1"/>
             <field name="bank_account_view_id" ref="default_chart_a_account_9"/>
-            <field name="property_account_receivable" ref="default_chart_a_account_13"/>
-            <field name="property_account_payable" ref="default_chart_a_account_61"/>
-            <field name="property_account_expense_categ" ref="default_chart_a_account_101"/>
-            <field name="property_account_income_categ" ref="default_chart_a_account_87"/>
-            <field name="property_account_income_opening" ref="default_chart_a_account_87"/>
-            <field name="property_account_expense_opening" ref="default_chart_a_account_101"/>
+            <field name="property_account_receivable_id" ref="default_chart_a_account_13"/>
+            <field name="property_account_payable_id" ref="default_chart_a_account_61"/>
+            <field name="property_account_expense_categ_id" ref="default_chart_a_account_101"/>
+            <field name="property_account_income_categ_id" ref="default_chart_a_account_87"/>
+            <field name="property_account_income_opening_id" ref="default_chart_a_account_87"/>
+            <field name="property_account_expense_opening_id" ref="default_chart_a_account_101"/>
             <field name="currency_id" ref="base.DOP"/>
         </record>
     </data>

addons/l10n_es/account_account_pymes.xml

@@ -28,518 +28,518 @@
             <field name="code">100</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Capital social</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_100_child" model="account.account.template">
             <field name="code">100</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Capital social</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_103" model="account.account.template">
             <field name="code">103</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por desembolsos no exigidos</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_1030" model="account.account.template">
             <field name="code">1030</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por desembolsos no exigidos, capital social</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_1030_child" model="account.account.template">
             <field name="code">1030</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por desembolsos no exigidos, capital social</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_1034" model="account.account.template">
             <field name="code">1034</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por desembolsos no exigidos, capital pendiente de inscripción</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_1034_child" model="account.account.template">
             <field name="code">1034</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por desembolsos no exigidos, capital pendiente de inscripción</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_104" model="account.account.template">
             <field name="code">104</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por aportaciones no dinerarias pendientes</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_1040" model="account.account.template">
             <field name="code">1040</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por aportaciones no dinerarias pendientes, capital social</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_1040_child" model="account.account.template">
             <field name="code">1040</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por aportaciones no dinerarias pendientes, capital social</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_1044" model="account.account.template">
             <field name="code">1044</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por aportaciones no dinerarias pendientes, capital pendiente de inscripción</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_1044_child" model="account.account.template">
             <field name="code">1044</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Socios por aportaciones no dinerarias pendientes, capital pendiente de inscripción</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_12" model="account.account.template">
             <field name="code">12</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Resultados pendientes de aplicación</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_120" model="account.account.template">
             <field name="code">120</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Remanente</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_120_child" model="account.account.template">
             <field name="code">120</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Remanente</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_121" model="account.account.template">
             <field name="code">121</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Resultados negativos de ejercicios anteriores</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_121_child" model="account.account.template">
             <field name="code">121</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Resultados negativos de ejercicios anteriores</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_129" model="account.account.template">
             <field name="code">129</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Resultado del ejercicio</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_129_child" model="account.account.template">
             <field name="code">129</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Resultado del ejercicio</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_130_child" model="account.account.template">
             <field name="code">130</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Subvenciones oficiales de capital</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_132_child" model="account.account.template">
             <field name="code">132</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otras subvenciones, donaciones y legados</field>
-            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="user_type_id" ref="l10n_es.account_type_capital"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_240" model="account.account.template">
             <field name="code">240</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Participaciones en partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2403" model="account.account.template">
             <field name="code">2403</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Participaciones en empresas del grupo</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2403_child" model="account.account.template">
             <field name="code">2403</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Participaciones en empresas del grupo</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2404" model="account.account.template">
             <field name="code">2404</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Participaciones en empresas asociadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2404_child" model="account.account.template">
             <field name="code">2404</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Participaciones en empresas asociadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2405" model="account.account.template">
             <field name="code">2405</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Participaciones en otras partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2405_child" model="account.account.template">
             <field name="code">2405</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Participaciones en otras partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_249" model="account.account.template">
             <field name="code">249</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos pendientes sobre participaciones en partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2493" model="account.account.template">
             <field name="code">2493</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos pendientes sobre participaciones en empresas del grupo</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2493_child" model="account.account.template">
             <field name="code">2493</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos pendientes sobre participaciones en empresas del grupo</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2494" model="account.account.template">
             <field name="code">2494</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos pendientes sobre participaciones en empresas asociadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2494_child" model="account.account.template">
             <field name="code">2494</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos pendientes sobre participaciones en empresas asociadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2495" model="account.account.template">
             <field name="code">2495</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos pendientes sobre participaciones en otras partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2495_child" model="account.account.template">
             <field name="code">2495</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos pendientes sobre participaciones en otras partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_255_child" model="account.account.template">
             <field name="code">255</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Activos por derivados financieros</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2935" model="account.account.template">
             <field name="code">2935</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de valor de participaciones a largo plazo en otras partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_2935_child" model="account.account.template">
             <field name="code">2935</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de valor de participaciones a largo plazo en otras partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_296" model="account.account.template">
             <field name="code">296</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de  valor de participaciones en el patrimonio neto a largo plazo</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_296_child" model="account.account.template">
             <field name="code">296</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de  valor de participaciones en el patrimonio neto a largo plazo</field>
-            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="user_type_id" ref="l10n_es.account_type_inmo"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pyme_490" model="account.account.template">
             <field name="code">490</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de valor de créditos por operaciones comerciales</field>
-            <field name="user_type" ref="l10n_es.account_type_terceros"/>
+            <field name="user_type_id" ref="l10n_es.account_type_terceros"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pyme_490_child" model="account.account.template">
             <field name="code">490</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de valor de créditos por operaciones comerciales</field>
-            <field name="user_type" ref="l10n_es.account_type_terceros"/>
+            <field name="user_type_id" ref="l10n_es.account_type_terceros"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pyme_551" model="account.account.template">
             <field name="code">551</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Cuenta corriente con socios y administradores</field>
-            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="user_type_id" ref="l10n_es.account_type_financieras"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pyme_551_child" model="account.account.template">
             <field name="code">551</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Cuenta corriente con socios y administradores</field>
-            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="user_type_id" ref="l10n_es.account_type_financieras"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_5935" model="account.account.template">
             <field name="code">5935</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de valor de participaciones a corto plazo en otras partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="user_type_id" ref="l10n_es.account_type_financieras"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_5935_child" model="account.account.template">
             <field name="code">5935</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de valor de participaciones a corto plazo en otras partes vinculadas</field>
-            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="user_type_id" ref="l10n_es.account_type_financieras"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_596" model="account.account.template">
             <field name="code">596</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de valor de participaciones a corto plazo</field>
-            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="user_type_id" ref="l10n_es.account_type_financieras"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_596_child" model="account.account.template">
             <field name="code">596</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deterioro de valor de participaciones a corto plazo</field>
-            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="user_type_id" ref="l10n_es.account_type_financieras"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_65" model="account.account.template">
             <field name="code">65</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otros gastos de gestión</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_650" model="account.account.template">
             <field name="code">650</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas de créditos comerciales incobrables</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_650_child" model="account.account.template">
             <field name="code">650</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas de créditos comerciales incobrables</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_651" model="account.account.template">
             <field name="code">651</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Resultados de operaciones en común</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_6510" model="account.account.template">
             <field name="code">6510</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Beneficio transferido (gestor)</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_6510_child" model="account.account.template">
             <field name="code">6510</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Beneficio transferido (gestor)</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_6511" model="account.account.template">
             <field name="code">6511</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdida soportada (partícipe o asociado no gestor)</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_6511_child" model="account.account.template">
             <field name="code">6511</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdida soportada (partícipe o asociado no gestor)</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_659" model="account.account.template">
             <field name="code">659</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otras pérdidas en gestión corriente</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_659_child" model="account.account.template">
             <field name="code">659</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otras pérdidas en gestión corriente</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_663_child" model="account.account.template">
             <field name="code">663</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas por valoración de instrumentos financieros por su valor razonable</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_671" model="account.account.template">
             <field name="code">671</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas procedentes del inmovilizado material</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_671_child" model="account.account.template">
             <field name="code">671</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas procedentes del inmovilizado material</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_691" model="account.account.template">
             <field name="code">691</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas por deterioro del inmovilizado material</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_691_child" model="account.account.template">
             <field name="code">691</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas por deterioro del inmovilizado material</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_694" model="account.account.template">
             <field name="code">694</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas por deterioro de créditos por operaciones comerciales</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_694_child" model="account.account.template">
             <field name="code">694</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pérdidas por deterioro de créditos por operaciones comerciales</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_763_child" model="account.account.template">
             <field name="code">763</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Beneficios por valoración de instrumentos financieros por su valor razonable</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_791" model="account.account.template">
             <field name="code">791</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reversión del deterioro del inmovilizado material</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_791_child" model="account.account.template">
             <field name="code">791</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reversión del deterioro del inmovilizado material</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_794" model="account.account.template">
             <field name="code">794</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reversión del deterioro de créditos por operaciones comerciales</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_794_child" model="account.account.template">
             <field name="code">794</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reversión del deterioro de créditos por operaciones comerciales</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_7962" model="account.account.template">
             <field name="code">7962</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_7962_child" model="account.account.template">
             <field name="code">7962</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_7963" model="account.account.template">
             <field name="code">7963</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
         <record id="pgc_pymes_7963_child" model="account.account.template">
             <field name="code">7963</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
         </record>
 

addons/l10n_es/account_chart_template_post.xml

@@ -7,10 +7,10 @@
         
         <record id="account_chart_template_common" model="account.chart.template">
             <field name="account_root_id" ref="pgc_0"/>
-            <field name="property_account_receivable" ref="pgc_4300_child"/>
-            <field name="property_account_payable" ref="pgc_4100_child"/>
-            <field name="property_account_expense_categ" ref="pgc_600_child"/>
-            <field name="property_account_income_categ" ref="pgc_7000_child"/>
+            <field name="property_account_receivable_id" ref="pgc_4300_child"/>
+            <field name="property_account_payable_id" ref="pgc_4100_child"/>
+            <field name="property_account_expense_categ_id" ref="pgc_600_child"/>
+            <field name="property_account_income_categ_id" ref="pgc_7000_child"/>
         </record>
         
         <record id="account_chart_template_full" model="account.chart.template">
@@ -26,4 +26,4 @@
         </record>
         
     </data>
-</openerp>
+</openerp>

addons/l10n_eu_service/wizard/wizard.xml

@@ -67,7 +67,7 @@
             <field name="model">account.config.settings</field>
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="arch" type="xml">
-               <field name="default_sale_tax" position="after">
+               <field name="default_sale_tax_id" position="after">
                     <button type="action" name="%(action_eu_service)d"
                             string="Setup EU MOSS Taxes" class="oe_link"/>
                 </field>         
@@ -75,4 +75,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>

addons/l10n_fr/fr_pcg_taxes.xml

@@ -7,10 +7,10 @@
             <field name="name">Plan Comptable Général (France)</field>
             <field name="account_root_id" ref="pcg_0"/>
             <field name="bank_account_view_id" ref="pcg_5121"/>
-            <field name="property_account_receivable" ref="fr_pcg_recv"/>
-            <field name="property_account_payable" ref="fr_pcg_pay"/>
-            <field name="property_account_expense_categ" ref="pcg_6071"/>
-            <field name="property_account_income_categ" ref="pcg_7071"/>
+            <field name="property_account_receivable_id" ref="fr_pcg_recv"/>
+            <field name="property_account_payable_id" ref="fr_pcg_pay"/>
+            <field name="property_account_expense_categ_id" ref="pcg_6071"/>
+            <field name="property_account_income_categ_id" ref="pcg_7071"/>
             <field name="currency_id" ref="base.EUR"/>
         </record>
 

addons/l10n_generic_coa/data/configurable_account_chart.xml

@@ -6,7 +6,7 @@
             <field name="code">1017</field>
             <field name="name">Liquidity Transfers</field>
             <field name="reconcile" eval='True'/>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
         </record>
 
         <record id="configurable_chart_template" model="account.chart.template">
@@ -26,21 +26,21 @@
         <record id="conf_xfa" model="account.account.template">
             <field name="code">1000</field>
             <field name="name">Fixed Asset Account</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_stk" model="account.account.template">
             <field name="code">1010</field>
             <field name="name">Current Assets</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_cas" model="account.account.template">
             <field name="code">1011</field>
             <field name="name">Purchased Stocks</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -48,56 +48,56 @@
             <field name="code">1012</field>
             <field name="name">Account Receivable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.data_account_type_receivable"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_ova" model="account.account.template">
             <field name="code">1013</field>
             <field name="name">Tax Paid</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_bnk" model="account.account.template">
             <field name="code">1014</field>
             <field name="name">Bank Current Account</field>
-            <field name="user_type" ref="account.data_account_type_liquidity"/>
+            <field name="user_type_id" ref="account.data_account_type_liquidity"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_cash" model="account.account.template">
             <field name="code">1015</field>
             <field name="name">Cash</field>
-            <field name="user_type" ref="account.data_account_type_liquidity"/>
+            <field name="user_type_id" ref="account.data_account_type_liquidity"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_o_income" model="account.account.template">
             <field name="code">1016</field>
             <field name="name">Opening Income Account</field>
-            <field name="user_type" ref="account.data_account_type_other_income"/>
+            <field name="user_type_id" ref="account.data_account_type_other_income"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_ncas" model="account.account.template">
             <field name="code">1020</field>
             <field name="name">Non-current assets</field>
-            <field name="user_type" ref="account.data_account_type_non_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_prepayments" model="account.account.template">
             <field name="code">1030</field>
             <field name="name">Prepayments</field>
-            <field name="user_type" ref="account.data_account_type_prepayments"/>
+            <field name="user_type_id" ref="account.data_account_type_prepayments"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
        <record id="current_liabilities" model="account.account.template">
             <field name="code">1110</field>
             <field name="name">Current Liabilities</field>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -105,14 +105,14 @@
             <field name="code">1111</field>
             <field name="name">Account Payable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.data_account_type_payable"/>
+            <field name="user_type_id" ref="account.data_account_type_payable"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_iva" model="account.account.template">
             <field name="code">1112</field>
             <field name="name">Tax Received</field>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -120,13 +120,13 @@
             <field name="code">1113</field>
             <field name="name">Reserve and Profit/Loss Account</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="cas" model="account.account.template">
             <field name="code">1120</field>
             <field name="name">Non-current Liabilities</field>
-            <field name="user_type" ref="account.data_account_type_non_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -136,7 +136,7 @@
         <record id="conf_a_sale" model="account.account.template">
             <field name="code">200</field>
             <field name="name">Product Sales</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
@@ -144,7 +144,7 @@
         <record id="conf_cog" model="account.account.template">
             <field name="code">210</field>
             <field name="name">Cost of Goods Sold</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
@@ -152,7 +152,7 @@
         <record id="conf_a_expense" model="account.account.template">
             <field name="code">220</field>
             <field name="name">Expenses</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
@@ -160,7 +160,7 @@
         <record model="account.account.template" id="exchange_fx_income">
             <field name="name">Foreign Exchange Gain</field>
             <field name="code">2010</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="reconcile" eval="False"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
@@ -168,7 +168,7 @@
         <record model="account.account.template" id="exchange_fx_expense">
             <field name="name">Foreign Exchange Loss</field>
             <field name="code">2110</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="reconcile" eval="False"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
@@ -176,34 +176,34 @@
         <record id="a_salary_expense" model="account.account.template">
             <field name="code">2121</field>
             <field name="name">Salary Expenses</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="a_expense_invest" model="account.account.template">
             <field name="code">2122</field>
             <field name="name">Purchase of Equipments</field>
-            <field name="user_type" ref="account.data_account_type_fixed_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_investing')])]"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="a_expense_finance" model="account.account.template">
             <field name="code">2123</field>
             <field name="name">Bank Fees</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="a_capital" model="account.account.template">
             <field name="code">3001</field>
             <field name="name">Capital</field>
-            <field name="user_type" ref="account.data_account_type_equity"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="a_dividends" model="account.account.template">
             <field name="code">3002</field>
             <field name="name">Dividends</field>
-            <field name="user_type" ref="account.data_account_type_equity"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -211,10 +211,10 @@
 
         <!-- chart template -->
         <record id="configurable_chart_template" model="account.chart.template">
-            <field name="property_account_receivable" ref="conf_a_recv"/>
-            <field name="property_account_payable" ref="conf_a_pay"/>
-            <field name="property_account_expense_categ" ref="conf_a_expense"/>
-            <field name="property_account_income_categ" ref="conf_a_sale"/>
+            <field name="property_account_receivable_id" ref="conf_a_recv"/>
+            <field name="property_account_payable_id" ref="conf_a_pay"/>
+            <field name="property_account_expense_categ_id" ref="conf_a_expense"/>
+            <field name="property_account_income_categ_id" ref="conf_a_sale"/>
             <field name="complete_tax_set" eval="False"/>
             <field name="use_anglo_saxon" eval="True"/>
             <field name="income_currency_exchange_account_id" ref="exchange_fx_income"/>

addons/l10n_gr/account_chart.xml

@@ -7,11 +7,11 @@
         <record id="chartgr_0" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Γενικό Λογιστικό Σχέδιο</field>
-            <field name="user_type" ref="account_type_view"/>
+            <field name="user_type_id" ref="account_type_view"/>
         </record>
 
         
-        <!-- <record id="account.property_account_expense_categ" model="ir.property">
+        <!-- <record id="account.property_account_expense_categ_id" model="ir.property">
             <field eval="'account.account,'+str(a_expense)" name="value"/>
         </record> -->
         

addons/l10n_gr/account_tax.xml

@@ -8,10 +8,10 @@
         <field name="name">Πρότυπο Ελληνικού Λογιστικού Σχεδίου</field>
         <field name="account_root_id" ref="chartgr_0"/>
         <field name="bank_account_view_id" ref="chartgr_38_03"/>
-        <field name="property_account_receivable" ref="chartgr_30_00"/>
-        <field name="property_account_payable" ref="chartgr_50_00"/>
-        <field name="property_account_expense_categ" ref="chartgr_64_98"/>
-        <field name="property_account_income_categ" ref="chartgr_71_00"/>
+        <field name="property_account_receivable_id" ref="chartgr_30_00"/>
+        <field name="property_account_payable_id" ref="chartgr_50_00"/>
+        <field name="property_account_expense_categ_id" ref="chartgr_64_98"/>
+        <field name="property_account_income_categ_id" ref="chartgr_71_00"/>
         <field name="currency_id" ref="base.EUR"/>
     </record>
 

addons/l10n_gt/account_chart.xml

@@ -7,7 +7,7 @@
         <record id="plan_raiz" model="account.account.template">
             <field name="code">-</field>
             <field name="name">Plan contable de Guatemala (sencillo)</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <!-- Cuentas de Balance General -->
@@ -15,294 +15,294 @@
         <record id="bal" model="account.account.template">
             <field name="code">A</field>
             <field name="name">Balance General</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta1" model="account.account.template">
             <field name="code">1</field>
             <field name="name">Activo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta11" model="account.account.template">
             <field name="code">1.1</field>
             <field name="name">Activo Corriente</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta1101" model="account.account.template">
             <field name="code">1.1.01</field>
             <field name="name">Caja y Bancos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta110101" model="account.account.template">
             <field name="code">1.1.01.01</field>
             <field name="name">Caja Chica</field>
-            <field name="user_type" ref="cuenta_efectivo"/>
+            <field name="user_type_id" ref="cuenta_efectivo"/>
         </record>
 
         <record id="cta1102" model="account.account.template">
             <field name="code">1.1.02</field>
             <field name="name">Cuentas y Documentos por Cobrar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta110201" model="account.account.template">
             <field name="code">1.1.02.01</field>
             <field name="name">Cuentas por Cobrar Generales</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxc"/>
+            <field name="user_type_id" ref="cuenta_cxc"/>
         </record>
 
         <record id="cta110202" model="account.account.template">
             <field name="code">1.1.02.02</field>
             <field name="name">Cuentas por Cobrar Empresas Afilidas</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxc"/>
+            <field name="user_type_id" ref="cuenta_cxc"/>
         </record>
 
         <record id="cta110203" model="account.account.template">
             <field name="code">1.1.02.03</field>
             <field name="name">Prestamos al Personal</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxc"/>
+            <field name="user_type_id" ref="cuenta_cxc"/>
         </record>
 
         <record id="cta110204" model="account.account.template">
             <field name="code">1.1.02.04</field>
             <field name="name">Otras Cuentas por Cobrar</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxc"/>
+            <field name="user_type_id" ref="cuenta_cxc"/>
         </record>
 
         <record id="cta1103" model="account.account.template">
             <field name="code">1.1.03</field>
             <field name="name">IVA por Cobrar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta110301" model="account.account.template">
             <field name="code">1.1.03.01</field>
             <field name="name">IVA por Cobrar</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta110302" model="account.account.template">
             <field name="code">1.1.03.02</field>
             <field name="name">Retenciones de IVA recibidas</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1104" model="account.account.template">
             <field name="code">1.1.04</field>
             <field name="name">Inventario</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta12" model="account.account.template">
             <field name="code">1.2</field>
             <field name="name">No Corriente</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta1201" model="account.account.template">
             <field name="code">1.2.01</field>
             <field name="name">Propiedad, Planta y Equipo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta120101" model="account.account.template">
             <field name="code">1.2.01.01</field>
             <field name="name">Propiedad, Planta y Equipo</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1202" model="account.account.template">
             <field name="code">1.2.02</field>
             <field name="name">Depreciaciones Acumuladas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta120201" model="account.account.template">
             <field name="code">1.2.02.01</field>
             <field name="name">Depreciaciones Acumuladas</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta13" model="account.account.template">
             <field name="code">1.3</field>
             <field name="name">Diferido</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta1301" model="account.account.template">
             <field name="code">1.3.01</field>
             <field name="name">Gastos por Amortizar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta130101" model="account.account.template">
             <field name="code">1.3.01.01</field>
             <field name="name">Gastos por Amortizar</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1302" model="account.account.template">
             <field name="code">1.3.02</field>
             <field name="name">Gastos Anticipados</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta130201" model="account.account.template">
             <field name="code">1.3.02.01</field>
             <field name="name">Gastos Anticipados</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1305" model="account.account.template">
             <field name="code">1.3.03</field>
             <field name="name">Gastos de Organización</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta130501" model="account.account.template">
             <field name="code">1.3.03.01</field>
             <field name="name">Gastos de Organización</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1306" model="account.account.template">
             <field name="code">1.3.04</field>
             <field name="name">Otros Activos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta130601" model="account.account.template">
             <field name="code">1.3.04.01</field>
             <field name="name">Otros Activos</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta2" model="account.account.template">
             <field name="code">2</field>
             <field name="name">Pasivo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta21" model="account.account.template">
             <field name="code">2.1</field>
             <field name="name">Pasivo Corto Plazo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta2101" model="account.account.template">
             <field name="code">2.1.01</field>
             <field name="name">Cuentas y Documentos por Pagar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta210101" model="account.account.template">
             <field name="code">2.1.01.01</field>
             <field name="name">Cuentas y Documentos por Pagar</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxp"/>
+            <field name="user_type_id" ref="cuenta_cxp"/>
         </record>
 
         <record id="cta2102" model="account.account.template">
             <field name="code">2.1.02</field>
             <field name="name">IVA por Pagar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta210201" model="account.account.template">
             <field name="code">2.1.02.01</field>
             <field name="name">IVA por Pagar</field>
-            <field name="user_type" ref="cuenta_pasivo"/>
+            <field name="user_type_id" ref="cuenta_pasivo"/>
         </record>
 
         <record id="cta2103" model="account.account.template">
             <field name="code">2.1.03</field>
             <field name="name">Impuestos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta210301" model="account.account.template">
             <field name="code">2.1.03.01</field>
             <field name="name">Impuestos</field>
-            <field name="user_type" ref="cuenta_pasivo"/>
+            <field name="user_type_id" ref="cuenta_pasivo"/>
         </record>
 
         <record id="cta22" model="account.account.template">
             <field name="code">2.2</field>
             <field name="name">Pasivo a Largo Plazo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta2201" model="account.account.template">
             <field name="code">2.2.01</field>
             <field name="name">Provisión para Indemnizaciones</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta220101" model="account.account.template">
             <field name="code">2.2.01.01</field>
             <field name="name">Provisión para Indemnizaciones</field>
-            <field name="user_type" ref="cuenta_pasivo"/>
+            <field name="user_type_id" ref="cuenta_pasivo"/>
         </record>
 
         <record id="cta23" model="account.account.template">
             <field name="code">2.3</field>
             <field name="name">Créditos Diferidos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta2301" model="account.account.template">
             <field name="code">2.3.01</field>
             <field name="name">Créditos Diferidos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta230101" model="account.account.template">
             <field name="code">2.3.01.01</field>
             <field name="name">Anticipos</field>
-            <field name="user_type" ref="cuenta_pasivo"/>
+            <field name="user_type_id" ref="cuenta_pasivo"/>
         </record>
 
         <record id="cta3" model="account.account.template">
             <field name="code">3</field>
             <field name="name">Patrimonio</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta31" model="account.account.template">
             <field name="code">3.1</field>
             <field name="name">Patrimonio de los Accionistas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta3101" model="account.account.template">
             <field name="code">3.1.01</field>
             <field name="name">Patrimonio de los Accionistas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta310101" model="account.account.template">
             <field name="code">3.1.01.01</field>
             <field name="name">Capital Autorizado, Suscríto y Pagado</field>
-            <field name="user_type" ref="cuenta_capital"/>
+            <field name="user_type_id" ref="cuenta_capital"/>
         </record>
 
         <record id="cta310102" model="account.account.template">
             <field name="code">3.1.01.02</field>
             <field name="name">Reservas</field>
-            <field name="user_type" ref="cuenta_capital"/>
+            <field name="user_type_id" ref="cuenta_capital"/>
         </record>
 
         <record id="cta310103" model="account.account.template">
             <field name="code">3.1.01.03</field>
             <field name="name">Perdidas y Ganancias</field>
-            <field name="user_type" ref="cuenta_capital"/>
+            <field name="user_type_id" ref="cuenta_capital"/>
         </record>
 
         <!-- Cuentas de Estado de Resultados -->
@@ -310,181 +310,181 @@
         <record id="er" model="account.account.template">
             <field name="code">B</field>
             <field name="name">Estado de Resultados</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta4" model="account.account.template">
             <field name="code">4</field>
             <field name="name">Ingresos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta41" model="account.account.template">
             <field name="code">4.1</field>
             <field name="name">Ventas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta4101" model="account.account.template">
             <field name="code">4.1.01</field>
             <field name="name">Ventas Netas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta410101" model="account.account.template">
             <field name="code">4.1.01.01</field>
             <field name="name">Ventas</field>
-            <field name="user_type" ref="cuenta_ingresos"/>
+            <field name="user_type_id" ref="cuenta_ingresos"/>
         </record>
 
         <record id="cta410102" model="account.account.template">
             <field name="code">4.1.01.02</field>
             <field name="name">Descuentos Sobre Ventas</field>
-            <field name="user_type" ref="cuenta_ingresos"/>
+            <field name="user_type_id" ref="cuenta_ingresos"/>
         </record>
 
         <record id="cta42" model="account.account.template">
             <field name="code">4.2</field>
             <field name="name">Otros Ingresos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta4201" model="account.account.template">
             <field name="code">4.2.01</field>
             <field name="name">Otros Ingresos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta420101" model="account.account.template">
             <field name="code">4.2.01.01</field>
             <field name="name">Otros Ingresos</field>
-            <field name="user_type" ref="cuenta_ingresos"/>
+            <field name="user_type_id" ref="cuenta_ingresos"/>
         </record>
 
         <record id="cta5" model="account.account.template">
             <field name="code">5</field>
             <field name="name">Egresos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta51" model="account.account.template">
             <field name="code">5.1</field>
             <field name="name">Costos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta5101" model="account.account.template">
             <field name="code">5.1.01</field>
             <field name="name">Costos de Ventas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta510101" model="account.account.template">
             <field name="code">5.1.01.01</field>
             <field name="name">Costos de Ventas</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta6" model="account.account.template">
             <field name="code">6</field>
             <field name="name">Gastos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta61" model="account.account.template">
             <field name="code">6.1</field>
             <field name="name">Gastos de Ventas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta6101" model="account.account.template">
             <field name="code">6.1.01</field>
             <field name="name">Gastos de Ventas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta610101" model="account.account.template">
             <field name="code">6.1.01.01</field>
             <field name="name">Gastos de Ventas</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta62" model="account.account.template">
             <field name="code">6.2</field>
             <field name="name">Gastos de Operación</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta6201" model="account.account.template">
             <field name="code">6.2.01</field>
             <field name="name">Gastos de Administración</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta620101" model="account.account.template">
             <field name="code">6.2.01.01</field>
             <field name="name">Gastos de Administración</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta6202" model="account.account.template">
             <field name="code">6.2.02</field>
             <field name="name">Otros Gastos de Operación</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta620201" model="account.account.template">
             <field name="code">6.2.02.01</field>
             <field name="name">Otros Gastos de Operación</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta63" model="account.account.template">
             <field name="code">6.3</field>
             <field name="name">Gastos no Deducibles</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta6301" model="account.account.template">
             <field name="code">6.3.01</field>
             <field name="name">Gastos no Deducibles</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta630101" model="account.account.template">
             <field name="code">6.3.01.01</field>
             <field name="name">Gastos no Deducibles</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta7" model="account.account.template">
             <field name="code">7</field>
             <field name="name">Otros Gastos y Productos Financieros</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta71" model="account.account.template">
             <field name="code">7.1</field>
             <field name="name">Otros Gastos y Productos Financieros</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta7101" model="account.account.template">
             <field name="code">7.1.01</field>
             <field name="name">Otros Gastos y Productos Financieros</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta710101" model="account.account.template">
             <field name="code">7.1.01.01</field>
             <field name="name">Otros Gastos Financieros</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta710102" model="account.account.template">
             <field name="code">7.1.01.02</field>
             <field name="name">Intereses</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
     </data>

addons/l10n_gt/l10n_gt_base.xml

@@ -11,10 +11,10 @@
             <field name="name">Plantilla de cuentas de Guatemala (sencilla)</field>
             <field name="account_root_id" ref="plan_raiz"/>
             <field name="bank_account_view_id" ref="cta1101"/>
-            <field name="property_account_receivable" ref="cta110201"/>
-            <field name="property_account_payable" ref="cta210101"/>
-            <field name="property_account_income_categ" ref="cta410101"/>
-            <field name="property_account_expense_categ" ref="cta510101"/>
+            <field name="property_account_receivable_id" ref="cta110201"/>
+            <field name="property_account_payable_id" ref="cta210101"/>
+            <field name="property_account_income_categ_id" ref="cta410101"/>
+            <field name="property_account_expense_categ_id" ref="cta510101"/>
             <field name="currency_id" ref="base.QTQ"/>
         </record>
 

addons/l10n_hn/account_chart.xml

@@ -7,7 +7,7 @@
         <record id="plan_raiz" model="account.account.template">
             <field name="code">-</field>
             <field name="name">Plan contable de Honduras (sencillo)</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <!-- Cuentas de Balance General -->
@@ -15,294 +15,294 @@
         <record id="bal" model="account.account.template">
             <field name="code">A</field>
             <field name="name">Balance General</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta1" model="account.account.template">
             <field name="code">1</field>
             <field name="name">Activo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta11" model="account.account.template">
             <field name="code">1.1</field>
             <field name="name">Activo Corriente</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta1101" model="account.account.template">
             <field name="code">1.1.01</field>
             <field name="name">Caja y Bancos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta110101" model="account.account.template">
             <field name="code">1.1.01.01</field>
             <field name="name">Caja Chica</field>
-            <field name="user_type" ref="cuenta_efectivo"/>
+            <field name="user_type_id" ref="cuenta_efectivo"/>
         </record>
 
         <record id="cta1102" model="account.account.template">
             <field name="code">1.1.02</field>
             <field name="name">Cuentas y Documentos por Cobrar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta110201" model="account.account.template">
             <field name="code">1.1.02.01</field>
             <field name="name">Cuentas por Cobrar Generales</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxc"/>
+            <field name="user_type_id" ref="cuenta_cxc"/>
         </record>
 
         <record id="cta110202" model="account.account.template">
             <field name="code">1.1.02.02</field>
             <field name="name">Cuentas por Cobrar Empresas Afilidas</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxc"/>
+            <field name="user_type_id" ref="cuenta_cxc"/>
         </record>
 
         <record id="cta110203" model="account.account.template">
             <field name="code">1.1.02.03</field>
             <field name="name">Prestamos al Personal</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxc"/>
+            <field name="user_type_id" ref="cuenta_cxc"/>
         </record>
 
         <record id="cta110204" model="account.account.template">
             <field name="code">1.1.02.04</field>
             <field name="name">Otras Cuentas por Cobrar</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxc"/>
+            <field name="user_type_id" ref="cuenta_cxc"/>
         </record>
 
         <record id="cta1103" model="account.account.template">
             <field name="code">1.1.03</field>
             <field name="name">ISV por Cobrar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta110301" model="account.account.template">
             <field name="code">1.1.03.01</field>
             <field name="name">ISV por Cobrar</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta110302" model="account.account.template">
             <field name="code">1.1.03.02</field>
             <field name="name">Retenciones de ISV recibidas</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1104" model="account.account.template">
             <field name="code">1.1.04</field>
             <field name="name">Inventario</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta12" model="account.account.template">
             <field name="code">1.2</field>
             <field name="name">No Corriente</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta1201" model="account.account.template">
             <field name="code">1.2.01</field>
             <field name="name">Propiedad, Planta y Equipo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta120101" model="account.account.template">
             <field name="code">1.2.01.01</field>
             <field name="name">Propiedad, Planta y Equipo</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1202" model="account.account.template">
             <field name="code">1.2.02</field>
             <field name="name">Depreciaciones Acumuladas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta120201" model="account.account.template">
             <field name="code">1.2.02.01</field>
             <field name="name">Depreciaciones Acumuladas</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta13" model="account.account.template">
             <field name="code">1.3</field>
             <field name="name">Diferido</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta1301" model="account.account.template">
             <field name="code">1.3.01</field>
             <field name="name">Gastos por Amortizar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta130101" model="account.account.template">
             <field name="code">1.3.01.01</field>
             <field name="name">Gastos por Amortizar</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1302" model="account.account.template">
             <field name="code">1.3.02</field>
             <field name="name">Gastos Anticipados</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta130201" model="account.account.template">
             <field name="code">1.3.02.01</field>
             <field name="name">Gastos Anticipados</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1305" model="account.account.template">
             <field name="code">1.3.03</field>
             <field name="name">Gastos de Organización</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta130501" model="account.account.template">
             <field name="code">1.3.03.01</field>
             <field name="name">Gastos de Organización</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta1306" model="account.account.template">
             <field name="code">1.3.04</field>
             <field name="name">Otros Activos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta130601" model="account.account.template">
             <field name="code">1.3.04.01</field>
             <field name="name">Otros Activos</field>
-            <field name="user_type" ref="cuenta_activo"/>
+            <field name="user_type_id" ref="cuenta_activo"/>
         </record>
 
         <record id="cta2" model="account.account.template">
             <field name="code">2</field>
             <field name="name">Pasivo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta21" model="account.account.template">
             <field name="code">2.1</field>
             <field name="name">Pasivo Corto Plazo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta2101" model="account.account.template">
             <field name="code">2.1.01</field>
             <field name="name">Cuentas y Documentos por Pagar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta210101" model="account.account.template">
             <field name="code">2.1.01.01</field>
             <field name="name">Cuentas y Documentos por Pagar</field>
             <field name="reconcile" eval="True"/>
-            <field name="user_type" ref="cuenta_cxp"/>
+            <field name="user_type_id" ref="cuenta_cxp"/>
         </record>
 
         <record id="cta2102" model="account.account.template">
             <field name="code">2.1.02</field>
             <field name="name">ISV por Pagar</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta210201" model="account.account.template">
             <field name="code">2.1.02.01</field>
             <field name="name">ISV por Pagar</field>
-            <field name="user_type" ref="cuenta_pasivo"/>
+            <field name="user_type_id" ref="cuenta_pasivo"/>
         </record>
 
         <record id="cta2103" model="account.account.template">
             <field name="code">2.1.03</field>
             <field name="name">Impuestos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta210301" model="account.account.template">
             <field name="code">2.1.03.01</field>
             <field name="name">Impuestos</field>
-            <field name="user_type" ref="cuenta_pasivo"/>
+            <field name="user_type_id" ref="cuenta_pasivo"/>
         </record>
 
         <record id="cta22" model="account.account.template">
             <field name="code">2.2</field>
             <field name="name">Pasivo a Largo Plazo</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta2201" model="account.account.template">
             <field name="code">2.2.01</field>
             <field name="name">Provisión para Indemnizaciones</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta220101" model="account.account.template">
             <field name="code">2.2.01.01</field>
             <field name="name">Provisión para Indemnizaciones</field>
-            <field name="user_type" ref="cuenta_pasivo"/>
+            <field name="user_type_id" ref="cuenta_pasivo"/>
         </record>
 
         <record id="cta23" model="account.account.template">
             <field name="code">2.3</field>
             <field name="name">Créditos Diferidos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta2301" model="account.account.template">
             <field name="code">2.3.01</field>
             <field name="name">Créditos Diferidos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta230101" model="account.account.template">
             <field name="code">2.3.01.01</field>
             <field name="name">Anticipos</field>
-            <field name="user_type" ref="cuenta_pasivo"/>
+            <field name="user_type_id" ref="cuenta_pasivo"/>
         </record>
 
         <record id="cta3" model="account.account.template">
             <field name="code">3</field>
             <field name="name">Patrimonio</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta31" model="account.account.template">
             <field name="code">3.1</field>
             <field name="name">Patrimonio de los Accionistas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta3101" model="account.account.template">
             <field name="code">3.1.01</field>
             <field name="name">Patrimonio de los Accionistas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta310101" model="account.account.template">
             <field name="code">3.1.01.01</field>
             <field name="name">Capital Autorizado, Suscríto y Pagado</field>
-            <field name="user_type" ref="cuenta_capital"/>
+            <field name="user_type_id" ref="cuenta_capital"/>
         </record>
 
         <record id="cta310102" model="account.account.template">
             <field name="code">3.1.01.02</field>
             <field name="name">Reservas</field>
-            <field name="user_type" ref="cuenta_capital"/>
+            <field name="user_type_id" ref="cuenta_capital"/>
         </record>
 
         <record id="cta310103" model="account.account.template">
             <field name="code">3.1.01.03</field>
             <field name="name">Perdidas y Ganancias</field>
-            <field name="user_type" ref="cuenta_capital"/>
+            <field name="user_type_id" ref="cuenta_capital"/>
         </record>
 
         <!-- Cuentas de Estado de Resultados -->
@@ -310,181 +310,181 @@
         <record id="er" model="account.account.template">
             <field name="code">B</field>
             <field name="name">Estado de Resultados</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta4" model="account.account.template">
             <field name="code">4</field>
             <field name="name">Ingresos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta41" model="account.account.template">
             <field name="code">4.1</field>
             <field name="name">Ventas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta4101" model="account.account.template">
             <field name="code">4.1.01</field>
             <field name="name">Ventas Netas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta410101" model="account.account.template">
             <field name="code">4.1.01.01</field>
             <field name="name">Ventas</field>
-            <field name="user_type" ref="cuenta_ingresos"/>
+            <field name="user_type_id" ref="cuenta_ingresos"/>
         </record>
 
         <record id="cta410102" model="account.account.template">
             <field name="code">4.1.01.02</field>
             <field name="name">Descuentos Sobre Ventas</field>
-            <field name="user_type" ref="cuenta_ingresos"/>
+            <field name="user_type_id" ref="cuenta_ingresos"/>
         </record>
 
         <record id="cta42" model="account.account.template">
             <field name="code">4.2</field>
             <field name="name">Otros Ingresos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta4201" model="account.account.template">
             <field name="code">4.2.01</field>
             <field name="name">Otros Ingresos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta420101" model="account.account.template">
             <field name="code">4.2.01.01</field>
             <field name="name">Otros Ingresos</field>
-            <field name="user_type" ref="cuenta_ingresos"/>
+            <field name="user_type_id" ref="cuenta_ingresos"/>
         </record>
 
         <record id="cta5" model="account.account.template">
             <field name="code">5</field>
             <field name="name">Egresos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta51" model="account.account.template">
             <field name="code">5.1</field>
             <field name="name">Costos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta5101" model="account.account.template">
             <field name="code">5.1.01</field>
             <field name="name">Costos de Ventas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta510101" model="account.account.template">
             <field name="code">5.1.01.01</field>
             <field name="name">Costos de Ventas</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta6" model="account.account.template">
             <field name="code">6</field>
             <field name="name">Gastos</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta61" model="account.account.template">
             <field name="code">6.1</field>
             <field name="name">Gastos de Ventas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta6101" model="account.account.template">
             <field name="code">6.1.01</field>
             <field name="name">Gastos de Ventas</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta610101" model="account.account.template">
             <field name="code">6.1.01.01</field>
             <field name="name">Gastos de Ventas</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta62" model="account.account.template">
             <field name="code">6.2</field>
             <field name="name">Gastos de Operación</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta6201" model="account.account.template">
             <field name="code">6.2.01</field>
             <field name="name">Gastos de Administración</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta620101" model="account.account.template">
             <field name="code">6.2.01.01</field>
             <field name="name">Gastos de Administración</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta6202" model="account.account.template">
             <field name="code">6.2.02</field>
             <field name="name">Otros Gastos de Operación</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta620201" model="account.account.template">
             <field name="code">6.2.02.01</field>
             <field name="name">Otros Gastos de Operación</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta63" model="account.account.template">
             <field name="code">6.3</field>
             <field name="name">Gastos no Deducibles</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta6301" model="account.account.template">
             <field name="code">6.3.01</field>
             <field name="name">Gastos no Deducibles</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta630101" model="account.account.template">
             <field name="code">6.3.01.01</field>
             <field name="name">Gastos no Deducibles</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta7" model="account.account.template">
             <field name="code">7</field>
             <field name="name">Otros Gastos y Productos Financieros</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta71" model="account.account.template">
             <field name="code">7.1</field>
             <field name="name">Otros Gastos y Productos Financieros</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta7101" model="account.account.template">
             <field name="code">7.1.01</field>
             <field name="name">Otros Gastos y Productos Financieros</field>
-            <field name="user_type" ref="cuenta_vista"/>
+            <field name="user_type_id" ref="cuenta_vista"/>
         </record>
 
         <record id="cta710101" model="account.account.template">
             <field name="code">7.1.01.01</field>
             <field name="name">Otros Gastos Financieros</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
         <record id="cta710102" model="account.account.template">
             <field name="code">7.1.01.02</field>
             <field name="name">Intereses</field>
-            <field name="user_type" ref="cuenta_gastos"/>
+            <field name="user_type_id" ref="cuenta_gastos"/>
         </record>
 
     </data>

addons/l10n_hn/l10n_hn_base.xml

@@ -12,10 +12,10 @@
             <field name="name">Plantilla de cuentas de Honduras (sencilla)</field>
             <field name="account_root_id" ref="plan_raiz"/>
             <field name="bank_account_view_id" ref="cta1101"/>
-            <field name="property_account_receivable" ref="cta110201"/>
-            <field name="property_account_payable" ref="cta210101"/>
-            <field name="property_account_income_categ" ref="cta410101"/>
-            <field name="property_account_expense_categ" ref="cta510101"/>
+            <field name="property_account_receivable_id" ref="cta110201"/>
+            <field name="property_account_payable_id" ref="cta210101"/>
+            <field name="property_account_income_categ_id" ref="cta410101"/>
+            <field name="property_account_expense_categ_id" ref="cta510101"/>
             <field name="currency_id" ref="base.HNL"/>
         </record>
 

addons/l10n_hr/l10n_hr_chart_template.xml

@@ -9,11 +9,11 @@
 			<field name="account_root_id"                ref="kp_rrif" />
 			<field name="bank_account_view_id"           ref="kp_rrif1000"/>
 
-			<field name="property_account_receivable"    ref="kp_rrif1200"/>
-			<field name="property_account_payable"       ref="kp_rrif2200"/>
+			<field name="property_account_receivable_id"    ref="kp_rrif1200"/>
+			<field name="property_account_payable_id"       ref="kp_rrif2200"/>
 
-			<field name="property_account_expense_categ" ref="kp_rrif4199"/>
-			<field name="property_account_income_categ"  ref="kp_rrif7500"/>
+			<field name="property_account_expense_categ_id" ref="kp_rrif4199"/>
+			<field name="property_account_income_categ_id"  ref="kp_rrif7500"/>
 			<field name="currency_id" ref="base.HRK"/>
 		</record>