Merge account kind and account type

issue4990 review68401002
2019-03-24 18:00:01 +01:00
parent 25c4b4e53a
commit 58544c7cff
2 changed files with 4 additions and 2 deletions
@@ -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'])
@@ -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'),