Merge account kind and account type

issue4990
review68401002

CHANGELOG

@@ -1,3 +1,5 @@
+* Remove display balance
+* Merge account kind and account type
 * Add origin on move line
 * Base journal cash report on account kind receivable and payable
 

account.py

@@ -47,33 +47,120 @@ def inactive_records(func):
     return wrapper
 
 
+def TypeMixin(template=False):
+
+    class Mixin:
+        name = fields.Char('Name', required=True)
+
+        statement = fields.Selection([
+                (None, ""),
+                ('balance', "Balance"),
+                ('income', "Income"),
+                ('off-balance', "Off-Balance"),
+                ], "Statement",
+            states={
+                'required': Bool(Eval('parent')),
+                },
+            depends=['parent'])
+        assets = fields.Boolean(
+            "Assets",
+            states={
+                'invisible': Eval('statement') != 'balance',
+                },
+            depends=['statement'])
+
+        receivable = fields.Boolean(
+            "Receivable",
+            domain=[
+                If(Eval('statement') != 'balance',
+                    ('receivable', '=', False), ()),
+                ],
+            states={
+                'invisible': ((Eval('statement') != 'balance')
+                    | ~Eval('assets', True)),
+                },
+            depends=['statement', 'assets'])
+        stock = fields.Boolean(
+            "Stock",
+            domain=[
+                If(Eval('statement') == 'off-balance',
+                    ('stock', '=', False), ()),
+                ],
+            states={
+                'invisible': Eval('statement') == 'off-balance',
+                },
+            depends=['statement'])
+
+        payable = fields.Boolean(
+            "Payable",
+            domain=[
+                If(Eval('statement') != 'balance',
+                    ('payable', '=', False), ()),
+                ],
+            states={
+                'invisible': ((Eval('statement') != 'balance')
+                    | Eval('assets', False)),
+                },
+            depends=['statement', 'assets'])
+
+        revenue = fields.Boolean(
+            "Revenue",
+            domain=[
+                If(Eval('statement') != 'income',
+                    ('revenue', '=', False), ()),
+                ],
+            states={
+                'invisible': Eval('statement') != 'income',
+                },
+            depends=['statement'])
+
+        expense = fields.Boolean(
+            "Expense",
+            domain=[
+                If(Eval('statement') != 'income',
+                    ('expense', '=', False), ()),
+                ],
+            states={
+                'invisible': Eval('statement') != 'income',
+                },
+            depends=['statement'])
+    if not template:
+        for fname in dir(Mixin):
+            field = getattr(Mixin, fname)
+            if not isinstance(field, fields.Field):
+                continue
+            field.states['readonly'] = (
+                Bool(Eval('template', -1)) & ~Eval('template_override', False))
+    return Mixin
+
+
 class TypeTemplate(
-        sequence_ordered(), tree(separator='\\'), ModelSQL, ModelView):
+        TypeMixin(template=True), sequence_ordered(), tree(separator='\\'),
+        ModelSQL, ModelView):
     'Account Type Template'
     __name__ = 'account.account.type.template'
-    name = fields.Char('Name', required=True)
-    parent = fields.Many2One('account.account.type.template', 'Parent',
-            ondelete="RESTRICT")
-    childs = fields.One2Many('account.account.type.template', 'parent',
-        'Children')
-    balance_sheet = fields.Boolean('Balance Sheet')
-    income_statement = fields.Boolean('Income Statement')
-    display_balance = fields.Selection([
-        ('debit-credit', 'Debit - Credit'),
-        ('credit-debit', 'Credit - Debit'),
-        ], 'Display Balance', required=True)
+    parent = fields.Many2One(
+        'account.account.type.template', "Parent", ondelete='RESTRICT',
+        domain=['OR',
+            If(Eval('statement') == 'off-balance',
+                ('statement', '=', 'off-balance'),
+                If(Eval('statement') == 'balance',
+                    ('statement', '=', 'balance'),
+                    ('statement', '!=', 'off-balance')),
+                ),
+            ('statement', '=', None),
+            ],
+        depends=['statement'])
+    childs = fields.One2Many(
+        'account.account.type.template', 'parent', "Children")
 
-    @staticmethod
-    def default_balance_sheet():
-        return False
+    @classmethod
+    def __register__(cls, module_name):
+        super().__register__(module_name)
+        table_h = cls.__table_handler__(module_name)
 
-    @staticmethod
-    def default_income_statement():
-        return False
-
-    @staticmethod
-    def default_display_balance():
-        return 'debit-credit'
+        # Migration from 5.0: remove display_balance
+        table_h.drop_column('display_balance')
 
     def _get_type_value(self, type=None):
         '''
@@ -84,12 +171,14 @@ class TypeTemplate(
             res['name'] = self.name
         if not type or type.sequence != self.sequence:
             res['sequence'] = self.sequence
-        if not type or type.balance_sheet != self.balance_sheet:
-            res['balance_sheet'] = self.balance_sheet
-        if not type or type.income_statement != self.income_statement:
-            res['income_statement'] = self.income_statement
-        if not type or type.display_balance != self.display_balance:
-            res['display_balance'] = self.display_balance
+        if not type or type.statement != self.statement:
+            res['statement'] = self.statement
+        if not type or type.assets != self.assets:
+            res['assets'] = self.assets
+        for boolean in [
+                'receivable', 'stock', 'payable', 'revenue', 'expense']:
+            if not type or getattr(type, boolean) != getattr(self, boolean):
+                res[boolean] = getattr(self, boolean)
         if not type or type.template != self:
             res['template'] = self.id
         return res
@@ -132,26 +221,28 @@ class TypeTemplate(
             childs = sum((c.childs for c in childs), ())
 
 
-class Type(sequence_ordered(), tree(separator='\\'), ModelSQL, ModelView):
+class Type(
+        TypeMixin(), sequence_ordered(), tree(separator='\\'),
+        ModelSQL, ModelView):
     'Account Type'
     __name__ = 'account.account.type'
 
-    _states = {
-        'readonly': (Bool(Eval('template', -1)) &
-            ~Eval('template_override', False)),
-        }
-    name = fields.Char('Name', size=None, required=True, states=_states)
     parent = fields.Many2One('account.account.type', 'Parent',
-        ondelete="RESTRICT", states=_states,
+        ondelete="RESTRICT",
+        states={
+            'readonly': (Bool(Eval('template', -1)) &
+                ~Eval('template_override', False)),
+            },
         domain=[
             ('company', '=', Eval('company')),
             ],
-        depends=['company'])
+        depends=['company', 'statement'])
     childs = fields.One2Many('account.account.type', 'parent', 'Children',
         domain=[
             ('company', '=', Eval('company')),
         ],
         depends=['company'])
+
     currency_digits = fields.Function(fields.Integer('Currency Digits'),
             'get_currency_digits')
     amount = fields.Function(fields.Numeric('Amount',
@@ -160,12 +251,7 @@ class Type(sequence_ordered(), tree(separator='\\'), ModelSQL, ModelView):
     amount_cmp = fields.Function(fields.Numeric('Amount',
         digits=(16, Eval('currency_digits', 2)), depends=['currency_digits']),
         'get_amount_cmp')
-    balance_sheet = fields.Boolean('Balance Sheet', states=_states)
-    income_statement = fields.Boolean('Income Statement', states=_states)
-    display_balance = fields.Selection([
-        ('debit-credit', 'Debit - Credit'),
-        ('credit-debit', 'Credit - Debit'),
-        ], 'Display Balance', required=True, states=_states)
+
     company = fields.Many2One('company.company', 'Company', required=True,
             ondelete="RESTRICT")
     template = fields.Many2One('account.account.type.template', 'Template')
@@ -175,19 +261,14 @@ class Type(sequence_ordered(), tree(separator='\\'), ModelSQL, ModelView):
             'invisible': ~Bool(Eval('template', -1)),
             },
         depends=['template'])
-    del _states
 
-    @staticmethod
-    def default_balance_sheet():
-        return False
+    @classmethod
+    def __register__(cls, module_name):
+        super().__register__(module_name)
+        table_h = cls.__table_handler__(module_name)
 
-    @staticmethod
-    def default_income_statement():
-        return False
-
-    @staticmethod
-    def default_display_balance():
-        return 'debit-credit'
+        # Migration from 5.0: remove display_balance
+        table_h.drop_column('display_balance')
 
     @classmethod
     def default_template_override(cls):
@@ -221,10 +302,9 @@ class Type(sequence_ordered(), tree(separator='\\'), ModelSQL, ModelView):
         with Transaction().set_context(periods=period_ids):
             accounts = Account.search([
                     ('type', 'in', [t.id for t in childs]),
-                    ('kind', '!=', 'view'),
                     ])
         for account in accounts:
-            type_sum[account.type.id] += (account.debit - account.credit)
+            type_sum[account.type.id] += (account.credit - account.debit)
 
         for type_ in types:
             childs = cls.search([
@@ -234,7 +314,7 @@ class Type(sequence_ordered(), tree(separator='\\'), ModelSQL, ModelView):
                 res[type_.id] += type_sum[child.id]
             exp = Decimal(str(10.0 ** -type_.currency_digits))
             res[type_.id] = res[type_.id].quantize(exp)
-            if type_.display_balance == 'credit-debit':
+            if type_.statement == 'balance' and type_.assets:
                 res[type_.id] = - res[type_.id]
         return res
 
@@ -331,53 +411,136 @@ class OpenType(Wizard):
     do_ledger_account = open_action
 
 
-class AccountTemplate(PeriodMixin, tree(), ModelSQL, ModelView):
+def AccountMixin(template=False):
+
+    class Mixin:
+        name = fields.Char('Name', required=True, select=True)
+        code = fields.Char('Code', select=True)
+
+        closed = fields.Boolean(
+            "Closed",
+            states={
+                'invisible': ~Eval('type'),
+                },
+            depends=['type'],
+            help="Check to prevent posting move on the account.")
+        reconcile = fields.Boolean(
+            "Reconcile",
+            states={
+                'invisible': ~Eval('type'),
+                },
+            depends=['type'],
+            help="Allow move lines of this account to be reconciled.")
+
+        party_required = fields.Boolean('Party Required',
+            domain=[
+                If(~Eval('type') | ~Eval('deferral', False),
+                    ('party_required', '=', False),
+                    ()),
+                ],
+            states={
+                'invisible': ~Eval('type') | ~Eval('deferral', False),
+                },
+            depends=['type', 'deferral'])
+
+        general_ledger_balance = fields.Boolean('General Ledger Balance',
+            states={
+                'invisible': ~Eval('type'),
+                },
+            depends=['type'],
+            help="Display only the balance in the general ledger report")
+
+        deferral = fields.Function(fields.Boolean(
+                "Deferral",
+                states={
+                    'invisible': ~Eval('type'),
+                    },
+                depends=['type']),
+            'on_change_with_deferral', searcher='search_deferral')
+
+        @classmethod
+        def default_closed(cls):
+            return False
+
+        @classmethod
+        def default_reconcile(cls):
+            return False
+
+        @classmethod
+        def default_party_required(cls):
+            return False
+
+        @classmethod
+        def default_general_ledger_balance(cls):
+            return False
+
+        @fields.depends('type')
+        def on_change_with_deferral(self, name=None):
+            return (self.type
+                and self.type.statement in {'balance', 'off-balance'})
+
+        @classmethod
+        def search_deferral(cls, name, clause):
+            _, operator, value = clause
+            if operator in {'in', 'not in'}:
+                if operator == 'in':
+                    operator = '='
+                else:
+                    operator = '!='
+                if True in value and False not in value:
+                    value = '=', True
+                elif False in value and True not in value:
+                    value = '=', False
+                else:
+                    return [('id', operator, None)]
+            if ((operator == '=' and value)
+                    or (operator == '!=' and not value)):
+                return [
+                    ('type.statement', 'in', ['balance', 'off-balance']),
+                    ]
+            else:
+                return ['OR',
+                    ('type', '=', None),
+                    ('type.statement', 'not in', ['balance', 'off-balance']),
+                    ]
+
+        def get_rec_name(self, name):
+            if self.code:
+                return self.code + ' - ' + self.name
+            else:
+                return self.name
+
+        @classmethod
+        def search_rec_name(cls, name, clause):
+            if clause[1].startswith('!') or clause[1].startswith('not '):
+                bool_op = 'AND'
+            else:
+                bool_op = 'OR'
+            return [bool_op,
+                ('code',) + tuple(clause[1:]),
+                (cls._rec_name,) + tuple(clause[1:]),
+                ]
+
+    if not template:
+        for fname in dir(Mixin):
+            field = getattr(Mixin, fname)
+            if (not isinstance(field, fields.Field)
+                    or isinstance(field, fields.Function)):
+                continue
+            field.states['readonly'] = (
+                Bool(Eval('template', -1)) & ~Eval('template_override', False))
+    return Mixin
+
+
+class AccountTemplate(
+        AccountMixin(template=True), PeriodMixin, tree(), ModelSQL, ModelView):
     'Account Template'
     __name__ = 'account.account.template'
-    name = fields.Char('Name', size=None, required=True, select=True)
-    code = fields.Char('Code', size=None, select=True)
-    type = fields.Many2One('account.account.type.template', 'Type',
-        ondelete="RESTRICT",
-        states={
-            'invisible': Eval('kind') == 'view',
-            'required': Eval('kind') != 'view',
-            }, depends=['kind'])
+    type = fields.Many2One(
+        'account.account.type.template', "Type", ondelete="RESTRICT")
     parent = fields.Many2One('account.account.template', 'Parent', select=True,
             ondelete="RESTRICT")
     childs = fields.One2Many('account.account.template', 'parent', 'Children')
-    reconcile = fields.Boolean('Reconcile',
-        states={
-            'invisible': Eval('kind') == 'view',
-            }, depends=['kind'])
-    kind = fields.Selection([
-            ('other', 'Other'),
-            ('payable', 'Payable'),
-            ('revenue', 'Revenue'),
-            ('receivable', 'Receivable'),
-            ('expense', 'Expense'),
-            ('stock', 'Stock'),
-            ('view', 'View'),
-            ], 'Kind', required=True)
-    deferral = fields.Boolean('Deferral', states={
-            'invisible': Eval('kind') == 'view',
-            }, depends=['kind'])
-    party_required = fields.Boolean('Party Required',
-        domain=[
-            If((Eval('kind') == 'view') | ~Eval('deferral', False),
-                ('party_required', '=', False),
-                (),
-                )
-            ],
-        states={
-            'invisible': (Eval('kind') == 'view') | ~Eval('deferral', False),
-            },
-        depends=['kind', 'deferral'])
-    general_ledger_balance = fields.Boolean('General Ledger Balance',
-        states={
-            'invisible': Eval('kind') == 'view',
-            },
-        depends=['kind'],
-        help="Display only the balance in the general ledger report")
     taxes = fields.Many2Many('account.account.template-account.tax.template',
             'account', 'tax', 'Default Taxes',
             domain=[('parent', '=', None)])
@@ -393,42 +556,14 @@ class AccountTemplate(PeriodMixin, tree(), ModelSQL, ModelView):
         cls._order.insert(0, ('code', 'ASC'))
         cls._order.insert(1, ('name', 'ASC'))
 
-    @staticmethod
-    def default_kind():
-        return 'view'
-
-    @staticmethod
-    def default_reconcile():
-        return False
-
-    @staticmethod
-    def default_deferral():
-        return True
-
-    @staticmethod
-    def default_party_required():
-        return False
-
-    @staticmethod
-    def default_general_ledger_balance():
-        return False
-
-    def get_rec_name(self, name):
-        if self.code:
-            return self.code + ' - ' + self.name
-        else:
-            return self.name
-
     @classmethod
-    def search_rec_name(cls, name, clause):
-        if clause[1].startswith('!') or clause[1].startswith('not '):
-            bool_op = 'AND'
-        else:
-            bool_op = 'OR'
-        return [bool_op,
-            ('code',) + tuple(clause[1:]),
-            (cls._rec_name,) + tuple(clause[1:]),
-            ]
+    def __register__(cls, module_name):
+        super().__register__(module_name)
+
+        table_h = cls.__table_handler__(module_name)
+
+        # Migration from 5.0: remove kind
+        table_h.drop_column('kind')
 
     def _get_account_value(self, account=None):
         '''
