Merge account kind and account type

issue4990
review68401002

account.py

@@ -12,14 +12,14 @@ class CreateChartProperties(metaclass=PoolMeta):
     category_account_expense = fields.Many2One(
         'account.account', 'Default Expense Account',
         domain=[
-            ('kind', '=', 'expense'),
+            ('type.expense', '=', True),
             ('company', '=', Eval('company')),
             ],
         depends=['company'])
     category_account_revenue = fields.Many2One(
         'account.account', 'Default Revenue Account',
         domain=[
-            ('kind', '=', 'revenue'),
+            ('type.revenue', '=', True),
             ('company', '=', Eval('company')),
             ],
         depends=['company'])

configuration.py

@@ -14,13 +14,13 @@ class Configuration(metaclass=PoolMeta):
     default_category_account_expense = fields.MultiValue(fields.Many2One(
             'account.account', 'Default Account Expense',
             domain=[
-                ('kind', '=', 'expense'),
+                ('type.expense', '=', True),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ]))
     default_category_account_revenue = fields.MultiValue(fields.Many2One(
             'account.account', 'Default Account Revenue',
             domain=[
-                ('kind', '=', 'revenue'),
+                ('type.revenue', '=', True),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ]))
 
@@ -38,14 +38,14 @@ class ConfigurationDefaultAccount(metaclass=PoolMeta):
     default_category_account_expense = fields.Many2One(
         'account.account', "Default Account Expense",
         domain=[
-            ('kind', '=', 'expense'),
+            ('type.expense', '=', True),
             ('company', '=', Eval('company', -1)),
             ],
         depends=['company'])
     default_category_account_revenue = fields.Many2One(
         'account.account', "Default Account Revenue",
         domain=[
-            ('kind', '=', 'revenue'),
+            ('type.revenue', '=', True),
             ('company', '=', Eval('company', -1)),
             ],
         depends=['company'])

product.py

@@ -71,7 +71,7 @@ class Category(CompanyMultiValueMixin, metaclass=PoolMeta):
         'product.category.account', 'category', "Accounts")
     account_expense = fields.MultiValue(fields.Many2One('account.account',
             'Account Expense', domain=[
-                ('kind', '=', 'expense'),
+                ('type.expense', '=', True),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
             states={
@@ -82,7 +82,7 @@ class Category(CompanyMultiValueMixin, metaclass=PoolMeta):
             depends=['account_parent', 'accounting']))
     account_revenue = fields.MultiValue(fields.Many2One('account.account',
             'Account Revenue', domain=[
-                ('kind', '=', 'revenue'),
+                ('type.revenue', '=', True),
                 ('company', '=', Eval('context', {}).get('company', -1)),
                 ],
             states={
@@ -230,14 +230,14 @@ class CategoryAccount(ModelSQL, CompanyValueMixin):
     account_expense = fields.Many2One(
         'account.account', "Account Expense",
         domain=[
-            ('kind', '=', 'expense'),
+            ('type.expense', '=', True),
             ('company', '=', Eval('company', -1)),
             ],
         depends=['company'])
     account_revenue = fields.Many2One(
         'account.account', "Account Revenue",
         domain=[
-            ('kind', '=', 'revenue'),
+            ('type.revenue', '=', True),
             ('company', '=', Eval('company', -1)),
             ],
         depends=['company'])

tests/test_account_product.py

@@ -34,7 +34,7 @@ class AccountProductTestCase(ModuleTestCase):
                     ('name', '=', 'Unit'),
                     ])
             account_expense, = Account.search([
-                    ('kind', '=', 'expense'),
+                    ('type.expense', '=', True),
                     ])
 
             # raise when empty