diff --git a/account_asset_management/models/account_asset.py b/account_asset_management/models/account_asset.py
index 7c8642f37..3f8022336 100644
--- a/account_asset_management/models/account_asset.py
+++ b/account_asset_management/models/account_asset.py
@@ -67,6 +67,9 @@ class AccountAsset(models.Model):
     )
     salvage_value = fields.Float(
         digits="Account",
+        compute="_compute_salvage_value",
+        store=True,
+        readonly=False,
         states=READONLY_STATES,
         help="The estimated value that an asset will realize upon "
         "its sale at the end of its useful life.\n"
@@ -301,6 +304,18 @@ class AccountAsset(models.Model):
                 asset.depreciation_line_ids.filtered("move_id")
             )
 
+    def _get_salvage_value_profile(self):
+        self.ensure_one()
+        salvage_value = self.profile_id.salvage_value
+        if self.profile_id.salvage_type == "percent":
+            salvage_value = (salvage_value / 100) * self.purchase_value
+        return salvage_value
+
+    @api.depends("profile_id")
+    def _compute_salvage_value(self):
+        for asset in self:
+            asset.salvage_value = asset._get_salvage_value_profile()
+
     @api.depends("purchase_value", "salvage_value", "method")
     def _compute_depreciation_base(self):
         for asset in self:
@@ -444,9 +459,6 @@ class AccountAsset(models.Model):
     @api.model
     def create(self, vals):
         asset = super().create(vals)
-        if self.env.context.get("create_asset_from_move_line"):
-            # Trigger compute of depreciation_base
-            asset.salvage_value = 0.0
         asset._create_first_asset_line()
         return asset
 
diff --git a/account_asset_management/models/account_asset_profile.py b/account_asset_management/models/account_asset_profile.py
index 1c9a0036c..5b73d945d 100644
--- a/account_asset_management/models/account_asset_profile.py
+++ b/account_asset_management/models/account_asset_profile.py
@@ -79,6 +79,15 @@ class AccountAssetProfile(models.Model):
         check_company=True,
         string="Asset Groups",
     )
+    salvage_value = fields.Float(
+        digits="Account",
+        help="The estimated value that an asset will realize upon "
+        "its sale at the end of its useful life.\n"
+        "This value is used to determine the depreciation amounts.",
+    )
+    salvage_type = fields.Selection(
+        selection=[("fixed", "Fixed"), ("percent", "Percentage of Price")]
+    )
     method = fields.Selection(
         selection=lambda self: self._selection_method(),
         string="Computation Method",
diff --git a/account_asset_management/tests/test_account_asset_management.py b/account_asset_management/tests/test_account_asset_management.py
index c65f74fcd..7905b5f90 100644
--- a/account_asset_management/tests/test_account_asset_management.py
+++ b/account_asset_management/tests/test_account_asset_management.py
@@ -947,3 +947,30 @@ class TestAssetManagement(AccountTestInvoicingCommon):
         last_line.create_move()
         self.assertEqual(asset.value_residual, 0)
         self.assertEqual(asset.state, "close")
+
+    def test_21_asset_profile_salvage_value(self):
+        """Compute salvage value from asset profile."""
+        # Case percent
+        self.car5y.salvage_type = "percent"
+        self.car5y.salvage_value = 5
+        asset = self.asset_model.create(
+            {
+                "name": "test asset",
+                "profile_id": self.car5y.id,
+                "purchase_value": 1000,
+                "date_start": time.strftime("%Y-07-07"),
+            }
+        )
+        self.assertEqual(asset.salvage_value, 50)
+        # Case fixed amount
+        self.car5y.salvage_type = "fixed"
+        self.car5y.salvage_value = 5
+        asset = self.asset_model.create(
+            {
+                "name": "test asset",
+                "profile_id": self.car5y.id,
+                "purchase_value": 1000,
+                "date_start": time.strftime("%Y-07-07"),
+            }
+        )
+        self.assertEqual(asset.salvage_value, 5)
diff --git a/account_asset_management/views/account_asset_profile.xml b/account_asset_management/views/account_asset_profile.xml
index 0268f534b..f5a4412ef 100644
--- a/account_asset_management/views/account_asset_profile.xml
+++ b/account_asset_management/views/account_asset_profile.xml
@@ -20,6 +20,18 @@
             </div>
                 <group>
                     <group>
+                        <label for="salvage_value" />
+                        <div>
+                            <field name="salvage_value" class="oe_inline" nolabel="1" />
+                            <span
+                                    class="o_form_label oe_inline"
+                                    attrs="{'invisible':[('salvage_type','!=','percent')]}"
+                                >%</span>
+                        </div>
+                        <field
+                                name="salvage_type"
+                                attrs="{'required': [('salvage_value', '!=', 0.0)]}"
+                            />
                         <field name="group_ids" widget="many2many_tags" />
                         <field name="asset_product_item" />
                         <field name="active" invisible="1" />