From 869cc39d5ec72b478d8e2389af0696f9b9f14efe Mon Sep 17 00:00:00 2001 From: Saran440 Date: Thu, 6 Aug 2020 17:33:27 +0700 Subject: [PATCH] [FIX] account_asset_management - Allow editing salvage value --- account_asset_management/__manifest__.py | 2 +- account_asset_management/models/account_asset_line.py | 6 +++++- account_asset_management/views/account_asset.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/account_asset_management/__manifest__.py b/account_asset_management/__manifest__.py index bdb235a7..c6455bf9 100644 --- a/account_asset_management/__manifest__.py +++ b/account_asset_management/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Assets Management", - "version": "13.0.1.2.0", + "version": "13.0.1.2.1", "license": "AGPL-3", "depends": ["account"], "excludes": ["account_asset"], diff --git a/account_asset_management/models/account_asset_line.py b/account_asset_management/models/account_asset_line.py index 3932eb61..532a5cbd 100644 --- a/account_asset_management/models/account_asset_line.py +++ b/account_asset_management/models/account_asset_line.py @@ -123,7 +123,11 @@ class AccountAssetLine(models.Model): ) elif list(vals.keys()) == ["asset_id"]: continue - elif dl.move_id and not self.env.context.get("allow_asset_line_update"): + elif ( + dl.move_id + and not self.env.context.get("allow_asset_line_update") + and dl.type != "create" + ): raise UserError( _( "You cannot change a depreciation line " diff --git a/account_asset_management/views/account_asset.xml b/account_asset_management/views/account_asset.xml index ff0dd6a8..6b167047 100644 --- a/account_asset_management/views/account_asset.xml +++ b/account_asset_management/views/account_asset.xml @@ -100,7 +100,7 @@ name="salvage_value" widget="monetary" options="{'currency_field': 'company_currency_id'}" - attrs="{'readonly': ['|', ('move_line_check', '=', True), ('state', '!=', 'draft')]}" + attrs="{'readonly': [('state', '!=', 'draft')]}" />