From 6aa90338cbf53d6a0962848472daee17ef61236d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20L=C3=B3pez=20Ram=C3=ADrez?= Date: Mon, 13 Jul 2020 11:12:12 +0200 Subject: [PATCH] [FIX] account_asset_management: domain in multicompany --- account_asset_management/__manifest__.py | 2 +- .../models/account_asset_profile.py | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/account_asset_management/__manifest__.py b/account_asset_management/__manifest__.py index 3de4613bc..6fa1cb3b7 100644 --- a/account_asset_management/__manifest__.py +++ b/account_asset_management/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Assets Management', - 'version': '12.0.2.2.5', + 'version': '12.0.2.2.6', 'license': 'AGPL-3', 'depends': [ 'account', diff --git a/account_asset_management/models/account_asset_profile.py b/account_asset_management/models/account_asset_profile.py index d796f9470..83f885a32 100644 --- a/account_asset_management/models/account_asset_profile.py +++ b/account_asset_management/models/account_asset_profile.py @@ -17,31 +17,38 @@ class AccountAssetProfile(models.Model): string='Analytic account') account_asset_id = fields.Many2one( comodel_name='account.account', - domain=[('deprecated', '=', False)], + domain="[('company_id', '=', company_id), " + "('deprecated', '=', False)]", string='Asset Account', required=True) account_depreciation_id = fields.Many2one( comodel_name='account.account', - domain=[('deprecated', '=', False)], + domain="[('company_id', '=', company_id), " + "('deprecated', '=', False)]", string='Depreciation Account', required=True) account_expense_depreciation_id = fields.Many2one( comodel_name='account.account', - domain=[('deprecated', '=', False)], + domain="[('company_id', '=', company_id), " + "('deprecated', '=', False)]", string='Depr. Expense Account', required=True) account_plus_value_id = fields.Many2one( comodel_name='account.account', - domain=[('deprecated', '=', False)], + domain="[('company_id', '=', company_id), " + "('deprecated', '=', False)]", string='Plus-Value Account') account_min_value_id = fields.Many2one( comodel_name='account.account', - domain=[('deprecated', '=', False)], + domain="[('company_id', '=', company_id), " + "('deprecated', '=', False)]", string='Min-Value Account') account_residual_value_id = fields.Many2one( comodel_name='account.account', - domain=[('deprecated', '=', False)], + domain="[('company_id', '=', company_id), " + "('deprecated', '=', False)]", string='Residual Value Account') journal_id = fields.Many2one( comodel_name='account.journal', - domain=[('type', '=', 'general')], + domain="[('company_id', '=', company_id), " + "('type', '=', 'general')]", string='Journal', required=True) company_id = fields.Many2one( comodel_name='res.company',