@@ -439,16 +574,14 @@ class AccountTemplate(PeriodMixin, tree(), ModelSQL, ModelView):
             res['name'] = self.name
         if not account or account.code != self.code:
             res['code'] = self.code
-        if not account or account.kind != self.kind:
-            res['kind'] = self.kind
         if not account or account.start_date != self.start_date:
             res['start_date'] = self.start_date
         if not account or account.end_date != self.end_date:
             res['end_date'] = self.end_date
+        if not account or account.closed != self.closed:
+            res['closed'] = self.closed
         if not account or account.reconcile != self.reconcile:
             res['reconcile'] = self.reconcile
-        if not account or account.deferral != self.deferral:
-            res['deferral'] = self.deferral
         if not account or account.party_required != self.party_required:
             res['party_required'] = self.party_required
         if (not account
@@ -563,15 +696,13 @@ class AccountTemplateTaxTemplate(ModelSQL):
             ondelete='RESTRICT', select=True, required=True)
 
 
-class Account(ActivePeriodMixin, tree(), ModelSQL, ModelView):
+class Account(AccountMixin(), ActivePeriodMixin, tree(), ModelSQL, ModelView):
     'Account'
     __name__ = 'account.account'
     _states = {
         'readonly': (Bool(Eval('template', -1)) &
             ~Eval('template_override', False)),
         }
-    name = fields.Char('Name', required=True, select=True, states=_states)
-    code = fields.Char('Code', select=True, states=_states)
     company = fields.Many2One('company.company', 'Company', required=True,
             ondelete="RESTRICT")
     currency = fields.Function(fields.Many2One('currency.currency',
@@ -586,22 +717,20 @@ class Account(ActivePeriodMixin, tree(), ModelSQL, ModelView):
             ],
         states={
             'reaodnly': _states['readonly'],
-            'invisible': (Eval('kind').in_(
-                    ['payable', 'revenue', 'receivable', 'expense'])
-                | ~Eval('deferral', False)),
+            'invisible': ~Eval('deferral', False),
             },
-        depends=['currency', 'kind', 'deferral'])
+        depends=['currency', 'deferral'])
     second_currency_digits = fields.Function(fields.Integer(
             "Second Currency Digits"), 'get_second_currency_digits')
-    type = fields.Many2One('account.account.type', 'Type', ondelete="RESTRICT",
+    type = fields.Many2One(
+        'account.account.type', "Type", ondelete='RESTRICT',
         states={
-            'invisible': Eval('kind') == 'view',
-            'required': Eval('kind') != 'view',
             'readonly': _states['readonly'],
             },
         domain=[
             ('company', '=', Eval('company')),
-            ], depends=['kind', 'company'])
+            ],
+        depends=['company'])
     parent = fields.Many2One(
         'account.account', 'Parent', select=True,
         left="left", right="right", ondelete="RESTRICT", states=_states)
@@ -626,48 +755,13 @@ class Account(ActivePeriodMixin, tree(), ModelSQL, ModelView):
                 },
             depends=['second_currency_digits', 'second_currency']),
         'get_credit_debit')
-    reconcile = fields.Boolean('Reconcile',
-        help='Allow move lines of this account \nto be reconciled.',
-        states={
-            'invisible': Eval('kind') == 'view',
-            'readonly': _states['readonly'],
-            }, depends=['kind'])
     note = fields.Text('Note')
