From 30877b9a921fa7237119ed573ab9c02039b8339a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Fri, 30 Apr 2021 11:36:21 +0200 Subject: [PATCH 1/2] [FIX] account_asset_management: Fix error from group_ids in asset when set profile_id --- account_asset_management/models/account_asset.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/account_asset_management/models/account_asset.py b/account_asset_management/models/account_asset.py index ef2835124..64ec80717 100644 --- a/account_asset_management/models/account_asset.py +++ b/account_asset_management/models/account_asset.py @@ -313,8 +313,9 @@ class AccountAsset(models.Model): @api.depends("profile_id") def _compute_group_ids(self): - for asset in self.filtered("profile_id"): - asset.group_ids = asset.profile_id.group_ids + for asset in self: + if asset.profile_id: + asset.group_ids = asset.profile_id.group_ids @api.depends("profile_id") def _compute_method(self): From bf56a67016dc31ec718f3606a83c24386730433e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Fri, 30 Apr 2021 11:37:17 +0200 Subject: [PATCH 2/2] [FIX] account_asset_management: Fix error according to _name_search in group when try to set groups in profile --- account_asset_management/models/account_asset_group.py | 4 ++-- .../tests/test_account_asset_management.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/account_asset_management/models/account_asset_group.py b/account_asset_management/models/account_asset_group.py index 77b1d134f..ecd5155b0 100644 --- a/account_asset_management/models/account_asset_group.py +++ b/account_asset_management/models/account_asset_group.py @@ -1,5 +1,6 @@ # Copyright 2009-2020 Noviat # Copyright 2019 Tecnativa - Pedro M. Baeza +# Copyright 2021 Tecnativa - Víctor Martínez # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, fields, models @@ -72,7 +73,6 @@ class AccountAssetGroup(models.Model): ] if operator in expression.NEGATIVE_TERM_OPERATORS: domain = ["&", "!"] + domain[1:] - rec_ids = self._search( + return self._search( expression.AND([domain, args]), limit=limit, access_rights_uid=name_get_uid ) - return self.browse(rec_ids).name_get() diff --git a/account_asset_management/tests/test_account_asset_management.py b/account_asset_management/tests/test_account_asset_management.py index 9cdc11a8c..fcd2d01d7 100644 --- a/account_asset_management/tests/test_account_asset_management.py +++ b/account_asset_management/tests/test_account_asset_management.py @@ -640,18 +640,18 @@ class TestAssetManagement(AccountTestInvoicingCommon): ) # Groups are displayed by code (if any) plus name self.assertEqual( - self.env["account.asset.group"]._name_search("FA"), + self.env["account.asset.group"].name_search("FA"), [(group_fa.id, "FA Fixed Assets")], ) # Groups with code are shown by code in list views self.assertEqual( self.env["account.asset.group"] .with_context(params={"view_type": "list"}) - ._name_search("FA"), + .name_search("FA"), [(group_fa.id, "FA")], ) self.assertEqual( - self.env["account.asset.group"]._name_search("TFA"), + self.env["account.asset.group"].name_search("TFA"), [(group_tfa.id, "TFA Tangible Fixed Assets")], ) group_tfa.code = False @@ -665,4 +665,4 @@ class TestAssetManagement(AccountTestInvoicingCommon): group_tfa.with_context(params={"view_type": "list"}).name_get(), [(group_tfa.id, "Tangible Fixed A...")], ) - self.assertFalse(self.env["account.asset.group"]._name_search("stessA dexiF")) + self.assertFalse(self.env["account.asset.group"].name_search("stessA dexiF"))