From 58544c7cff225c91c1abf130d3ef59c1705a93eb 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
---
 journal.py   | 3 ++-
 statement.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/journal.py b/journal.py
index c5591a79b4..981e7dc12d 100644
--- a/journal.py
+++ b/journal.py
@@ -37,7 +37,8 @@ class Journal(ModelSQL, ModelView):
         depends=['company_party', 'currency'])
     account = fields.Many2One('account.account', "Account", required=True,
         domain=[
-            ('kind', '!=', 'view'),
+            ('type', '!=', None),
+            ('closed', '!=', True),
             ('company', '=', Eval('company')),
             ],
         depends=['company'])
diff --git a/statement.py b/statement.py
index b5d3e57757..e6b75589d8 100644
--- a/statement.py
+++ b/statement.py
@@ -618,7 +618,8 @@ def origin_mixin(_states, _depends):
             'account.account', "Account",
             domain=[
                 ('company', '=', Eval('company', 0)),
-                ('kind', '!=', 'view'),
+                ('type', '!=', None),
+                ('closed', '!=', True),
                 ],
             context={
                 'date': Eval('date'),