[tryton-commits] changeset in modules/account_product:default Merge account kind ...

[Cédric Krier]

changeset eabea6829865 in modules/account_product:default
details: 
https://hg.tryton.org/modules/account_product?cmd=changeset;node=eabea6829865
description:
        Merge account kind and account type

        issue4990
        review68401002
diffstat:

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

diffs (106 lines):

diff -r 4b70d949d8fe -r eabea6829865 account.py
--- a/account.py        Fri Mar 22 15:33:43 2019 +0100
+++ b/account.py        Sun Mar 24 18:00:01 2019 +0100
@@ -12,14 +12,14 @@
     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 -r 4b70d949d8fe -r eabea6829865 configuration.py
--- a/configuration.py  Fri Mar 22 15:33:43 2019 +0100
+++ b/configuration.py  Sun Mar 24 18:00:01 2019 +0100
@@ -14,13 +14,13 @@
     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 @@
     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 -r 4b70d949d8fe -r eabea6829865 product.py
--- a/product.py        Fri Mar 22 15:33:43 2019 +0100
+++ b/product.py        Sun Mar 24 18:00:01 2019 +0100
@@ -71,7 +71,7 @@
         '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 @@
             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 @@
     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 -r 4b70d949d8fe -r eabea6829865 tests/test_account_product.py
--- a/tests/test_account_product.py     Fri Mar 22 15:33:43 2019 +0100
+++ b/tests/test_account_product.py     Sun Mar 24 18:00:01 2019 +0100
@@ -34,7 +34,7 @@
                     ('name', '=', 'Unit'),
                     ])
             account_expense, = Account.search([
-                    ('kind', '=', 'expense'),
+                    ('type.expense', '=', True),
                     ])
 
             # raise when empty