-    kind = fields.Selection([
-            ('other', 'Other'),
-            ('payable', 'Payable'),
-            ('revenue', 'Revenue'),
-            ('receivable', 'Receivable'),
-            ('expense', 'Expense'),
-            ('stock', 'Stock'),
-            ('view', 'View'),
-            ], 'Kind', required=True, states=_states)
-    deferral = fields.Boolean('Deferral', states={
-            'invisible': Eval('kind') == 'view',
-            'readonly': _states['readonly'],
-            }, depends=['kind'])
-    deferrals = fields.One2Many('account.account.deferral', 'account',
-        'Deferrals', readonly=True, states={
-            'invisible': Eval('kind') == 'view',
-            }, depends=['kind'])
-    party_required = fields.Boolean('Party Required',
-        domain=[
-            If((Eval('kind') == 'view') | ~Eval('deferral', False),
-                ('party_required', '=', False),
-                (),
-                )
-            ],
+    deferrals = fields.One2Many(
+        'account.account.deferral', 'account', "Deferrals", readonly=True,
         states={
-            'invisible': (Eval('kind') == 'view') | ~Eval('deferral', False),
-            'readonly': _states['readonly'],
+            'invisible': ~Eval('type'),
             },
-        depends=['kind', 'deferral'])
-    general_ledger_balance = fields.Boolean('General Ledger Balance',
-        states={
-            'invisible': Eval('kind') == 'view',
-            },
-        depends=['kind'],
-        help="Display only the balance in the general ledger report")
+        depends=['type'])
     taxes = fields.Many2Many('account.account-account.tax',
             'account', 'tax', 'Default Taxes',
             domain=[
@@ -705,6 +799,15 @@ class Account(ActivePeriodMixin, tree(), ModelSQL, ModelView):
         cls._order.insert(0, ('code', 'ASC'))
         cls._order.insert(1, ('name', 'ASC'))
 
+    @classmethod
+    def __register__(cls, module_name):
+        super().__register__(module_name)
+
+        table_h = cls.__table_handler__(module_name)
+
+        # Migration from 5.0: remove kind
+        table_h.drop_column('kind')
+
     @classmethod
     def validate(cls, accounts):
         super(Account, cls).validate(accounts)
@@ -722,26 +825,6 @@ class Account(ActivePeriodMixin, tree(), ModelSQL, ModelView):
     def default_company():
         return Transaction().context.get('company') or None
 
-    @staticmethod
-    def default_reconcile():
-        return False
-
-    @staticmethod
-    def default_deferral():
-        return True
-
-    @staticmethod
-    def default_party_required():
-        return False
-
-    @staticmethod
-    def default_general_ledger_balance():
-        return False
-
-    @staticmethod
-    def default_kind():
-        return 'view'
-
     @classmethod
     def default_template_override(cls):
         return False
@@ -916,14 +999,8 @@ class Account(ActivePeriodMixin, tree(), ModelSQL, ModelView):
 
         return values
 
-    def get_rec_name(self, name):
-        if self.code:
-            return self.code + ' - ' + self.name
-        else:
-            return self.name
-
     __on_change_parent_fields = ['name', 'code', 'company', 'type',
-        'reconcile', 'kind', 'deferral', 'party_required',
+        'reconcile', 'deferral', 'party_required',
         'general_ledger_balance', 'taxes']
 
     @fields.depends('parent', *__on_change_parent_fields)
@@ -932,7 +1009,7 @@ class Account(ActivePeriodMixin, tree(), ModelSQL, ModelView):
             return
         for field in self.__on_change_parent_fields:
             if (not getattr(self, field)
-                    or field in {'reconcile', 'kind', 'deferral',
+                    or field in {'reconcile', 'deferral',
                         'party_required', 'general_ledger_balance'}):
                 setattr(self, field, getattr(self.parent, field))
 
@@ -954,7 +1031,11 @@ class Account(ActivePeriodMixin, tree(), ModelSQL, ModelView):
         for account in accounts:
             if not account.second_currency:
                 continue
-            if account.kind != 'other':
+            if (not account.type
+                    or account.type.payable
+                    or account.type.revenue
+                    or account.type.receivable
+                    or account.type.expense):
                 raise SecondCurrencyError(
                     gettext('account.msg_account_invalid_type_second_currency',
                         account=account.rec_name))
@@ -1301,7 +1382,7 @@ class GeneralLedgerAccount(ActivePeriodMixin, ModelSQL, ModelView):
                 columns.append(Column(account, fname).as_(fname))
         return account.select(*columns,
             where=(account.company == context.get('company'))
-            & (account.kind != 'view'))
+            & (account.type != Null))
 
     @classmethod
     def get_period_ids(cls, name):
@@ -1963,17 +2044,19 @@ class AgedBalance(ModelSQL, ModelView):
         Move = pool.get('account.move')
         Reconciliation = pool.get('account.move.reconciliation')
         Account = pool.get('account.account')
+        Type = pool.get('account.account.type')
 
         line = MoveLine.__table__()
         move = Move.__table__()
         reconciliation = Reconciliation.__table__()
         account = Account.__table__()
+        type_ = Type.__table__()
 
         company_id = context.get('company')
         date = context.get('date')
         with Transaction().set_context(date=None):
             line_query, _ = MoveLine.query_get(line)
-        kind = cls.get_kind()
+        kind = cls.get_kind(type_)
         columns = [
             line.party.as_('id'),
             Literal(0).as_('create_uid'),
@@ -2008,11 +2091,12 @@ class AgedBalance(ModelSQL, ModelView):
 
         return line.join(move, condition=line.move == move.id
             ).join(account, condition=line.account == account.id
+            ).join(type_, condition=account.type == type_.id
             ).join(reconciliation, 'LEFT',
                 condition=reconciliation.id == line.reconciliation
             ).select(*columns,
                 where=(line.party != Null)
-                & account.kind.in_(kind)
+                & kind
                 & ((line.reconciliation == Null)
                     | (reconciliation.date > date))
                 & (move.date <= date)
@@ -2040,17 +2124,17 @@ class AgedBalance(ModelSQL, ModelView):
             return datetime.timedelta(days=1)
 
     @classmethod
-    def get_kind(cls):
+    def get_kind(cls, account_type):
         context = Transaction().context
         type_ = context.get('type', 'customer')
         if type_ == 'customer_supplier':
-            return ['payable', 'receivable']
+            return account_type.payable | account_type.receivable
         elif type_ == 'supplier':
-            return ['payable']
+            return account_type.payable
         elif type_ == 'customer':
-            return ['receivable']
+            return account_type.receivable
         else:
-            return []
+            return Literal(False)
 
     def get_currency_digits(self, name):
         return self.company.currency.digits
@@ -2111,14 +2195,14 @@ class CreateChartProperties(ModelView):
     account_receivable = fields.Many2One('account.account',
             'Default Receivable Account',
             domain=[
-                ('kind', '=', 'receivable'),
+                ('type.receivable', '=', True),
                 ('company', '=', Eval('company')),
             ],
             depends=['company'])
     account_payable = fields.Many2One('account.account',
             'Default Payable Account',
             domain=[
-                ('kind', '=', 'payable'),
+                ('type.payable', '=', True),
                 ('company', '=', Eval('company')),
             ],
             depends=['company'])

account.xml

@@ -360,7 +360,7 @@ this repository contains the full copyright notices and license terms. -->
                 eval="[('company', '=', Eval('company', -1))]"
                 pyson="1"/>
             <field name="domain"
-                eval="[('type', 'child_of', Eval('active_id'), 'parent'), ('kind', '!=', 'view')]"
+                eval="[('type', 'child_of', Eval('active_id'), 'parent'), ('type', '!=', None)]"
                 pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_account_list2_view1">
@@ -614,7 +614,7 @@ this repository contains the full copyright notices and license terms. -->
                 eval="[('company', '=', Eval('company', -1))]"
                 pyson="1"/>
             <field name="domain"
-                eval="[('balance_sheet', '=', True), ['OR', ('parent', '=', None), ('parent.balance_sheet', '=', False)]]"
+                eval="[('statement', '=', 'balance'), ['OR', ('parent', '=', None), ('parent.statement', '!=', 'balance'), ('parent.statement', '=', None)]]"
                 pyson="1"/>
             <field name="context" eval="{'cumulate': True}" pyson="1"/>
         </record>
@@ -653,7 +653,7 @@ this repository contains the full copyright notices and license terms. -->
                 eval="[('company', '=', Eval('company', -1))]"
                 pyson="1"/>
             <field name="domain"
-                eval="[('income_statement', '=', True), ['OR', ('parent', '=', None), ('parent.income_statement', '=', False)]]"
+                eval="[('statement', '=', 'income'), ['OR', ('parent', '=', None), ('parent.statement', '!=', 'income')]]"
                 pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_income_statement_view1">

configuration.py

@@ -22,14 +22,14 @@ class Configuration(
     default_account_receivable = fields.MultiValue(fields.Many2One(
             'account.account', "Default Account Receivable",
             domain=[
-                ('kind', '=', 'receivable'),
+                ('type.receivable', '=', True),
                 ('party_required', '=', True),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ]))
     default_account_payable = fields.MultiValue(fields.Many2One(
             'account.account', "Default Account Payable",
             domain=[
-                ('kind', '=', 'payable'),
+                ('type.payable', '=', True),
                 ('party_required', '=', True),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ]))
@@ -54,7 +54,7 @@ class ConfigurationDefaultAccount(ModelSQL, CompanyValueMixin):
     default_account_receivable = fields.Many2One(
         'account.account', "Default Account Receivable",
         domain=[
-            ('kind', '=', 'receivable'),
+            ('type.receivable', '=', True),
             ('party_required', '=', True),
             ('company', '=', Eval('company', -1)),
             ],
@@ -62,7 +62,7 @@ class ConfigurationDefaultAccount(ModelSQL, CompanyValueMixin):
     default_account_payable = fields.Many2One(
         'account.account', "Default Account Payable",
         domain=[
-            ('kind', '=', 'payable'),
+            ('type.payable', '=', True),
             ('party_required', '=', True),
             ('company', '=', Eval('company', -1)),
             ],

doc/index.rst

@@ -48,14 +48,8 @@ Account Type
 ************
 
 The Account Type Model defines the structure of the accounting
-reports:
-
-- Income Statement: A checkbox that tells if accounts of this type
-  must appear at the top level of the Income Statement report.
-- Balance Sheet: A checkbox that tells if accounts of this type
-  must appear at the top level of the Balance Sheet report.
-- Display Balance: A selection that allow to choose how the balance
-  should be computed (Debit - Credit or Credit - Debit)
+reports as balance sheet and income statement.
+It also defines check boxes to filter its accounts by usage.
 
 
 Account
@@ -68,23 +62,12 @@ An Account is defined by these fields:
 - Company
 - Parent Account
 - Currency
-- kind: can take one of these values:
-
-  - Payable or Receivable: if the account is used respectively on
-    credit and debit moves of parties.
-  - Expense or Revenue: if the account is used respectively on expense
-    and revenue moves of parties.
-  - View: means that the account is used to group other accounts in
-    the account chart.
-  - Other: For other accounts.
-
 - Type: The Account Type of the account.
 - Start and End Date: The period for which the account can be used.
 - Replaced By: the account to use after end date.
-- Deferral: A checkbox. If set to true, credit and debit are carried
-  over form fiscal year to fiscal year.
 - Second currency: Force all moves for the account to have this
   secondary currency.
+- Closed: Forbid move on the account.
 - Reconcile: Allow move lines of this account to be reconciled.
 - Party Required: Make party required for move lines of this account.
 - Taxes: This list of tax auto-complete move with new moves lines

fiscalyear.py

@@ -249,7 +249,7 @@ class FiscalYear(Workflow, ModelSQL, ModelView):
         Currency = pool.get('currency.currency')
         Deferral = pool.get('account.account.deferral')
 
-        if account.kind == 'view':
+        if not account.type:
             return
         if not account.deferral:
             if not Currency.is_zero(self.company.currency, account.balance):
@@ -365,7 +365,8 @@ class BalanceNonDeferralStart(ModelView):
     credit_account = fields.Many2One('account.account', 'Credit Account',
         required=True,
         domain=[
-            ('kind', '!=', 'view'),
+            ('type', '!=', None),
+            ('closed', '!=', True),
             ('company', '=', Eval('company', -1)),
             ('deferral', '=', True),
             ],
@@ -373,7 +374,8 @@ class BalanceNonDeferralStart(ModelView):
     debit_account = fields.Many2One('account.account', 'Debit Account',
         required=True,
         domain=[
-            ('kind', '!=', 'view'),
+            ('type', '!=', None),
+            ('closed', '!=', True),
             ('company', '=', Eval('company', -1)),
             ('deferral', '=', True),
             ],
@@ -438,7 +440,8 @@ class BalanceNonDeferral(Wizard):
             accounts = Account.search([
                     ('company', '=', self.start.fiscalyear.company.id),
                     ('deferral', '=', False),
-                    ('kind', '!=', 'view'),
+                    ('type', '!=', None),
+                    ('closed', '!=', True),
                     ])
         lines = []
         for account in accounts:

journal.py

@@ -103,6 +103,7 @@ class Journal(
         MoveLine = pool.get('account.move.line')
         Move = pool.get('account.move')
         Account = pool.get('account.account')
+        AccountType = pool.get('account.account.type')
         Company = pool.get('company.company')
         context = Transaction().context
         cursor = Transaction().connection.cursor()
@@ -120,15 +121,19 @@ class Journal(
         line = MoveLine.__table__()
         move = Move.__table__()
         account = Account.__table__()
+        account_type = AccountType.__table__()
         where = ((move.date >= context.get('start_date'))
             & (move.date <= context.get('end_date'))
-            & ~account.kind.in_(['receivable', 'payable'])
+            & ~account_type.receivable
+            & ~account_type.payable
             & (move.company == company.id))
         for sub_journals in grouped_slice(journals):
             sub_journals = list(sub_journals)
             red_sql = reduce_ids(move.journal, [j.id for j in sub_journals])
             query = line.join(move, 'LEFT', condition=line.move == move.id
                 ).join(account, 'LEFT', condition=line.account == account.id
+                ).join(account_type, 'LEFT',
+                    condition=account.type == account_type.id
                 ).select(move.journal, Sum(line.debit), Sum(line.credit),
                     where=where & red_sql,
                     group_by=move.journal)

message.xml

@@ -87,7 +87,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="text">You cannot delete account "%(account)s" because it has move lines.</field>
         </record>
         <record model="ir.message" id="msg_account_invalid_type_second_currency">
-            <field name="text">To set a second currency for account "%(account)s", it must have the type "Other".</field>
+            <field name="text">To set a second currency for account "%(account)s", it must not have a type "payable", "revenue", "receivable" nor "expense".</field>
         </record>
         <record model="ir.message" id="msg_account_invalid_deferral_second_currency">
             <field name="text">To set a second currency for account "%(account)s", it must be deferral.</field>
@@ -155,8 +155,8 @@ Use the current period to cancel the move?</field>
         <record model="ir.message" id="msg_modify_line_reconciled">
             <field name="text">You cannot modify reconciled line "%(line)s".</field>
         </record>
-        <record model="ir.message" id="msg_line_view_account">
-            <field name="text">To create a line on account "%(account)s", you must change its "view" kind.</field>
+        <record model="ir.message" id="msg_line_closed_account">
+            <field name="text">To create a line on account "%(account)s", you must set a type or unclose it.</field>
         </record>
         <record model="ir.message" id="msg_line_already_reconciled">
             <field name="text">You cannot reconcile already reconciled line "%(line)s".</field>

minimal_chart.xml

@@ -16,6 +16,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Минимальная схема типов счетов</field>
             <field name="name" lang="sl">Minimalni kontni načrt</field>
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_asset">
@@ -31,7 +32,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="sl">Sredstvo</field>
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_asset_current">
@@ -46,6 +48,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Текущие</field>
             <field name="name" lang="sl">Kratkoročno</field>
             <field name="parent" ref="account_type_template_asset"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record model="account.account.type.template"
@@ -61,6 +65,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Наличные</field>
             <field name="name" lang="sl">Denar</field>
             <field name="parent" ref="account_type_template_asset_current"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record model="account.account.type.template"
@@ -76,7 +82,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Наличные</field>
             <field name="name" lang="sl">Denar</field>
             <field name="parent" ref="account_type_template_asset_current"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_asset_long_term">
@@ -91,6 +100,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Долгосрочные</field>
             <field name="name" lang="sl">Dolgoročno</field>
             <field name="parent" ref="account_type_template_asset"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record model="account.account.type.template"
@@ -107,7 +118,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="sl">Obveznosti</field>
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_liability_current">
@@ -122,6 +133,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Текущие</field>
             <field name="name" lang="sl">Kratkoročno</field>
             <field name="parent" ref="account_type_template_liability"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record model="account.account.type.template"
@@ -137,7 +149,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Подлежащие уплате</field>
             <field name="name" lang="sl">Obveznosti</field>
             <field name="parent" ref="account_type_template_liability_current"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_liability_current_tax">
@@ -152,6 +166,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Налоги</field>
             <field name="name" lang="sl">Davek</field>
             <field name="parent" ref="account_type_template_liability_current"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record model="account.account.type.template"
@@ -167,6 +182,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Долгосрочные</field>
             <field name="name" lang="sl">Dolgoročno</field>
             <field name="parent" ref="account_type_template_liability"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record model="account.account.type.template"
@@ -183,7 +199,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="sl">Kapital</field>
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_income">
@@ -198,9 +214,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Поступления</field>
             <field name="name" lang="sl">Prihodki</field>
             <field name="parent" ref="account_type_template_equity"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_revenue">
@@ -215,8 +230,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Доходы</field>
             <field name="name" lang="sl">Prihodki</field>
             <field name="parent" ref="account_type_template_income"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_expense">
@@ -231,8 +247,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Расходы</field>
             <field name="name" lang="sl">Odhodki</field>
             <field name="parent" ref="account_type_template_income"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record model="account.account.type.template"
                 id="account_type_template_off_balance">
@@ -248,6 +265,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="sl">Zunaj bilance</field>
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record model="account.account.template" id="account_template_root">
@@ -262,6 +280,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Минимальная схема счетов</field>
             <field name="name" lang="sl">Minimalni kontni načrt</field>
             <field name="type" ref="account_type_template_minimal"/>
+            <field name="closed" eval="True"/>
         </record>
         <record model="account.account.template" id="account_template_receivable">
             <field name="name" lang="en">Main Receivable</field>
@@ -276,10 +295,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="sl">Glavne terjatve</field>
             <field name="type" ref="account_type_template_asset_current_receivable"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root"/>
-            <field name="kind">receivable</field>
         </record>
         <record model="account.account.template" id="account_template_payable">
             <field name="name" lang="en">Main Payable</field>
@@ -294,10 +311,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="sl">Glavne obveznosti</field>
             <field name="type" ref="account_type_template_liability_current_payable"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root"/>
-            <field name="kind">payable</field>
         </record>
         <record model="account.account.template" id="account_template_revenue">
             <field name="name" lang="en">Main Revenue</field>
@@ -311,9 +326,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Основной Доходы</field>
             <field name="name" lang="sl">Glavni prihodki</field>
             <field name="type" ref="account_type_template_revenue"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root"/>
-            <field name="kind">revenue</field>
         </record>
         <record model="account.account.template" id="account_template_expense">
             <field name="name" lang="en">Main Expense</field>
@@ -327,9 +340,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name" lang="ru">Основной Расходы</field>
             <field name="name" lang="sl">Glavni odhodki</field>
             <field name="type" ref="account_type_template_expense"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root"/>
-            <field name="kind">expense</field>
         </record>
         <record model="account.account.template" id="account_template_cash">
             <field name="name" lang="en">Main Cash</field>
@@ -345,7 +356,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type" ref="account_type_template_asset_current_cash"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root"/>
-            <field name="kind">other</field>
         </record>
         <record model="account.account.template" id="account_template_tax">
             <field name="name" lang="en">Main Tax</field>
@@ -361,7 +371,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type" ref="account_type_template_liability_current_tax"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_bg.xml

@@ -13,7 +13,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_bg" model="account.account.type.template">
             
@@ -25,9 +27,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_bg"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_bg" model="account.account.type.template">
             
@@ -39,7 +43,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_bg"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_bg" model="account.account.type.template">
@@ -52,7 +59,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_bg"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_bg" model="account.account.type.template">
@@ -65,8 +75,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_bg"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_bg" model="account.account.type.template">
             
@@ -78,7 +92,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_bg"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_bg" model="account.account.type.template">
@@ -91,9 +108,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_bg"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_bg" model="account.account.type.template">
             
@@ -105,7 +123,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_bg"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_bg" model="account.account.type.template">
@@ -118,8 +138,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_bg"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_bg" model="account.account.type.template">
             
@@ -131,7 +154,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_bg"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_bg" model="account.account.type.template">
@@ -144,7 +169,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_bg"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_bg" model="account.account.type.template">
@@ -157,9 +184,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_bg"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_bg" model="account.account.type.template">
             
@@ -171,10 +199,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_equity_bg"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_bg" model="account.account.type.template">
             
@@ -186,9 +214,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_income_bg"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_bg" model="account.account.type.template">
             
@@ -200,9 +230,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_income_bg"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_bg" model="account.account.type.template">
             
@@ -214,8 +246,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_bg"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_bg" model="account.account.template">
@@ -228,7 +262,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_minimal_bg"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_bg" model="account.account.template">
             
@@ -240,12 +276,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_asset_current_receivable_bg"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_bg"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_bg" model="account.account.template">
             
@@ -257,12 +292,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_liability_current_payable_bg"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_bg"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_bg" model="account.account.template">
             
@@ -274,10 +308,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_revenue_bg"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_bg"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_bg" model="account.account.template">
             
@@ -289,10 +322,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_expense_bg"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_bg"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_bg" model="account.account.template">
             
@@ -304,10 +336,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_asset_current_cash_bg"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_bg"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_bg" model="account.account.template">
             
@@ -319,10 +351,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_liability_current_tax_bg"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_bg"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_ca.xml

@@ -13,7 +13,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_ca" model="account.account.type.template">
             
@@ -25,9 +27,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_ca"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_ca" model="account.account.type.template">
             
@@ -39,7 +43,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_ca"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_ca" model="account.account.type.template">
@@ -52,7 +59,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_ca"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_ca" model="account.account.type.template">
@@ -65,8 +75,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_ca"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_ca" model="account.account.type.template">
             
@@ -78,7 +92,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_ca"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_ca" model="account.account.type.template">
@@ -91,9 +108,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_ca"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_ca" model="account.account.type.template">
             
@@ -105,7 +123,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_ca"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_ca" model="account.account.type.template">
@@ -118,8 +138,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_ca"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_ca" model="account.account.type.template">
             
@@ -131,7 +154,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_ca"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_ca" model="account.account.type.template">
@@ -144,7 +169,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_ca"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_ca" model="account.account.type.template">
@@ -157,9 +184,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_ca"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_ca" model="account.account.type.template">
             
@@ -171,10 +199,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_equity_ca"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_ca" model="account.account.type.template">
             
@@ -186,9 +214,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_income_ca"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_ca" model="account.account.type.template">
             
@@ -200,9 +230,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_income_ca"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_ca" model="account.account.type.template">
             
@@ -214,8 +246,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_ca"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_ca" model="account.account.template">
@@ -228,7 +262,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_minimal_ca"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_ca" model="account.account.template">
             
@@ -240,12 +276,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_asset_current_receivable_ca"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_ca"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_ca" model="account.account.template">
             
@@ -257,12 +292,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_liability_current_payable_ca"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_ca"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_ca" model="account.account.template">
             
@@ -274,10 +308,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_revenue_ca"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_ca"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_ca" model="account.account.template">
             
@@ -289,10 +322,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_expense_ca"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_ca"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_ca" model="account.account.template">
             
@@ -304,10 +336,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_asset_current_cash_ca"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_ca"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_ca" model="account.account.template">
             
@@ -319,10 +351,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_liability_current_tax_ca"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_ca"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_de.xml

@@ -13,7 +13,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_de" model="account.account.type.template">
             
@@ -25,9 +27,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_de"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_de" model="account.account.type.template">
             
@@ -39,7 +43,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_de"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_de" model="account.account.type.template">
@@ -52,7 +59,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_de"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_de" model="account.account.type.template">
@@ -65,8 +75,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_de"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_de" model="account.account.type.template">
             
@@ -78,7 +92,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_de"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_de" model="account.account.type.template">
@@ -91,9 +108,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_de"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_de" model="account.account.type.template">
             
@@ -105,7 +123,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_de"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_de" model="account.account.type.template">
@@ -118,8 +138,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_de"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_de" model="account.account.type.template">
             
@@ -131,7 +154,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_de"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_de" model="account.account.type.template">
@@ -144,7 +169,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_de"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_de" model="account.account.type.template">
@@ -157,9 +184,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_de"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_de" model="account.account.type.template">
             
@@ -171,10 +199,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_equity_de"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_de" model="account.account.type.template">
             
@@ -186,9 +214,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_income_de"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_de" model="account.account.type.template">
             
@@ -200,9 +230,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_income_de"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_de" model="account.account.type.template">
             
@@ -214,8 +246,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_de"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_de" model="account.account.template">
@@ -228,7 +262,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_minimal_de"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_de" model="account.account.template">
             
@@ -240,12 +276,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_asset_current_receivable_de"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_de"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_de" model="account.account.template">
             
@@ -257,12 +292,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_liability_current_payable_de"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_de"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_de" model="account.account.template">
             
@@ -274,10 +308,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_revenue_de"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_de"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_de" model="account.account.template">
             
@@ -289,10 +322,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_expense_de"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_de"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_de" model="account.account.template">
             
@@ -304,10 +336,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_asset_current_cash_de"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_de"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_de" model="account.account.template">
             
@@ -319,10 +351,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_liability_current_tax_de"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_de"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_en.xml

@@ -15,6 +15,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_en" model="account.account.type.template">
             <field name="name">Asset</field>
@@ -29,7 +30,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_en"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_en" model="account.account.type.template">
             <field name="name">Current</field>
@@ -43,6 +45,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_en"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_en" model="account.account.type.template">
@@ -57,6 +61,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_current_en"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_en" model="account.account.type.template">
@@ -71,7 +77,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_current_en"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_en" model="account.account.type.template">
             <field name="name">Long-term</field>
@@ -85,6 +94,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_en"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_en" model="account.account.type.template">
@@ -100,7 +111,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_en"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_en" model="account.account.type.template">
             <field name="name">Current</field>
@@ -114,6 +125,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_en"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_en" model="account.account.type.template">
@@ -128,7 +140,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_current_en"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_en" model="account.account.type.template">
             <field name="name">Tax</field>
@@ -142,6 +156,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_current_en"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_en" model="account.account.type.template">
@@ -156,6 +171,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_en"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_en" model="account.account.type.template">
@@ -171,7 +187,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_en"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_en" model="account.account.type.template">
             <field name="name">Income</field>
@@ -185,9 +201,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_equity_en"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_en" model="account.account.type.template">
             <field name="name">Revenue</field>
@@ -201,8 +216,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_income_en"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_en" model="account.account.type.template">
             <field name="name">Expense</field>
@@ -216,8 +232,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_income_en"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_en" model="account.account.type.template">
             <field name="name">Off-Balance</field>
@@ -232,6 +249,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_en"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_en" model="account.account.template">
@@ -246,6 +264,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_minimal_en"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_en" model="account.account.template">
             <field name="name">Main Receivable</field>
@@ -260,10 +279,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="type" ref="account_type_template_asset_current_receivable_en"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_en"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_en" model="account.account.template">
             <field name="name">Main Payable</field>
@@ -278,10 +295,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="type" ref="account_type_template_liability_current_payable_en"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_en"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_en" model="account.account.template">
             <field name="name">Main Revenue</field>
@@ -295,9 +310,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_revenue_en"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_en"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_en" model="account.account.template">
             <field name="name">Main Expense</field>
@@ -311,9 +324,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_expense_en"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_en"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_en" model="account.account.template">
             <field name="name">Main Cash</field>
@@ -329,7 +340,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type" ref="account_type_template_asset_current_cash_en"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_en"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_en" model="account.account.template">
             <field name="name">Main Tax</field>
@@ -345,7 +355,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type" ref="account_type_template_liability_current_tax_en"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_en"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_es.xml

@@ -13,7 +13,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_es" model="account.account.type.template">
             
@@ -25,9 +27,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_es"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_es" model="account.account.type.template">
             
@@ -39,7 +43,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_es"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_es" model="account.account.type.template">
@@ -52,7 +59,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_es"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_es" model="account.account.type.template">
@@ -65,8 +75,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_es"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_es" model="account.account.type.template">
             
@@ -78,7 +92,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_asset_es"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_es" model="account.account.type.template">
@@ -91,9 +108,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_es"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_es" model="account.account.type.template">
             
@@ -105,7 +123,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_es"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_es" model="account.account.type.template">
@@ -118,8 +138,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_es"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_es" model="account.account.type.template">
             
@@ -131,7 +154,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_es"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_es" model="account.account.type.template">
@@ -144,7 +169,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_liability_es"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_es" model="account.account.type.template">
@@ -157,9 +184,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_es"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_es" model="account.account.type.template">
             
@@ -171,10 +199,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_equity_es"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_es" model="account.account.type.template">
             
@@ -186,9 +214,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_income_es"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_es" model="account.account.type.template">
             
@@ -200,9 +230,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="parent" ref="account_type_template_income_es"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_es" model="account.account.type.template">
             
@@ -214,8 +246,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_es"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_es" model="account.account.template">
@@ -228,7 +262,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_minimal_es"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_es" model="account.account.template">
             
@@ -240,12 +276,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_asset_current_receivable_es"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_es"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_es" model="account.account.template">
             
@@ -257,12 +292,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_liability_current_payable_es"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_es"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_es" model="account.account.template">
             
@@ -274,10 +308,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_revenue_es"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_es"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_es" model="account.account.template">
             
@@ -289,10 +322,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_expense_es"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_es"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_es" model="account.account.template">
             
@@ -304,10 +336,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_asset_current_cash_es"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_es"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_es" model="account.account.template">
             
@@ -319,10 +351,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="type" ref="account_type_template_liability_current_tax_es"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_es"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_fr.xml

@@ -15,6 +15,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_fr" model="account.account.type.template">
             
@@ -29,7 +30,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_fr"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_fr" model="account.account.type.template">
             
@@ -43,6 +45,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_fr"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_fr" model="account.account.type.template">
@@ -57,6 +61,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_current_fr"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_fr" model="account.account.type.template">
@@ -71,7 +77,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_current_fr"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_fr" model="account.account.type.template">
             
@@ -85,6 +94,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_fr"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_fr" model="account.account.type.template">
@@ -100,7 +111,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_fr"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_fr" model="account.account.type.template">
             
@@ -114,6 +125,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_fr"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_fr" model="account.account.type.template">
@@ -128,7 +140,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_current_fr"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_fr" model="account.account.type.template">
             
@@ -142,6 +156,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_current_fr"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_fr" model="account.account.type.template">
@@ -156,6 +171,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_fr"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_fr" model="account.account.type.template">
@@ -171,7 +187,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_fr"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_fr" model="account.account.type.template">
             
@@ -185,9 +201,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_equity_fr"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_fr" model="account.account.type.template">
             
@@ -201,8 +216,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_income_fr"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_fr" model="account.account.type.template">
             
@@ -216,8 +232,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_income_fr"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_fr" model="account.account.type.template">
             
@@ -232,6 +249,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_fr"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_fr" model="account.account.template">
@@ -246,6 +264,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_minimal_fr"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_fr" model="account.account.template">
             
@@ -260,10 +279,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="type" ref="account_type_template_asset_current_receivable_fr"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_fr"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_fr" model="account.account.template">
             
@@ -278,10 +295,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="type" ref="account_type_template_liability_current_payable_fr"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_fr"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_fr" model="account.account.template">
             
@@ -295,9 +310,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_revenue_fr"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_fr"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_fr" model="account.account.template">
             
@@ -311,9 +324,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_expense_fr"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_fr"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_fr" model="account.account.template">
             
@@ -329,7 +340,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type" ref="account_type_template_asset_current_cash_fr"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_fr"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_fr" model="account.account.template">
             
@@ -345,7 +355,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type" ref="account_type_template_liability_current_tax_fr"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_fr"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_nl.xml

@@ -13,7 +13,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Basaal rekeningschematype</field>
             
             
+            
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_nl" model="account.account.type.template">
             
@@ -25,9 +27,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Activa</field>
             
             
+            
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_nl"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_nl" model="account.account.type.template">
             
@@ -39,7 +43,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Actueel</field>
             
             
+            
             <field name="parent" ref="account_type_template_asset_nl"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_nl" model="account.account.type.template">
@@ -52,7 +59,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Kas</field>
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_nl"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_nl" model="account.account.type.template">
@@ -65,8 +75,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Kas</field>
             
             
+            
             <field name="parent" ref="account_type_template_asset_current_nl"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_nl" model="account.account.type.template">
             
@@ -78,7 +92,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Langlopend</field>
             
             
+            
             <field name="parent" ref="account_type_template_asset_nl"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_nl" model="account.account.type.template">
@@ -91,9 +108,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Verplichting</field>
             
             
+            
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_nl"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_nl" model="account.account.type.template">
             
@@ -105,7 +123,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Actueel</field>
             
             
+            
             <field name="parent" ref="account_type_template_liability_nl"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_nl" model="account.account.type.template">
@@ -118,8 +138,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Te betalen</field>
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_nl"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_nl" model="account.account.type.template">
             
@@ -131,7 +154,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Belasting</field>
             
             
+            
             <field name="parent" ref="account_type_template_liability_current_nl"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_nl" model="account.account.type.template">
@@ -144,7 +169,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Langlopend</field>
             
             
+            
             <field name="parent" ref="account_type_template_liability_nl"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_nl" model="account.account.type.template">
@@ -157,9 +184,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Eigen vermogen</field>
             
             
+            
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_nl"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_nl" model="account.account.type.template">
             
@@ -171,10 +199,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Inkomsten</field>
             
             
+            
             <field name="parent" ref="account_type_template_equity_nl"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_nl" model="account.account.type.template">
             
@@ -186,9 +214,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Opbrengst</field>
             
             
+            
             <field name="parent" ref="account_type_template_income_nl"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_nl" model="account.account.type.template">
             
@@ -200,9 +230,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Kosten</field>
             
             
+            
             <field name="parent" ref="account_type_template_income_nl"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_nl" model="account.account.type.template">
             
@@ -214,8 +246,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Buiten balans</field>
             
             
+            
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_nl"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_nl" model="account.account.template">
@@ -228,7 +262,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Basaal rekeningschema</field>
             
             
+            
             <field name="type" ref="account_type_template_minimal_nl"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_nl" model="account.account.template">
             
@@ -240,12 +276,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Basisrekening ontvangen</field>
             
             
+            
             <field name="type" ref="account_type_template_asset_current_receivable_nl"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_nl"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_nl" model="account.account.template">
             
@@ -257,12 +292,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Basisrekening betalen</field>
             
             
+            
             <field name="type" ref="account_type_template_liability_current_payable_nl"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_nl"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_nl" model="account.account.template">
             
@@ -274,10 +308,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Basis opbrengstrekening</field>
             
             
+            
             <field name="type" ref="account_type_template_revenue_nl"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_nl"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_nl" model="account.account.template">
             
@@ -289,10 +322,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Basis kostenrekening</field>
             
             
+            
             <field name="type" ref="account_type_template_expense_nl"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_nl"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_nl" model="account.account.template">
             
@@ -304,10 +336,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Basis kasrekening</field>
             
             
+            
             <field name="type" ref="account_type_template_asset_current_cash_nl"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_nl"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_nl" model="account.account.template">
             
@@ -319,10 +351,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Basis belastingrekening</field>
             
             
+            
             <field name="type" ref="account_type_template_liability_current_tax_nl"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_nl"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_pt.xml

@@ -15,6 +15,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_pt" model="account.account.type.template">
             
@@ -29,7 +30,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_pt"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_pt" model="account.account.type.template">
             
@@ -43,6 +45,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_pt"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_pt" model="account.account.type.template">
@@ -57,6 +61,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_current_pt"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_pt" model="account.account.type.template">
@@ -71,7 +77,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_current_pt"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_pt" model="account.account.type.template">
             
@@ -85,6 +94,8 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_asset_pt"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_pt" model="account.account.type.template">
@@ -100,7 +111,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_pt"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_pt" model="account.account.type.template">
             
@@ -114,6 +125,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_pt"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_pt" model="account.account.type.template">
@@ -128,7 +140,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_current_pt"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_pt" model="account.account.type.template">
             
@@ -142,6 +156,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_current_pt"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_pt" model="account.account.type.template">
@@ -156,6 +171,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_liability_pt"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_pt" model="account.account.type.template">
@@ -171,7 +187,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_pt"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_pt" model="account.account.type.template">
             
@@ -181,13 +197,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
-            <field name="name">Ingressos</field>
+            <field name="name">Resultados</field>
             
             
             <field name="parent" ref="account_type_template_equity_pt"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_pt" model="account.account.type.template">
             
@@ -201,8 +216,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_income_pt"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_pt" model="account.account.type.template">
             
@@ -216,8 +232,9 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="parent" ref="account_type_template_income_pt"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_pt" model="account.account.type.template">
             
@@ -232,6 +249,7 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_pt"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_pt" model="account.account.template">
@@ -246,6 +264,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_minimal_pt"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_pt" model="account.account.template">
             
@@ -260,10 +279,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="type" ref="account_type_template_asset_current_receivable_pt"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_pt"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_pt" model="account.account.template">
             
@@ -278,10 +295,8 @@ this repository contains the full copyright notices and license terms. -->
             
             <field name="type" ref="account_type_template_liability_current_payable_pt"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_pt"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_pt" model="account.account.template">
             
@@ -295,9 +310,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_revenue_pt"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_pt"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_pt" model="account.account.template">
             
@@ -311,9 +324,7 @@ this repository contains the full copyright notices and license terms. -->
             
             
             <field name="type" ref="account_type_template_expense_pt"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_pt"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_pt" model="account.account.template">
             
@@ -329,7 +340,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type" ref="account_type_template_asset_current_cash_pt"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_pt"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_pt" model="account.account.template">
             
@@ -345,7 +355,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type" ref="account_type_template_liability_current_tax_pt"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_pt"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_ru.xml

@@ -11,9 +11,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Минимальная схема типов счетов</field>
             
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_ru" model="account.account.type.template">
             
@@ -23,11 +25,13 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Активы</field>
             
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_ru"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_ru" model="account.account.type.template">
             
@@ -37,9 +41,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Текущие</field>
             
             <field name="parent" ref="account_type_template_asset_ru"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_ru" model="account.account.type.template">
@@ -50,9 +57,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Наличные</field>
             
             <field name="parent" ref="account_type_template_asset_current_ru"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_ru" model="account.account.type.template">
@@ -63,10 +73,14 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Наличные</field>
             
             <field name="parent" ref="account_type_template_asset_current_ru"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_ru" model="account.account.type.template">
             
@@ -76,9 +90,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Долгосрочные</field>
             
             <field name="parent" ref="account_type_template_asset_ru"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_ru" model="account.account.type.template">
@@ -89,11 +106,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Пассивы</field>
             
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_ru"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_ru" model="account.account.type.template">
             
@@ -103,9 +121,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Текущие</field>
             
             <field name="parent" ref="account_type_template_liability_ru"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_ru" model="account.account.type.template">
@@ -116,10 +136,13 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Подлежащие уплате</field>
             
             <field name="parent" ref="account_type_template_liability_current_ru"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_ru" model="account.account.type.template">
             
@@ -129,9 +152,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Налоги</field>
             
             <field name="parent" ref="account_type_template_liability_current_ru"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_ru" model="account.account.type.template">
@@ -142,9 +167,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Долгосрочные</field>
             
             <field name="parent" ref="account_type_template_liability_ru"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_ru" model="account.account.type.template">
@@ -155,11 +182,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Собственные средства</field>
             
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_ru"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_ru" model="account.account.type.template">
             
@@ -169,12 +197,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Поступления</field>
             
             <field name="parent" ref="account_type_template_equity_ru"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_ru" model="account.account.type.template">
             
@@ -184,11 +212,13 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Доходы</field>
             
             <field name="parent" ref="account_type_template_income_ru"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_ru" model="account.account.type.template">
             
@@ -198,11 +228,13 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Расходы</field>
             
             <field name="parent" ref="account_type_template_income_ru"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_ru" model="account.account.type.template">
             
@@ -212,10 +244,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Внебалансовые</field>
             
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_ru"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_ru" model="account.account.template">
@@ -226,9 +260,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Минимальная схема счетов</field>
             
             <field name="type" ref="account_type_template_minimal_ru"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_ru" model="account.account.template">
             
@@ -238,14 +274,13 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Основной Подлежащий получению</field>
             
             <field name="type" ref="account_type_template_asset_current_receivable_ru"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_ru"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_ru" model="account.account.template">
             
@@ -255,14 +290,13 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Основной Подлежащий уплате</field>
             
             <field name="type" ref="account_type_template_liability_current_payable_ru"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_ru"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_ru" model="account.account.template">
             
@@ -272,12 +306,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Основной Доходы</field>
             
             <field name="type" ref="account_type_template_revenue_ru"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_ru"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_ru" model="account.account.template">
             
@@ -287,12 +320,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Основной Расходы</field>
             
             <field name="type" ref="account_type_template_expense_ru"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_ru"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_ru" model="account.account.template">
             
@@ -302,12 +334,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Основной Наличные</field>
             
             <field name="type" ref="account_type_template_asset_current_cash_ru"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_ru"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_ru" model="account.account.template">
             
@@ -317,12 +349,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Основной Налоги</field>
             
             <field name="type" ref="account_type_template_liability_current_tax_ru"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_ru"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

minimal_chart_sl.xml

@@ -12,8 +12,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Minimalni kontni načrt</field>
             <field name="sequence" eval="10"/>
+            <field name="statement" eval="None"/>
         </record>
         <record id="account_type_template_asset_sl" model="account.account.type.template">
             
@@ -24,10 +26,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Sredstvo</field>
             <field name="sequence" eval="10"/>
             <field name="parent" ref="account_type_template_minimal_sl"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
         </record>
         <record id="account_type_template_asset_current_sl" model="account.account.type.template">
             
@@ -38,8 +42,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Kratkoročno</field>
             <field name="parent" ref="account_type_template_asset_sl"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_cash_sl" model="account.account.type.template">
@@ -51,8 +58,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Denar</field>
             <field name="parent" ref="account_type_template_asset_current_sl"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_asset_current_receivable_sl" model="account.account.type.template">
@@ -64,9 +74,13 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Denar</field>
             <field name="parent" ref="account_type_template_asset_current_sl"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
+            <field name="receivable" eval="True"/>
         </record>
         <record id="account_type_template_asset_long_term_sl" model="account.account.type.template">
             
@@ -77,8 +91,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Dolgoročno</field>
             <field name="parent" ref="account_type_template_asset_sl"/>
+            <field name="statement">balance</field>
+            <field name="assets" eval="True"/>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_sl" model="account.account.type.template">
@@ -90,10 +107,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Obveznosti</field>
             <field name="sequence" eval="20"/>
             <field name="parent" ref="account_type_template_minimal_sl"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_liability_current_sl" model="account.account.type.template">
             
@@ -104,8 +122,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Kratkoročno</field>
             <field name="parent" ref="account_type_template_liability_sl"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
         </record>
         <record id="account_type_template_liability_current_payable_sl" model="account.account.type.template">
@@ -117,9 +137,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Obveznosti</field>
             <field name="parent" ref="account_type_template_liability_current_sl"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="10"/>
+            <field name="payable" eval="True"/>
         </record>
         <record id="account_type_template_liability_current_tax_sl" model="account.account.type.template">
             
@@ -130,8 +153,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Davek</field>
             <field name="parent" ref="account_type_template_liability_current_sl"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_liability_long_term_sl" model="account.account.type.template">
@@ -143,8 +168,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Dolgoročno</field>
             <field name="parent" ref="account_type_template_liability_sl"/>
+            <field name="statement">balance</field>
             <field name="sequence" eval="20"/>
         </record>
         <record id="account_type_template_equity_sl" model="account.account.type.template">
@@ -156,10 +183,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Kapital</field>
             <field name="sequence" eval="30"/>
             <field name="parent" ref="account_type_template_minimal_sl"/>
-            <field name="balance_sheet" eval="True"/>
+            <field name="statement">balance</field>
         </record>
         <record id="account_type_template_income_sl" model="account.account.type.template">
             
@@ -170,11 +198,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Prihodki</field>
             <field name="parent" ref="account_type_template_equity_sl"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="40"/>
-            <field name="income_statement" eval="True"/>
-            <field name="display_balance">credit-debit</field>
         </record>
         <record id="account_type_template_revenue_sl" model="account.account.type.template">
             
@@ -185,10 +213,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Prihodki</field>
             <field name="parent" ref="account_type_template_income_sl"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="10"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="revenue" eval="True"/>
         </record>
         <record id="account_type_template_expense_sl" model="account.account.type.template">
             
@@ -199,10 +229,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Odhodki</field>
             <field name="parent" ref="account_type_template_income_sl"/>
+            <field name="statement">income</field>
             <field name="sequence" eval="20"/>
-            <field name="display_balance">credit-debit</field>
+            <field name="expense" eval="True"/>
         </record>
         <record id="account_type_template_off_balance_sl" model="account.account.type.template">
             
@@ -213,9 +245,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Zunaj bilance</field>
             <field name="sequence" eval="60"/>
             <field name="parent" ref="account_type_template_minimal_sl"/>
+            <field name="statement">off-balance</field>
         </record>
 
         <record id="account_template_root_sl" model="account.account.template">
@@ -227,8 +261,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Minimalni kontni načrt</field>
             <field name="type" ref="account_type_template_minimal_sl"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="account_template_receivable_sl" model="account.account.template">
             
@@ -239,13 +275,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Glavne terjatve</field>
             <field name="type" ref="account_type_template_asset_current_receivable_sl"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_sl"/>
-            <field name="kind">receivable</field>
         </record>
         <record id="account_template_payable_sl" model="account.account.template">
             
@@ -256,13 +291,12 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Glavne obveznosti</field>
             <field name="type" ref="account_type_template_liability_current_payable_sl"/>
             <field name="reconcile" eval="True"/>
-            <field name="deferral" eval="True"/>
             <field name="party_required" eval="True"/>
             <field name="parent" ref="account_template_root_sl"/>
-            <field name="kind">payable</field>
         </record>
         <record id="account_template_revenue_sl" model="account.account.template">
             
@@ -273,11 +307,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Glavni prihodki</field>
             <field name="type" ref="account_type_template_revenue_sl"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_sl"/>
-            <field name="kind">revenue</field>
         </record>
         <record id="account_template_expense_sl" model="account.account.template">
             
@@ -288,11 +321,10 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Glavni odhodki</field>
             <field name="type" ref="account_type_template_expense_sl"/>
-            <field name="deferral" eval="False"/>
             <field name="parent" ref="account_template_root_sl"/>
-            <field name="kind">expense</field>
         </record>
         <record id="account_template_cash_sl" model="account.account.template">
             
@@ -303,11 +335,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Glavna denarna sredstva</field>
             <field name="type" ref="account_type_template_asset_current_cash_sl"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_sl"/>
-            <field name="kind">other</field>
         </record>
         <record id="account_template_tax_sl" model="account.account.template">
             
@@ -318,11 +350,11 @@ this repository contains the full copyright notices and license terms. -->
             
             
             
+            
             <field name="name">Glavni davki</field>
             <field name="type" ref="account_type_template_liability_current_tax_sl"/>
             <field name="deferral" eval="True"/>
             <field name="parent" ref="account_template_root_sl"/>
-            <field name="kind">other</field>
         </record>
     </data>
 </tryton>

move.py

@@ -546,7 +546,8 @@ class Line(ModelSQL, ModelView):
         _depends)
     account = fields.Many2One('account.account', 'Account', required=True,
         domain=[
-            ('kind', '!=', 'view'),
+            ('type', '!=', None),
+            ('closed', '!=', True),
             ['OR',
                 ('start_date', '=', None),
                 ('start_date', '<=', Eval('date', None)),
@@ -884,7 +885,7 @@ class Line(ModelSQL, ModelView):
     order_move_state = _order_move_field('state')
 
     def get_amount(self, name):
-        sign = 1 if self.account.type.display_balance == 'debit-credit' else -1
+        sign = -1 if self.account.type.statement == 'income' else 1
         if self.amount_second_currency is not None:
             return self.amount_second_currency * sign
         else:
@@ -990,9 +991,9 @@ class Line(ModelSQL, ModelView):
             line.check_account()
 
     def check_account(self):
-        if self.account.kind in ('view',):
+        if not self.account.type or self.account.closed:
             raise AccessError(
-                gettext('account.msg_line_view_account',
+                gettext('account.msg_line_closed_account',
                     account=self.account.rec_name))
         if bool(self.party) != bool(self.account.party_required):
             error = 'party_set' if self.party else 'party_required'
@@ -1258,14 +1259,16 @@ class WriteOff(DeactivableMixin, ModelSQL, ModelView):
     credit_account = fields.Many2One('account.account', "Credit Account",
         required=True,
         domain=[
-            ('kind', '!=', 'view'),
+            ('type', '!=', None),
+            ('closed', '!=', True),
             ('company', '=', Eval('company')),
             ],
         depends=['company'])
     debit_account = fields.Many2One('account.account', "Debit Account",
         required=True,
         domain=[
-            ('kind', '!=', 'view'),
+            ('type', '!=', None),
+            ('closed', '!=', True),
             ('company', '=', Eval('company')),
             ],
         depends=['company'])
@@ -1517,7 +1520,9 @@ class Reconcile(Wizard):
         Line = pool.get('account.move.line')
         line = Line.__table__()
         Account = pool.get('account.account')
+        AccountType = pool.get('account.account.type')
         account = Account.__table__()
+        account_type = AccountType.__table__()
         cursor = Transaction().connection.cursor()
         account_rule = Rule.query_get(Account.__name__)
 
@@ -1529,18 +1534,23 @@ class Reconcile(Wizard):
 
         balance = line.debit - line.credit
         cursor.execute(*line.join(account,
-                condition=line.account == account.id).select(
+                condition=line.account == account.id)
+            .join(account_type, condition=account.type == account_type.id)
+            .select(
                 account.id,
                 where=((line.reconciliation == Null) & account.reconcile
                     & account.id.in_(account_rule)),
-                group_by=[account.id, account.kind],
+                group_by=[account.id,
+                    account_type.receivable, account_type.payable],
                 having=((
                         Sum(Case((balance > 0, 1), else_=0)) > 0)
                     & (Sum(Case((balance < 0, 1), else_=0)) > 0)
-                    | (Case((account.kind == 'receivable', Sum(balance) < 0),
-                            else_=False))
-                    | (Case((account.kind == 'payable', Sum(balance) > 0),
-                            else_=False))
+                    | Case((account_type.receivable & ~account_type.payable,
+                            Sum(balance) < 0),
+                        else_=False)
+                    | Case((account_type.payable & ~account_type.receivable,
+                            Sum(balance) > 0),
+                        else_=False)
                     )))
         return [a for a, in cursor.fetchall()]
 
@@ -1565,10 +1575,10 @@ class Reconcile(Wizard):
                 having=((
                         Sum(Case((balance > 0, 1), else_=0)) > 0)
                     & (Sum(Case((balance < 0, 1), else_=0)) > 0)
-                    | (Case((account.kind == 'receivable', Sum(balance) < 0),
-                            else_=False))
-                    | (Case((account.kind == 'payable', Sum(balance) > 0),
-                            else_=False))
+                    | Case((account.type.receivable, Sum(balance) < 0),
+                        else_=False)
+                    | Case((account.type.payable, Sum(balance) > 0),
+                        else_=False)
                     )))
         return [p for p, in cursor.fetchall()]
 

move.xml

@@ -211,7 +211,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Payable/Receivable Lines</field>
             <field name="res_model">account.move.line</field>
             <field name="domain"
-                eval="[('account.kind', 'in', ['payable', 'receivable']), If(Eval('active_ids', []) == [Eval('active_id')], ('party', '=', Eval('active_id')), ('party', 'in', Eval('active_ids')))]"
+                eval="[['OR', ('account.type.receivable', '=', True), ('account.type.payable', '=', True)], If(Eval('active_ids', []) == [Eval('active_id')], ('party', '=', Eval('active_id')), ('party', 'in', Eval('active_ids')))]"
                 pyson="1"/>
             <field name="search_value"
                 eval="[('reconciliation', '=', None)]" pyson="1"/>
@@ -228,7 +228,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Payable</field>
             <field name="sequence" eval="10"/>
             <field name="domain"
-                eval="[('account.kind', '=', 'payable')]" pyson="1"/>
+                eval="[('account.type.payable', '=', True)]" pyson="1"/>
             <field name="act_window" ref="act_move_line_payable_receivable"/>
         </record>
         <record model="ir.action.act_window.domain"
@@ -236,7 +236,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Receivable</field>
             <field name="sequence" eval="20"/>
             <field name="domain"
-                eval="[('account.kind', '=', 'receivable')]" pyson="1"/>
+                eval="[('account.type.payable', '=', True)]" pyson="1"/>
             <field name="act_window" ref="act_move_line_payable_receivable"/>
         </record>
         <record model="ir.action.act_window.domain"

move_template.py

@@ -158,7 +158,8 @@ class MoveLineTemplate(ModelSQL, ModelView):
         help="A python expression that will be evaluated with the keywords.")
     account = fields.Many2One('account.account', 'Account', required=True,
         domain=[
-            ('kind', '!=', 'view'),
+            ('type', '!=', None),
+            ('closed', '!=', True),
             ('company', '=', Eval('_parent_move', {}).get('company', -1)),
             ])
     party = fields.Char('Party',

party.py

@@ -32,7 +32,7 @@ class Party(CompanyMultiValueMixin, metaclass=PoolMeta):
     account_payable = fields.MultiValue(fields.Many2One(
             'account.account', "Account Payable",
             domain=[
-                ('kind', '=', 'payable'),
+                ('type.payable', '=', True),
                 ('party_required', '=', True),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
@@ -42,7 +42,7 @@ class Party(CompanyMultiValueMixin, metaclass=PoolMeta):
     account_receivable = fields.MultiValue(fields.Many2One(
             'account.account', "Account Receivable",
             domain=[
-                ('kind', '=', 'receivable'),
+                ('type.receivable', '=', True),
                 ('party_required', '=', True),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
@@ -114,12 +114,14 @@ class Party(CompanyMultiValueMixin, metaclass=PoolMeta):
         pool = Pool()
         MoveLine = pool.get('account.move.line')
         Account = pool.get('account.account')
+        AccountType = pool.get('account.account.type')
         User = pool.get('res.user')
         Date = pool.get('ir.date')
         cursor = Transaction().connection.cursor()
 
         line = MoveLine.__table__()
         account = Account.__table__()
+        account_type = AccountType.__table__()
 
         for name in names:
             if name not in ('receivable', 'payable',
@@ -146,8 +148,10 @@ class Party(CompanyMultiValueMixin, metaclass=PoolMeta):
                 party_where = reduce_ids(line.party, sub_ids)
                 cursor.execute(*line.join(account,
                         condition=account.id == line.account
+                        ).join(account_type,
+                        condition=account.type == account_type.id
                         ).select(line.party, amount,
-                        where=((account.kind == code)
+                        where=(getattr(account_type, code)
                             & (line.reconciliation == Null)
                             & (account.company == company_id)
                             & party_where
@@ -165,11 +169,13 @@ class Party(CompanyMultiValueMixin, metaclass=PoolMeta):
         pool = Pool()
         MoveLine = pool.get('account.move.line')
         Account = pool.get('account.account')
+        AccountType = pool.get('account.account.type')
         User = pool.get('res.user')
         Date = pool.get('ir.date')
 
         line = MoveLine.__table__()
         account = Account.__table__()
+        account_type = AccountType.__table__()
 
         if name not in ('receivable', 'payable',
                 'receivable_today', 'payable_today'):
@@ -197,15 +203,16 @@ class Party(CompanyMultiValueMixin, metaclass=PoolMeta):
             value = [cast_(Literal(Decimal(v or 0))) for v in value]
         else:
             value = cast_(Literal(Decimal(value or 0)))
-        query = line.join(account, condition=account.id == line.account
+        query = (line.join(account, condition=account.id == line.account
+                ).join(account_type, condition=account.type == account_type.id
                 ).select(line.party,
-                    where=(account.kind == code)
+                where=(getattr(account_type, code)
                     & (line.party != Null)
                     & (line.reconciliation == Null)
                     & (account.company == company_id)
-                    & today_query,
-                    group_by=line.party,
-                    having=Operator(amount, value))
+                    & today_query),
+                group_by=line.party,
+                having=Operator(amount, value)))
         return [('id', 'in', query)]
 
     @property
@@ -249,7 +256,7 @@ class PartyAccount(ModelSQL, CompanyValueMixin):
     account_payable = fields.Many2One(
         'account.account', "Account Payable",
         domain=[
-            ('kind', '=', 'payable'),
+            ('type.payable', '=', True),
             ('party_required', '=', True),
             ('company', '=', Eval('company', -1)),
             ],
@@ -257,7 +264,7 @@ class PartyAccount(ModelSQL, CompanyValueMixin):
     account_receivable = fields.Many2One(
         'account.account', "Account Receivable",
         domain=[
-            ('kind', '=', 'receivable'),
+            ('type.receivable', '=', True),
             ('party_required', '=', True),
             ('company', '=', Eval('company', -1)),
             ],

tax.py

@@ -506,10 +506,18 @@ class TaxTemplate(sequence_ordered(), ModelSQL, ModelView, DeactivableMixin):
         depends=['parent'])
     parent = fields.Many2One('account.tax.template', 'Parent')
     childs = fields.One2Many('account.tax.template', 'parent', 'Children')
-    invoice_account = fields.Many2One('account.account.template',
-            'Invoice Account')
-    credit_note_account = fields.Many2One('account.account.template',
-            'Credit Note Account')
+    invoice_account = fields.Many2One(
+        'account.account.template', 'Invoice Account',
+        domain=[
+            ('type.statement', '=', 'balance'),
+            ('closed', '!=', True),
+            ])
+    credit_note_account = fields.Many2One(
+        'account.account.template', 'Credit Note Account',
+        domain=[
+            ('type.statement', '=', 'balance'),
+            ('closed', '!=', True),
+            ])
     account = fields.Many2One('account.account.template', 'Account Template',
             domain=[('parent', '=', None)], required=True)
     legal_notice = fields.Text("Legal Notice")
@@ -677,7 +685,8 @@ class Tax(sequence_ordered(), ModelSQL, ModelView, DeactivableMixin):
     invoice_account = fields.Many2One('account.account', 'Invoice Account',
         domain=[
             ('company', '=', Eval('company')),
-            ('kind', 'not in', ['view', 'receivable', 'payable']),
+            ('type.statement', '=', 'balance'),
+            ('closed', '!=', True),
             ],
         states={
             'readonly': _states['readonly'],
@@ -689,7 +698,8 @@ class Tax(sequence_ordered(), ModelSQL, ModelView, DeactivableMixin):
         'Credit Note Account',
         domain=[
             ('company', '=', Eval('company')),
-            ('kind', 'not in', ['view', 'receivable', 'payable']),
+            ('type.statement', '=', 'balance'),
+            ('closed', '!=', True),
             ],
         states={
             'readonly': _states['readonly'],

tests/test_account.py

@@ -67,11 +67,11 @@ def create_chart(company, tax=False):
     create_chart.account.company = company
     create_chart.transition_create_account()
     receivable, = Account.search([
-            ('kind', '=', 'receivable'),
+            ('type.receivable', '=', True),
             ('company', '=', company.id),
             ])
     payable, = Account.search([
-            ('kind', '=', 'payable'),
+            ('type.payable', '=', True),
             ('company', '=', company.id),
             ])
     create_chart.properties.company = company
@@ -133,14 +133,12 @@ def close_fiscalyear(fiscalyear):
             ('name', '=', 'Equity'),
             ])
     revenue, = Account.search([
-            ('kind', '=', 'revenue'),
+            ('type.revenue', '=', True),
             ])
     account_pl, = Account.create([{
                 'name': 'P&L',
                 'type': type_equity.id,
-                'deferral': True,
                 'parent': revenue.parent.id,
-                'kind': 'other',
                 }])
 
     session_id = BalanceNonDeferral.create()[0]
@@ -236,19 +234,18 @@ class AccountTestCase(ModuleTestCase):
                     ('code', '=', 'EXP'),
                     ])
             revenue, = Account.search([
-                    ('kind', '=', 'revenue'),
+                    ('type.revenue', '=', True),
                     ])
             receivable, = Account.search([
-                    ('kind', '=', 'receivable'),
+                    ('type.receivable', '=', True),
                     ])
             expense, = Account.search([
-                    ('kind', '=', 'expense'),
+                    ('type.expense', '=', True),
                     ])
             payable, = Account.search([
-                    ('kind', '=', 'payable'),
+                    ('type.payable', '=', True),
                     ])
             cash, = Account.search([
-                    ('kind', '=', 'other'),
                     ('name', '=', 'Main Cash'),
                     ])
             cash_cur, = Account.copy([cash], default={
@@ -440,10 +437,10 @@ class AccountTestCase(ModuleTestCase):
                     ('code', '=', 'REV'),
                     ])
             revenue, = Account.search([
-                    ('kind', '=', 'revenue'),
+                    ('type.revenue', '=', True),
                     ])
             receivable, = Account.search([
-                    ('kind', '=', 'receivable'),
+                    ('type.receivable', '=', True),
                     ])
 
             move = Move()
@@ -910,16 +907,16 @@ class AccountTestCase(ModuleTestCase):
                     ('code', '=', 'EXP'),
                     ])
             revenue, = Account.search([
-                    ('kind', '=', 'revenue'),
+                    ('type.revenue', '=', True),
                     ])
             receivable, = Account.search([
-                    ('kind', '=', 'receivable'),
+                    ('type.receivable', '=', True),
                     ])
             expense, = Account.search([
-                    ('kind', '=', 'expense'),
+                    ('type.expense', '=', True),
                     ])
             payable, = Account.search([
-                    ('kind', '=', 'payable'),
+                    ('type.payable', '=', True),
                     ])
             party, = Party.create([{
                         'name': 'Receivable/Payable party',
@@ -1014,10 +1011,10 @@ class AccountTestCase(ModuleTestCase):
         with set_company(company):
             create_chart(company)
             receivable, = Account.search([
-                    ('kind', '=', 'receivable'),
+                    ('type.receivable', '=', True),
                     ])
             payable, = Account.search([
-                    ('kind', '=', 'payable'),
+                    ('type.payable', '=', True),
                     ])
 
             party = Party(party.id)
@@ -1092,19 +1089,13 @@ class AccountTestCase(ModuleTestCase):
             for type_ in Type.search([]):
                 self.assertEqual(type_.name, type_.template.name)
                 self.assertEqual(
-                    type_.balance_sheet, type_.template.balance_sheet)
-                self.assertEqual(
-                    type_.income_statement, type_.template.income_statement)
-                self.assertEqual(
-                    type_.display_balance, type_.template.display_balance)
+                    type_.statement, type_.template.statement)
 
             for account in Account.search([]):
                 self.assertEqual(account.name, account.template.name)
                 self.assertEqual(account.code, account.template.code)
                 self.assertEqual(account.type.template, account.template.type)
                 self.assertEqual(account.reconcile, account.template.reconcile)
-                self.assertEqual(account.kind, account.template.kind)
-                self.assertEqual(account.deferral, account.template.deferral)
                 self.assertEqual(
                     account.start_date, account.template.start_date)
                 self.assertEqual(account.end_date, account.template.end_date)
@@ -1164,12 +1155,12 @@ class AccountTestCase(ModuleTestCase):
             new_type = TypeTemplate()
             new_type.name = 'New Type'
             new_type.parent = root_type
+            new_type.statement = 'balance'
             new_type.save()
             new_account = AccountTemplate()
             new_account.name = 'New Account'
             new_account.parent = chart
             new_account.type = new_type
-            new_account.kind = 'other'
             new_account.save()
             updated_tax, = TaxTemplate.search([])
             updated_tax.name = 'VAT'

tests/tools.py

@@ -70,23 +70,31 @@ def get_accounts(company=None, config=None):
     if not company:
         company = get_company()
 
-    accounts = Account.find([
-            ('kind', 'in', ['receivable', 'payable', 'revenue', 'expense']),
+    accounts = {}
+    accounts['receivable'], = Account.find([
+            ('type.receivable', '=', True),
             ('company', '=', company.id),
-            ])
-    accounts = {a.kind: a for a in accounts}
-    cash, = Account.find([
-            ('kind', '=', 'other'),
+            ], limit=1)
+    accounts['payable'], = Account.find([
+            ('type.payable', '=', True),
+            ('company', '=', company.id),
+            ], limit=1)
+    accounts['revenue'], = Account.find([
+            ('type.revenue', '=', True),
+            ('company', '=', company.id),
+            ], limit=1)
+    accounts['expense'], = Account.find([
+            ('type.expense', '=', True),
+            ('company', '=', company.id),
+            ], limit=1)
+    accounts['cash'], = Account.find([
             ('company', '=', company.id),
             ('name', '=', 'Main Cash'),
-            ])
-    accounts['cash'] = cash
-    tax, = Account.find([
-            ('kind', '=', 'other'),
+            ], limit=1)
+    accounts['tax'], = Account.find([
             ('company', '=', company.id),
             ('name', '=', 'Main Tax'),
-            ])
-    accounts['tax'] = tax
+            ], limit=1)
     return accounts
 
 

view/account_form.xml

@@ -13,37 +13,39 @@ this repository contains the full copyright notices and license terms. -->
         <field name="template_override" xexpand="0" width="100"/>
     </group>
     <notebook colspan="6">
-        <page string="General Information" id="general">
+        <page string="General Information" id="general" col="6">
             <label name="company"/>
             <field name="company"/>
             <label name="parent"/>
             <field name="parent"/>
-            <label name="kind"/>
-            <field name="kind"/>
+            <newline/>
+
             <label name="type"/>
             <field name="type"/>
-            <newline/>
+            <label name="closed"/>
+            <field name="closed"/>
+            <label name="general_ledger_balance"/>
+            <field name="general_ledger_balance"/>
+
             <label name="start_date"/>
-            <group col="3" colspan="1" id="dates">
-                <field name="start_date"/>
-                <label name="end_date"/>
-                <field name="end_date"/>
-            </group>
+            <field name="start_date"/>
+            <label name="end_date"/>
+            <field name="end_date"/>
             <label name="replaced_by"/>
             <field name="replaced_by"/>
-            <label name="deferral"/>
-            <field name="deferral"/>
-            <label name="reconcile"/>
-            <field name="reconcile"/>
+
             <label name="currency"/>
             <field name="currency"/>
             <label name="second_currency"/>
             <field name="second_currency"/>
+            <newline/>
+
+            <label name="reconcile"/>
+            <field name="reconcile"/>
             <label name="party_required"/>
             <field name="party_required"/>
-            <label name="general_ledger_balance"/>
-            <field name="general_ledger_balance"/>
-            <field name="taxes" colspan="4"/>
+
+            <field name="taxes" colspan="6"/>
         </page>
         <page string="Children" id="children">
             <field name="childs" colspan="4"/>

view/account_template_form.xml

@@ -8,24 +8,25 @@ this repository contains the full copyright notices and license terms. -->
     <field name="code"/>
     <label name="parent"/>
     <field name="parent"/>
-    <label name="kind"/>
-    <field name="kind"/>
+
     <label name="type"/>
     <field name="type"/>
-    <newline/>
+    <label name="closed"/>
+    <field name="closed"/>
+    <label name="general_ledger_balance"/>
+    <field name="general_ledger_balance"/>
+
     <label name="start_date"/>
     <field name="start_date"/>
     <label name="end_date"/>
     <field name="end_date"/>
     <label name="replaced_by"/>
     <field name="replaced_by"/>
-    <label name="deferral"/>
-    <field name="deferral"/>
+
     <label name="reconcile"/>
     <field name="reconcile"/>
     <label name="party_required"/>
     <field name="party_required"/>
-    <label name="general_ledger_balance"/>
-    <field name="general_ledger_balance"/>
+
     <field name="taxes" colspan="6"/>
 </form>

view/account_type_form.xml

@@ -1,23 +1,33 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form>
+<form col="6">
     <label name="name"/>
     <field name="name"/>
-    <label name="sequence"/>
-    <field name="sequence"/>
     <label name="company"/>
     <field name="company"/>
+    <label name="sequence"/>
+    <field name="sequence"/>
+    <label name="statement"/>
+    <group col="-1" id="statement">
+        <field name="statement"/>
+        <label name="assets"/>
+        <field name="assets"/>
+    </group>
     <label name="parent"/>
     <field name="parent"/>
-    <label name="display_balance"/>
-    <field name="display_balance"/>
     <label name="template_override"/>
     <field name="template_override"/>
-    <newline/>
-    <label name="balance_sheet"/>
-    <field name="balance_sheet"/>
-    <newline/>
-    <label name="income_statement"/>
-    <field name="income_statement"/>
+    <group colspan="6" col="-1" id="checkboxes">
+        <label name="receivable"/>
+        <field name="receivable" xexpand="0" width="25"/>
+        <label name="stock"/>
+        <field name="stock" xexpand="0" width="25"/>
+        <label name="payable"/>
+        <field name="payable" xexpand="0" width="25"/>
+        <label name="revenue"/>
+        <field name="revenue" xexpand="0" width="25"/>
+        <label name="expense"/>
+        <field name="expense" xexpand="0" width="25"/>
+    </group>
 </form>

view/account_type_template_form.xml

@@ -6,15 +6,24 @@ this repository contains the full copyright notices and license terms. -->
     <field name="name"/>
     <label name="sequence"/>
     <field name="sequence"/>
+    <label name="statement"/>
+    <group col="-1" id="statement">
+        <field name="statement"/>
+        <label name="assets"/>
+        <field name="assets"/>
+    </group>
     <label name="parent"/>
     <field name="parent"/>
-    <newline/>
-    <label name="display_balance"/>
-    <field name="display_balance"/>
-    <newline/>
-    <label name="balance_sheet"/>
-    <field name="balance_sheet"/>
-    <newline/>
-    <label name="income_statement"/>
-    <field name="income_statement"/>
+    <group colspan="4" col="-1" id="checkboxes">
+        <label name="receivable"/>
+        <field name="receivable" xexpand="0" width="25"/>
+        <label name="stock"/>
+        <field name="stock" xexpand="0" width="25"/>
+        <label name="payable"/>
+        <field name="payable" xexpand="0" width="25"/>
+        <label name="revenue"/>
+        <field name="revenue" xexpand="0" width="25"/>
+        <label name="expense"/>
+        <field name="expense" xexpand="0" width="25"/>
+    </group>
 </form>