From 88f6e35dc63c112a0139a60263caba335fd37255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 24 Mar 2019 18:00:01 +0100
Subject: [PATCH] Merge account kind and account type

issue4990
review68401002
---
 account.py                    | 4 ++--
 configuration.py              | 8 ++++----
 product.py                    | 8 ++++----
 tests/test_account_product.py | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/account.py b/account.py
index 1a8118c3bd..1087285280 100644
--- a/account.py
+++ b/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'])
diff --git a/configuration.py b/configuration.py
index 7356793e94..b846215b47 100644
--- a/configuration.py
+++ b/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'])
diff --git a/product.py b/product.py
index 2a0469c2c2..d516048374 100644
--- a/product.py
+++ b/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'])
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
index 411ea0ddcc..0af7c2cfee 100644
--- a/tests/test_account_product.py
+++ b/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