From ffa8d96851e60b93571c59e063555fcb62a50743 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Date: Thu, 11 Feb 2021 16:13:21 +0100 Subject: [PATCH] [13.0][account_asset_management] propose account when user chooses --- .../models/account_move.py | 24 ++++++++++++------- account_asset_management/readme/HISTORY.rst | 5 ++++ .../views/account_move.xml | 21 ++++++++++------ .../views/account_move_line.xml | 5 +++- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/account_asset_management/models/account_move.py b/account_asset_management/models/account_move.py index 6b70210b..38b26b6a 100644 --- a/account_asset_management/models/account_move.py +++ b/account_asset_management/models/account_move.py @@ -30,12 +30,15 @@ FIELDS_AFFECTS_ASSET_MOVE_LINE = { class AccountMove(models.Model): _inherit = "account.move" - asset_count = fields.Integer(compute='_compute_asset_count') + asset_count = fields.Integer(compute="_compute_asset_count") def _compute_asset_count(self): for rec in self: - assets = self.env['account.asset.line'].search([ - ('move_id', '=', self.id)]).mapped('asset_id') + assets = ( + self.env["account.asset.line"] + .search([("move_id", "=", self.id)]) + .mapped("asset_id") + ) rec.asset_count = len(assets) def unlink(self): @@ -125,12 +128,17 @@ class AccountMove(models.Model): return move_vals def action_view_assets(self): - assets = self.env['account.asset.line'].search([ - ('move_id', '=', self.id)]).mapped('asset_id') + assets = ( + self.env["account.asset.line"] + .search([("move_id", "=", self.id)]) + .mapped("asset_id") + ) action = self.env.ref("account_asset_management.account_asset_action") action_dict = action.read()[0] if len(assets) == 1: - res = self.env.ref("account_asset_management.account_asset_view_form", False) + res = self.env.ref( + "account_asset_management.account_asset_view_form", False + ) action_dict["views"] = [(res and res.id or False, "form")] action_dict["res_id"] = assets.id elif assets: @@ -144,10 +152,10 @@ class AccountMoveLine(models.Model): _inherit = "account.move.line" asset_profile_id = fields.Many2one( - comodel_name="account.asset.profile", string="Asset Profile" + comodel_name="account.asset.profile", string="Asset Profile", ) asset_id = fields.Many2one( - comodel_name="account.asset", string="Asset", ondelete="restrict" + comodel_name="account.asset", string="Asset", ondelete="restrict", ) @api.onchange("account_id") diff --git a/account_asset_management/readme/HISTORY.rst b/account_asset_management/readme/HISTORY.rst index de8ef0ee..e15948e1 100644 --- a/account_asset_management/readme/HISTORY.rst +++ b/account_asset_management/readme/HISTORY.rst @@ -3,6 +3,11 @@ * [BREAKING] Removed all functionality associated with `account.fiscal.year` +13.0.2.0.0 (2021-02-19) +~~~~~~~~~~~~~~~~~~~~~~~ + +* Add support for multi-company + 13.0.1.0.0 (2019-10-21) ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/account_asset_management/views/account_move.xml b/account_asset_management/views/account_move.xml index 6a5a5fcc..aa0769a7 100644 --- a/account_asset_management/views/account_move.xml +++ b/account_asset_management/views/account_move.xml @@ -6,13 +6,17 @@ - @@ -37,7 +41,10 @@ expr="//notebook//field[@name='line_ids']/tree/field[@name='date_maturity']" position="after" > - + diff --git a/account_asset_management/views/account_move_line.xml b/account_asset_management/views/account_move_line.xml index 2f86d7d1..73a2a169 100644 --- a/account_asset_management/views/account_move_line.xml +++ b/account_asset_management/views/account_move_line.xml @@ -6,7 +6,10 @@ - +