diff --git a/account_asset_management/__manifest__.py b/account_asset_management/__manifest__.py
index c429a0a44d3b..05473c3d0c76 100644
--- a/account_asset_management/__manifest__.py
+++ b/account_asset_management/__manifest__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "Assets Management",
-    "version": "15.0.1.0.1",
+    "version": "16.0.1.0.0",
     "license": "AGPL-3",
     "depends": ["account", "report_xlsx_helper"],
     "excludes": ["account_asset"],
diff --git a/account_asset_management/models/account_asset.py b/account_asset_management/models/account_asset.py
index 57826f37ef8f..c43080b517ae 100644
--- a/account_asset_management/models/account_asset.py
+++ b/account_asset_management/models/account_asset.py
@@ -32,7 +32,7 @@ def __init__(self, *args, **argv):
 
 class AccountAsset(models.Model):
     _name = "account.asset"
-    _inherit = ["mail.thread", "mail.activity.mixin"]
+    _inherit = ["mail.thread", "mail.activity.mixin", "analytic.mixin"]
     _description = "Asset"
     _order = "date_start desc, code, name"
     _check_company_auto = True
@@ -268,20 +268,6 @@ class AccountAsset(models.Model):
         store=True,
         readonly=True,
     )
-    account_analytic_id = fields.Many2one(
-        comodel_name="account.analytic.account",
-        string="Analytic account",
-        compute="_compute_account_analytic_id",
-        readonly=False,
-        store=True,
-    )
-    analytic_tag_ids = fields.Many2many(
-        comodel_name="account.analytic.tag",
-        string="Analytic tags",
-        compute="_compute_analytic_tag_ids",
-        readonly=False,
-        store=True,
-    )
     carry_forward_missed_depreciations = fields.Boolean(
         string="Accumulate missed depreciations",
         help="""If create an asset in a fiscal period that is now closed
@@ -392,9 +378,9 @@ def _compute_account_analytic_id(self):
             asset.account_analytic_id = asset.profile_id.account_analytic_id
 
     @api.depends("profile_id")
-    def _compute_analytic_tag_ids(self):
+    def _compute_analytic_distribution(self):
         for asset in self:
-            asset.analytic_tag_ids = asset.profile_id.analytic_tag_ids
+            asset.analytic_distribution = asset.profile_id.analytic_distribution
 
     @api.constrains("method", "method_time")
     def _check_method(self):
@@ -441,14 +427,18 @@ def _onchange_purchase_salvage_value(self):
                 {"amount": self.depreciation_base, "line_date": self.date_start}
             )
 
-    @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
+    @api.model_create_multi
+    def create(self, vals_list):
+        asset_ids = super().create(vals_list)
+        create_asset_from_move_line = self.env.context.get(
+            "create_asset_from_move_line"
+        )
+        for asset_id in asset_ids:
+            if create_asset_from_move_line:
+                # Trigger compute of depreciation_base
+                asset_id.salvage_value = 0.0
+            asset_id._create_first_asset_line()
+        return asset_ids
 
     def write(self, vals):
         res = super().write(vals)
diff --git a/account_asset_management/models/account_asset_group.py b/account_asset_management/models/account_asset_group.py
index 10ec693c654d..0263cd38152c 100644
--- a/account_asset_management/models/account_asset_group.py
+++ b/account_asset_management/models/account_asset_group.py
@@ -16,7 +16,7 @@ class AccountAssetGroup(models.Model):
 
     name = fields.Char(size=64, required=True, index=True)
     code = fields.Char(index=True)
-    parent_path = fields.Char(index=True)
+    parent_path = fields.Char(index=True, unaccent=False)
     company_id = fields.Many2one(
         comodel_name="res.company",
         string="Company",
diff --git a/account_asset_management/models/account_asset_line.py b/account_asset_management/models/account_asset_line.py
index 80dba7461ba2..087b49f88019 100644
--- a/account_asset_management/models/account_asset_line.py
+++ b/account_asset_management/models/account_asset_line.py
@@ -229,16 +229,14 @@ def _setup_move_line_data(self, depreciation_date, account, ml_type, move):
         """Prepare data to be propagated to account.move.line"""
         asset = self.asset_id
         amount = self.amount
-        analytic_id = False
-        analytic_tags = self.env["account.analytic.tag"]
+        analytic_distribution = False
         if ml_type == "depreciation":
             debit = amount < 0 and -amount or 0.0
             credit = amount > 0 and amount or 0.0
         elif ml_type == "expense":
             debit = amount > 0 and amount or 0.0
             credit = amount < 0 and -amount or 0.0
-            analytic_id = asset.account_analytic_id.id
-            analytic_tags = asset.analytic_tag_ids
+            analytic_distribution = asset.analytic_distribution
         move_line_data = {
             "name": asset.name,
             "ref": self.name,
@@ -248,8 +246,7 @@ def _setup_move_line_data(self, depreciation_date, account, ml_type, move):
             "debit": debit,
             "journal_id": asset.profile_id.journal_id.id,
             "partner_id": asset.partner_id.id,
-            "analytic_account_id": analytic_id,
-            "analytic_tag_ids": [(4, tag.id) for tag in analytic_tags],
+            "analytic_distribution": analytic_distribution,
             "date": depreciation_date,
             "asset_id": asset.id,
         }
diff --git a/account_asset_management/models/account_asset_profile.py b/account_asset_management/models/account_asset_profile.py
index 1c9a0036c7ff..a6be523fb93f 100644
--- a/account_asset_management/models/account_asset_profile.py
+++ b/account_asset_management/models/account_asset_profile.py
@@ -7,18 +7,13 @@
 
 class AccountAssetProfile(models.Model):
     _name = "account.asset.profile"
+    _inherit = "analytic.mixin"
     _check_company_auto = True
     _description = "Asset profile"
     _order = "name"
 
     name = fields.Char(size=64, required=True, index=True)
     note = fields.Text()
-    account_analytic_id = fields.Many2one(
-        comodel_name="account.analytic.account", string="Analytic account"
-    )
-    analytic_tag_ids = fields.Many2many(
-        comodel_name="account.analytic.tag", string="Analytic tags"
-    )
     account_asset_id = fields.Many2one(
         comodel_name="account.account",
         domain="[('deprecated', '=', False), ('company_id', '=', company_id)]",
@@ -207,17 +202,22 @@ def _compute_prorrata(self):
             if profile.method_time != "year":
                 profile.prorata = True
 
-    @api.model
-    def create(self, vals):
-        if vals.get("method_time") != "year" and not vals.get("prorata"):
-            vals["prorata"] = True
-        profile = super().create(vals)
-        acc_id = vals.get("account_asset_id")
-        if acc_id:
-            account = self.env["account.account"].browse(acc_id)
-            if not account.asset_profile_id:
-                account.write({"asset_profile_id": profile.id})
-        return profile
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if vals.get("method_time") != "year" and not vals.get("prorata"):
+                vals["prorata"] = True
+        profile_ids = super().create(vals_list)
+        account_dict = {}
+        for profile_id in profile_ids.filtered(
+            lambda x: not x.account_asset_id.asset_profile_id
+        ):
+            account_dict.setdefault(profile_id.account_asset_id, []).append(
+                profile_id.id
+            )
+        for account, profile_list in account_dict.items():
+            account.write({"asset_profile_id": profile_list[-1]})
+        return profile_ids
 
     def write(self, vals):
         if vals.get("method_time"):
diff --git a/account_asset_management/models/account_move.py b/account_asset_management/models/account_move.py
index 9ad4b4c565fb..1748fbc4819d 100644
--- a/account_asset_management/models/account_move.py
+++ b/account_asset_management/models/account_move.py
@@ -81,7 +81,7 @@ def _prepare_asset_vals(self, aml):
             "purchase_value": depreciation_base,
             "partner_id": aml.partner_id,
             "date_start": self.date,
-            "account_analytic_id": aml.analytic_account_id,
+            "analytic_distribution": aml.analytic_distribution,
         }
 
     def action_post(self):
@@ -105,7 +105,6 @@ def action_post(self):
                 for key, val in vals.items():
                     setattr(asset_form, key, val)
                 asset = asset_form.save()
-                asset.analytic_tag_ids = aml.analytic_tag_ids
                 aml.with_context(
                     allow_asset=True, allow_asset_removal=True
                 ).asset_id = asset.id
@@ -256,7 +255,5 @@ def _expand_asset_line(self):
                 qty = self.quantity
                 name = self.name
                 aml.write({"quantity": 1, "name": "{} {}".format(name, 1)})
-                aml._onchange_price_subtotal()
                 for i in range(1, int(qty)):
                     aml.copy({"name": "{} {}".format(name, i + 1)})
-                aml.move_id._onchange_invoice_line_ids()
diff --git a/account_asset_management/report/account_asset_report_xls.py b/account_asset_management/report/account_asset_report_xls.py
index 063e491d763b..64550cb95ecc 100644
--- a/account_asset_management/report/account_asset_report_xls.py
+++ b/account_asset_management/report/account_asset_report_xls.py
@@ -5,7 +5,6 @@
 
 from odoo import _, models
 from odoo.exceptions import UserError
-from odoo.tools.translate import translate
 
 from odoo.addons.report_xlsx_helper.report.report_xlsx_format import (
     FORMATS,
@@ -23,11 +22,6 @@ class AssetReportXlsx(models.AbstractModel):
     _description = "Dynamic XLS asset report generator"
     _inherit = "report.report_xlsx.abstract"
 
-    def _(self, src):
-        lang = self.env.context.get("lang", "en_US")
-        val = translate(self.env.cr, IR_TRANSLATION_NAME, "report", lang, src) or src
-        return val
-
     def _get_ws_params(self, wb, data, wiz):
         self._get_assets(wiz, data)
         s1 = self._get_acquisition_ws_params(wb, data, wiz)
@@ -39,18 +33,18 @@ def _get_asset_template(self):
 
         asset_template = {
             "account": {
-                "header": {"type": "string", "value": self._("Account")},
+                "header": {"type": "string", "value": _("Account")},
                 "asset": {
                     "type": "string",
                     "value": self._render(
                         "asset.profile_id.account_asset_id.code or ''"
                     ),
                 },
-                "totals": {"type": "string", "value": self._("Totals")},
+                "totals": {"type": "string", "value": _("Totals")},
                 "width": 20,
             },
             "name": {
-                "header": {"type": "string", "value": self._("Name")},
+                "header": {"type": "string", "value": _("Name")},
                 "asset_group": {
                     "type": "string",
                     "value": self._render("group.name or ''"),
@@ -59,7 +53,7 @@ def _get_asset_template(self):
                 "width": 40,
             },
             "code": {
-                "header": {"type": "string", "value": self._("Reference")},
+                "header": {"type": "string", "value": _("Reference")},
                 "asset_group": {
                     "type": "string",
                     "value": self._render("group.code or ''"),
@@ -68,7 +62,7 @@ def _get_asset_template(self):
                 "width": 20,
             },
             "date_start": {
-                "header": {"type": "string", "value": self._("Asset Start Date")},
+                "header": {"type": "string", "value": _("Asset Start Date")},
                 "asset": {
                     "value": self._render("asset.date_start or ''"),
                     "format": FORMATS["format_tcell_date_left"],
@@ -76,7 +70,7 @@ def _get_asset_template(self):
                 "width": 20,
             },
             "date_remove": {
-                "header": {"type": "string", "value": self._("Asset Removal Date")},
+                "header": {"type": "string", "value": _("Asset Removal Date")},
                 "asset": {
                     "value": self._render("asset.date_remove or ''"),
                     "format": FORMATS["format_tcell_date_left"],
@@ -86,7 +80,7 @@ def _get_asset_template(self):
             "depreciation_base": {
                 "header": {
                     "type": "string",
-                    "value": self._("Depreciation Base"),
+                    "value": _("Depreciation Base"),
                     "format": FORMATS["format_theader_yellow_right"],
                 },
                 "asset_group": {
@@ -109,7 +103,7 @@ def _get_asset_template(self):
             "salvage_value": {
                 "header": {
                     "type": "string",
-                    "value": self._("Salvage Value"),
+                    "value": _("Salvage Value"),
                     "format": FORMATS["format_theader_yellow_right"],
                 },
                 "asset_group": {
@@ -132,7 +126,7 @@ def _get_asset_template(self):
             "purchase_value": {
                 "header": {
                     "type": "string",
-                    "value": self._("Purchase Value"),
+                    "value": _("Purchase Value"),
                     "format": FORMATS["format_theader_yellow_right"],
                 },
                 "asset_group": {
@@ -155,7 +149,7 @@ def _get_asset_template(self):
             "period_start_value": {
                 "header": {
                     "type": "string",
-                    "value": self._("Period Start Value"),
+                    "value": _("Period Start Value"),
                     "format": FORMATS["format_theader_yellow_right"],
                 },
                 "asset_group": {
@@ -178,7 +172,7 @@ def _get_asset_template(self):
             "period_depr": {
                 "header": {
                     "type": "string",
-                    "value": self._("Period Depreciation"),
+                    "value": _("Period Depreciation"),
                     "format": FORMATS["format_theader_yellow_right"],
                 },
                 "asset_group": {
@@ -201,7 +195,7 @@ def _get_asset_template(self):
             "period_end_value": {
                 "header": {
                     "type": "string",
-                    "value": self._("Period End Value"),
+                    "value": _("Period End Value"),
                     "format": FORMATS["format_theader_yellow_right"],
                 },
                 "asset_group": {
@@ -224,7 +218,7 @@ def _get_asset_template(self):
             "period_end_depr": {
                 "header": {
                     "type": "string",
-                    "value": self._("Tot. Depreciation"),
+                    "value": _("Tot. Depreciation"),
                     "format": FORMATS["format_theader_yellow_right"],
                 },
                 "asset_group": {
@@ -247,7 +241,7 @@ def _get_asset_template(self):
             "method": {
                 "header": {
                     "type": "string",
-                    "value": self._("Comput. Method"),
+                    "value": _("Comput. Method"),
                     "format": FORMATS["format_theader_yellow_center"],
                 },
                 "asset": {
@@ -260,7 +254,7 @@ def _get_asset_template(self):
             "method_number": {
                 "header": {
                     "type": "string",
-                    "value": self._("Number of Years"),
+                    "value": _("Number of Years"),
                     "format": FORMATS["format_theader_yellow_center"],
                 },
                 "asset": {
@@ -273,7 +267,7 @@ def _get_asset_template(self):
             "prorata": {
                 "header": {
                     "type": "string",
-                    "value": self._("Prorata Temporis"),
+                    "value": _("Prorata Temporis"),
                     "format": FORMATS["format_theader_yellow_center"],
                 },
                 "asset": {
@@ -286,7 +280,7 @@ def _get_asset_template(self):
             "state": {
                 "header": {
                     "type": "string",
-                    "value": self._("Status"),
+                    "value": _("Status"),
                     "format": FORMATS["format_theader_yellow_center"],
                 },
                 "asset": {
diff --git a/account_asset_management/tests/test_account_asset_management.py b/account_asset_management/tests/test_account_asset_management.py
index c65f74fcd2e3..2a3a4405b359 100644
--- a/account_asset_management/tests/test_account_asset_management.py
+++ b/account_asset_management/tests/test_account_asset_management.py
@@ -83,19 +83,20 @@ def setUpClass(cls):
         )
 
         # analytic configuration
-        cls.env.user.write(
-            {
-                "groups_id": [
-                    (4, cls.env.ref("analytic.group_analytic_accounting").id),
-                    (4, cls.env.ref("analytic.group_analytic_tags").id),
-                ],
-            }
+        cls.env.user.groups_id += cls.env.ref("analytic.group_analytic_accounting")
+
+        cls.default_plan = cls.env["account.analytic.plan"].create(
+            {"name": "Default", "company_id": False}
         )
         cls.analytic_account = cls.env["account.analytic.account"].create(
-            {"name": "test_analytic_account"}
+            {"name": "test_analytic_account", "plan_id": cls.default_plan.id}
         )
-        cls.analytic_tag = cls.env["account.analytic.tag"].create(
-            {"name": "test_analytic_tag"}
+
+        cls.distribution = cls.env["account.analytic.distribution.model"].create(
+            {
+                "partner_id": cls.partner.id,
+                "analytic_distribution": {cls.analytic_account.id: 100},
+            }
         )
 
         # Asset Profile 1
@@ -130,8 +131,12 @@ def setUpClass(cls):
                 "method_time": "year",
                 "method_number": 5,
                 "method_period": "year",
-                "account_analytic_id": cls.analytic_account.id,
-                "analytic_tag_ids": [(4, cls.analytic_tag.id)],
+                "analytic_distribution": cls.distribution._get_distribution(
+                    {
+                        "partner_id": cls.partner.id,
+                    }
+                ),
+                # "account_analytic_id": cls.analytic_account.id,
             }
         )
 
@@ -181,7 +186,7 @@ def test_00_fiscalyear_lock_date_month(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         self.assertTrue(asset.depreciation_line_ids[0].init_entry)
         for i in range(1, 36):
             self.assertFalse(asset.depreciation_line_ids[i].init_entry)
@@ -199,7 +204,7 @@ def test_00_fiscalyear_lock_date_year(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         self.assertTrue(asset.depreciation_line_ids[0].init_entry)
         for i in range(1, 4):
             self.assertFalse(asset.depreciation_line_ids[i].init_entry)
@@ -249,17 +254,17 @@ def test_01_nonprorata_basic(self):
         self.assertEqual(len(vehicle0.depreciation_line_ids), 1)
         # Compute the depreciation boards
         ict0.compute_depreciation_board()
-        ict0.refresh()
+        ict0.invalidate_recordset()
         self.assertEqual(len(ict0.depreciation_line_ids), 4)
         self.assertEqual(ict0.depreciation_line_ids[1].amount, 500)
         vehicle0.compute_depreciation_board()
-        vehicle0.refresh()
+        vehicle0.invalidate_recordset()
         self.assertEqual(len(vehicle0.depreciation_line_ids), 6)
         self.assertEqual(vehicle0.depreciation_line_ids[1].amount, 2000)
         # Post the first depreciation line
         ict0.validate()
         ict0.depreciation_line_ids[1].create_move()
-        ict0.refresh()
+        ict0.invalidate_recordset()
         self.assertEqual(ict0.state, "open")
         self.assertEqual(ict0.value_depreciated, 500)
         self.assertEqual(ict0.value_residual, 1000)
@@ -271,11 +276,15 @@ def test_01_nonprorata_basic(self):
                 lambda line: line.account_id.internal_group == "expense"
             )
             self.assertEqual(
-                expense_line.analytic_account_id.id,
-                self.analytic_account.id,
+                expense_line.analytic_distribution,
+                self.distribution._get_distribution(
+                    {
+                        "partner_id": self.partner.id,
+                    }
+                )
+                or False,
             )
-            self.assertEqual(expense_line.analytic_tag_ids.id, self.analytic_tag.id)
-        vehicle0.refresh()
+        vehicle0.invalidate_recordset()
         self.assertEqual(vehicle0.state, "open")
         self.assertEqual(vehicle0.value_depreciated, 2000)
         self.assertEqual(vehicle0.value_residual, 8000)
@@ -296,7 +305,7 @@ def test_02_prorata_basic(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         if calendar.isleap(date.today().year):
             self.assertAlmostEqual(
                 asset.depreciation_line_ids[1].amount, 46.44, places=2
@@ -347,7 +356,7 @@ def test_03_proprata_init_prev_year(self):
         )
         self.assertEqual(len(asset.depreciation_line_ids), 2)
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         # check the depreciated value is the initial value
         self.assertAlmostEqual(asset.value_depreciated, 325.08, places=2)
         # check computed values in the depreciation board
@@ -399,7 +408,7 @@ def test_04_prorata_init_cur_year(self):
         )
         self.assertEqual(len(asset.depreciation_line_ids), 2)
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         # check the depreciated value is the initial value
         self.assertAlmostEqual(asset.value_depreciated, 279.44, places=2)
         # check computed values in the depreciation board
@@ -440,7 +449,7 @@ def test_05_degressive_linear(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         # check values in the depreciation board
         self.assertEqual(len(asset.depreciation_line_ids), 5)
         self.assertAlmostEqual(asset.depreciation_line_ids[1].amount, 400.00, places=2)
@@ -464,7 +473,7 @@ def test_05_degressive_linear(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         # check values in the depreciation board
         self.assertEqual(len(asset.depreciation_line_ids), 15)
         # lines prior to asset start period are grouped in the first entry
@@ -491,7 +500,7 @@ def test_06_degressive_limit(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         # check values in the depreciation board
         self.assertEqual(len(asset.depreciation_line_ids), 6)
         self.assertAlmostEqual(asset.depreciation_line_ids[1].amount, 400.00, places=2)
@@ -517,7 +526,7 @@ def test_07_linear_limit(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         # check values in the depreciation board
         self.assertEqual(len(asset.depreciation_line_ids), 6)
         self.assertAlmostEqual(asset.depreciation_line_ids[1].amount, 200.00, places=2)
@@ -553,7 +562,7 @@ def test_08_asset_removal(self):
             }
         )
         wiz.remove()
-        asset.refresh()
+        asset.invalidate_recordset()
         self.assertEqual(len(asset.depreciation_line_ids), 3)
         self.assertAlmostEqual(asset.depreciation_line_ids[1].amount, 81.46, places=2)
         self.assertAlmostEqual(asset.depreciation_line_ids[2].amount, 4918.54, places=2)
@@ -569,7 +578,6 @@ def test_09_asset_from_invoice(self):
         invoice.invoice_line_ids[0].write(
             {"quantity": 2, "asset_profile_id": asset_profile.id}
         )
-        invoice._onchange_invoice_line_ids()
         invoice.action_post()
         # get all asset after invoice validation
         current_asset = self.env["account.asset"].search([])
@@ -648,7 +656,7 @@ def test_12_prorata_days_calc(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         day_rate = 3333 / 1827  # 3333 / 1827 depreciation days
         for i in range(1, 10):
             self.assertAlmostEqual(
@@ -680,7 +688,7 @@ def test_13_use_leap_year(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         for i in range(2, 11):
             self.assertAlmostEqual(
                 asset.depreciation_line_ids[i].amount, 166.58, places=2
@@ -709,7 +717,7 @@ def test_14_not_use_leap_year(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         for _i in range(1, 11):
             self.assertAlmostEqual(
                 asset.depreciation_line_ids[1].amount, 166.67, places=2
@@ -781,7 +789,7 @@ def test_16_use_number_of_depreciations(self):
             }
         )
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         for _i in range(1, 11):
             self.assertAlmostEqual(
                 asset.depreciation_line_ids[1].amount, 166.67, places=2
@@ -813,7 +821,7 @@ def test_17_carry_forward_missed_depreciations(self):
         self.company_data["company"].fiscalyear_lock_date = time.strftime("2021-05-31")
         # Compute the depreciation board
         asset.compute_depreciation_board()
-        asset.refresh()
+        asset.invalidate_recordset()
         d_lines = asset.depreciation_line_ids
         init_lines = d_lines[1:6]
         # Jan to May entries are before the lock date -> marked as init
@@ -850,12 +858,12 @@ def test_18_reverse_entries(self):
         ict0.profile_id.allow_reversal = True
         # compute the depreciation boards
         ict0.compute_depreciation_board()
-        ict0.refresh()
+        ict0.invalidate_recordset()
         # post the first depreciation line
         ict0.validate()
         ict0.depreciation_line_ids[1].create_move()
         original_move = ict0.depreciation_line_ids[1].move_id
-        ict0.refresh()
+        ict0.invalidate_recordset()
         self.assertEqual(ict0.state, "open")
         self.assertEqual(ict0.value_depreciated, 500)
         self.assertEqual(ict0.value_residual, 1000)
@@ -876,7 +884,7 @@ def test_18_reverse_entries(self):
         reverse_wizard = wiz.save()
         reverse_wizard.write({"journal_id": depreciation_line.move_id.journal_id.id})
         reverse_wizard.reverse_move()
-        ict0.refresh()
+        ict0.invalidate_recordset()
         self.assertEqual(ict0.value_depreciated, 0)
         self.assertEqual(ict0.value_residual, 1500)
         self.assertEqual(len(original_move.reversal_move_id), 1)
@@ -899,17 +907,17 @@ def test_19_unlink_entries(self):
         )
         # compute the depreciation boards
         ict0.compute_depreciation_board()
-        ict0.refresh()
+        ict0.invalidate_recordset()
         # post the first depreciation line
         ict0.validate()
         ict0.depreciation_line_ids[1].create_move()
         original_move_id = ict0.depreciation_line_ids[1].move_id.id
-        ict0.refresh()
+        ict0.invalidate_recordset()
         self.assertEqual(ict0.state, "open")
         self.assertEqual(ict0.value_depreciated, 500)
         self.assertEqual(ict0.value_residual, 1000)
         ict0.depreciation_line_ids[1].unlink_move()
-        ict0.refresh()
+        ict0.invalidate_recordset()
         self.assertEqual(ict0.value_depreciated, 0)
         self.assertEqual(ict0.value_residual, 1500)
         move = self.env["account.move"].search([("id", "=", original_move_id)])
diff --git a/account_asset_management/views/account_account.xml b/account_asset_management/views/account_account.xml
index dec4cc503ce8..62379426c767 100644
--- a/account_asset_management/views/account_account.xml
+++ b/account_asset_management/views/account_account.xml
@@ -5,7 +5,7 @@
         <field name="model">account.account</field>
         <field name="inherit_id" ref="account.view_account_form" />
         <field name="arch" type="xml">
-            <field name="user_type_id" position="before">
+            <field name="account_type" position="before">
                 <field name="asset_profile_id" />
             </field>
         </field>
diff --git a/account_asset_management/views/account_asset.xml b/account_asset_management/views/account_asset.xml
index 377bce2518ef..f0181adddaa5 100644
--- a/account_asset_management/views/account_asset.xml
+++ b/account_asset_management/views/account_asset.xml
@@ -56,36 +56,40 @@
                             <field name="name" class="oe_inline" />
                         </h1>
                     </div>
-                    <group col="4">
-                        <field name="code" />
-                        <field
-                            name="company_id"
-                            widget="selection"
-                            groups="base.group_multi_company"
-                        />
-                        <field
-                            name="company_currency_id"
-                            groups="base.group_multi_currency"
-                            invisible="1"
-                        />
-                        <field name="move_line_check" invisible="1" />
-                        <newline />
-                        <field
-                            name="depreciation_base"
-                            widget="monetary"
-                            options="{'currency_field': 'company_currency_id'}"
-                        />
-                        <field
-                            name="value_depreciated"
-                            widget="monetary"
-                            options="{'currency_field': 'company_currency_id'}"
-                        />
-                        <field
-                            name="value_residual"
-                            widget="monetary"
-                            options="{'currency_field': 'company_currency_id'}"
-                        />
-                        <field name="active" invisible="1" />
+                    <group>
+                        <group id="header_left_group">
+                            <field name="company_id" invisible="1" />
+                            <field name="code" />
+                            <field
+                                name="company_id"
+                                widget="selection"
+                                groups="base.group_multi_company"
+                            />
+                            <field
+                                name="company_currency_id"
+                                groups="base.group_multi_currency"
+                                invisible="1"
+                            />
+                            <field name="move_line_check" invisible="1" />
+                        </group>
+                        <group id="header_right_group">
+                            <field
+                                name="depreciation_base"
+                                widget="monetary"
+                                options="{'currency_field': 'company_currency_id'}"
+                            />
+                            <field
+                                name="value_depreciated"
+                                widget="monetary"
+                                options="{'currency_field': 'company_currency_id'}"
+                            />
+                            <field
+                                name="value_residual"
+                                widget="monetary"
+                                options="{'currency_field': 'company_currency_id'}"
+                            />
+                            <field name="active" invisible="1" />
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -94,7 +98,7 @@
                                     <field
                                         name="purchase_value"
                                         widget="monetary"
-                                        options="{'currency_field': 'currency_id'}"
+                                        options="{'currency_field': 'company_currency_id'}"
                                         attrs="{'readonly':['|', ('move_line_check', '=', True), ('state', '!=', 'draft')]}"
                                     />
                                     <field
@@ -112,19 +116,19 @@
                                     <field name="date_remove" />
                                 </group>
                             </group>
-                            <group col="4" string="Other Information">
-                                <field name="profile_id" />
-                                <field name="group_ids" widget="many2many_tags" />
-                                <field name="partner_id" />
-                                <field
-                                    name="account_analytic_id"
-                                    groups="analytic.group_analytic_accounting"
-                                />
-                                <field
-                                    name="analytic_tag_ids"
-                                    groups="analytic.group_analytic_tags"
-                                    widget="many2many_tags"
-                                />
+                            <group string="Other Information">
+                                <group>
+                                    <field name="profile_id" />
+                                    <field name="group_ids" widget="many2many_tags" />
+                                </group>
+                                <group>
+                                    <field name="partner_id" />
+                                    <field
+                                        name="analytic_distribution"
+                                        widget="analytic_distribution"
+                                        optional="show"
+                                    />
+                                </group>
                             </group>
                             <group>
                                 <group string="Depreciation Dates">
@@ -257,11 +261,6 @@
                                     <field name="journal_id" optional="show" />
                                     <field name="account_id" />
                                     <field name="partner_id" optional="show" />
-                                    <field
-                                        name="analytic_account_id"
-                                        groups="analytic.group_analytic_accounting"
-                                        optional="show"
-                                    />
                                     <field name="ref" />
                                     <field name="name" optional="hide" />
                                     <field name="debit" sum="1" />
@@ -298,7 +297,6 @@
                 <field name="date_start" optional="show" />
                 <field name="date_remove" optional="show" />
                 <field name="profile_id" optional="show" />
-                <field name="account_analytic_id" optional="hide" />
                 <field name="method" optional="hide" />
                 <field name="prorata" optional="hide" />
                 <field name="group_ids" widget="many2many_tags" optional="hide" />
@@ -372,12 +370,6 @@
                         domain=""
                         context="{'group_by': 'state'}"
                     />
-                    <filter
-                        string="Analytic account"
-                        name="account_analytic_groupby"
-                        domain=""
-                        context="{'group_by': 'account_analytic_id'}"
-                    />
                     <filter
                         string="Computation Method"
                         name="method_groupby"
diff --git a/account_asset_management/views/account_asset_group.xml b/account_asset_management/views/account_asset_group.xml
index 2f08be642b27..3fffb0113cf8 100644
--- a/account_asset_management/views/account_asset_group.xml
+++ b/account_asset_management/views/account_asset_group.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!-- pylint:disable=duplicate-xml-fields -->
 <odoo>
     <record id="account_asset_group_view_form" model="ir.ui.view">
         <field name="name">account.asset.group.form</field>
@@ -7,6 +8,7 @@
             <form string="Asset Group">
                 <group>
                     <group>
+                        <field name="company_id" invisible="1" />
                         <field name="name" />
                         <field name="code" />
                         <field name="parent_id" />
@@ -25,10 +27,15 @@
         <field name="model">account.asset.group</field>
         <field name="arch" type="xml">
             <tree editable="bottom">
+                <field name="company_id" invisible="1" />
                 <field name="name" />
                 <field name="code" optional="show" />
                 <field name="parent_id" />
-                <field name="company_id" groups="base.group_multi_company" />
+                <field
+                    name="company_id"
+                    options="{'no_create': True}"
+                    groups="base.group_multi_company"
+                />
             </tree>
         </field>
     </record>
diff --git a/account_asset_management/views/account_asset_profile.xml b/account_asset_management/views/account_asset_profile.xml
index 0268f534b685..07a9fe22462f 100644
--- a/account_asset_management/views/account_asset_profile.xml
+++ b/account_asset_management/views/account_asset_profile.xml
@@ -12,72 +12,72 @@
                         bg_color="bg-danger"
                         attrs="{'invisible': [('active', '=', True)]}"
                     />
-                <div class="oe_title">
-                    <label for="name" class="oe_edit_only" />
-                    <h1>
-                            <field name="name" />
-                    </h1>
-            </div>
-                <group>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                                <field name="name" />
+                        </h1>
+                    </div>
                     <group>
-                        <field name="group_ids" widget="many2many_tags" />
-                        <field name="asset_product_item" />
-                        <field name="active" invisible="1" />
-                        <field
+                        <group>
+                            <field name="company_id" invisible="1" />
+                            <field name="group_ids" widget="many2many_tags" />
+                            <field name="asset_product_item" />
+                            <field name="active" invisible="1" />
+                            <field
                                 name="company_id"
                                 widget="selection"
                                 groups="base.group_multi_company"
                             />
-                    </group>
-                    <group>
-                        <field name="journal_id" />
-                        <field name="account_asset_id" />
-                        <field name="account_depreciation_id" />
-                        <field name="account_expense_depreciation_id" />
-                        <field name="account_plus_value_id" />
-                        <field name="account_min_value_id" />
-                        <field name="account_residual_value_id" />
-                        <field name="allow_reversal" />
-                    </group>
-                    <group string="Depreciation Dates">
-                        <field name="method_time" />
-                        <field
+                        </group>
+                        <group>
+                            <field name="journal_id" />
+                            <field name="account_asset_id" />
+                            <field name="account_depreciation_id" />
+                            <field name="account_expense_depreciation_id" />
+                            <field name="account_plus_value_id" />
+                            <field name="account_min_value_id" />
+                            <field name="account_residual_value_id" />
+                            <field name="allow_reversal" />
+                        </group>
+                        <group string="Depreciation Dates">
+                            <field name="method_time" />
+                            <field
                                 name="method_number"
                                 attrs="{'invisible': [('method_time', 'not in', ['number', 'year'])], 'required': [('method_time', 'in', ['number', 'year'])]}"
                             />
-                        <field name="method_period" />
-                        <field name="days_calc" />
-                        <field
+                            <field name="method_period" />
+                            <field name="days_calc" />
+                            <field
                                 name="use_leap_years"
                                 attrs="{'invisible': [('days_calc', '=', True)]}"
                             />
-                    </group>
-                    <group string="Depreciation Method">
-                        <field name="method" />
-                        <field
+                        </group>
+                        <group string="Depreciation Method">
+                            <field name="method" />
+                            <field
                                 name="method_progress_factor"
                                 attrs="{'invisible': [('method', 'in', ['linear', 'linear-limit'])], 'required': [('method', 'in', ['degressive', 'degr-linear', 'degr-limit'])]}"
                             />
-                        <field
+                            <field
                                 name="prorata"
                                 attrs="{'readonly':[('method_time','!=','year')]}"
                             />
-                        <field name="open_asset" />
-                    </group>
-                    <group
+                            <field name="open_asset" />
+                        </group>
+                        <group
                             groups="analytic.group_analytic_accounting"
                             string="Analytic Information"
                         >
-                        <field name="account_analytic_id" />
-                        <field
-                                name="analytic_tag_ids"
-                                widget="many2many_tags"
-                                groups="analytic.group_analytic_tags"
+                            <field
+                                name="analytic_distribution"
+                                widget="analytic_distribution"
+                                optional="show"
                             />
+                        </group>
                     </group>
-                </group>
-                <separator string="Notes" />
-                <field name="note" />
+                    <separator string="Notes" />
+                    <field name="note" />
                 </sheet>
             </form>
         </field>
@@ -96,7 +96,6 @@
                 <field name="account_expense_depreciation_id" optional="hide" />
                 <field name="account_plus_value_id" optional="hide" />
                 <field name="account_min_value_id" optional="hide" />
-                <field name="account_analytic_id" optional="hide" />
                 <field name="method" optional="show" />
                 <field name="prorata" optional="hide" />
                 <field
@@ -121,11 +120,6 @@
                     domain="[('active', '=', False)]"
                 />
                 <group name="groupby">
-                    <filter
-                        name="account_analytic_groupby"
-                        string="account_analytic_id"
-                        context="{'group_by': 'account_analytic_id'}"
-                    />
                     <filter
                         name="method_groupby"
                         string="Computation Method"
diff --git a/account_asset_management/views/account_move.xml b/account_asset_management/views/account_move.xml
index 0039dae608af..9b898f438d90 100644
--- a/account_asset_management/views/account_move.xml
+++ b/account_asset_management/views/account_move.xml
@@ -4,7 +4,6 @@
         <field name="name">account.move.form.account.asset.management</field>
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form" />
-        <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
                 <button
@@ -13,6 +12,7 @@
                     class="oe_stat_button"
                     icon="fa-cube"
                     attrs="{'invisible': [('asset_count', '=', 0)]}"
+                    groups="account.group_account_invoice"
                 >
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value">
@@ -30,11 +30,12 @@
                     name="asset_profile_id"
                     attrs="{'column_invisible': [('parent.move_type', 'not in', ('in_invoice', 'in_refund'))]}"
                     optional="show"
+                    groups="account.group_account_invoice"
                 />
                 <field
                     name="asset_id"
                     attrs="{'column_invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}"
-                    groups="account.group_account_manager"
+                    groups="account.group_account_manager,account.group_account_invoice"
                     optional="show"
                 />
             </xpath>
@@ -46,10 +47,11 @@
                     name="asset_profile_id"
                     domain="[('company_id','=', parent.company_id)]"
                     optional="hide"
+                    groups="account.group_account_invoice"
                 />
                 <field
                     name="asset_id"
-                    groups="account.group_account_manager"
+                    groups="account.group_account_manager,account.group_account_invoice"
                     optional="show"
                 />
             </xpath>
diff --git a/account_asset_management/views/account_move_line.xml b/account_asset_management/views/account_move_line.xml
index 73a2a1691fe8..fafedd65a53d 100644
--- a/account_asset_management/views/account_move_line.xml
+++ b/account_asset_management/views/account_move_line.xml
@@ -5,7 +5,7 @@
         <field name="model">account.move.line</field>
         <field name="inherit_id" ref="account.view_move_line_form" />
         <field name="arch" type="xml">
-            <field name="statement_id" position="after">
+            <field name="statement_line_id" position="after">
                 <field
                     name="asset_profile_id"
                     domain="[('company_id','=', parent.company_id)]"
diff --git a/account_asset_management/wizard/account_asset_remove.py b/account_asset_management/wizard/account_asset_remove.py
index 3dad7bec9a57..116d7c4717df 100644
--- a/account_asset_management/wizard/account_asset_remove.py
+++ b/account_asset_management/wizard/account_asset_remove.py
@@ -331,8 +331,7 @@ def _get_removal_data(self, asset, residual_value):
                 move_line_vals = {
                     "name": asset.name,
                     "account_id": self.account_residual_value_id.id,
-                    "analytic_account_id": asset.account_analytic_id.id,
-                    "analytic_tag_ids": [(4, tag.id) for tag in asset.analytic_tag_ids],
+                    "analytic_distribution": asset.analytic_distribution,
                     "debit": residual_value,
                     "credit": 0.0,
                     "partner_id": partner_id,
@@ -345,10 +344,7 @@ def _get_removal_data(self, asset, residual_value):
                     move_line_vals = {
                         "name": asset.name,
                         "account_id": self.account_sale_id.id,
-                        "analytic_account_id": asset.account_analytic_id.id,
-                        "analytic_tag_ids": [
-                            (4, tag.id) for tag in asset.analytic_tag_ids
-                        ],
+                        "analytic_distribution": asset.analytic_distribution,
                         "debit": sale_value,
                         "credit": 0.0,
                         "partner_id": partner_id,
@@ -364,8 +360,7 @@ def _get_removal_data(self, asset, residual_value):
                 move_line_vals = {
                     "name": asset.name,
                     "account_id": account_id,
-                    "analytic_account_id": asset.account_analytic_id.id,
-                    "analytic_tag_ids": [(4, tag.id) for tag in asset.analytic_tag_ids],
+                    "analytic_distribution": asset.analytic_distribution,
                     "debit": balance < 0 and -balance or 0.0,
                     "credit": balance > 0 and balance or 0.0,
                     "partner_id": partner_id,
diff --git a/account_asset_management/wizard/account_asset_remove.xml b/account_asset_management/wizard/account_asset_remove.xml
index 4c885a208afd..027e77b12ba3 100644
--- a/account_asset_management/wizard/account_asset_remove.xml
+++ b/account_asset_management/wizard/account_asset_remove.xml
@@ -5,30 +5,35 @@
         <field name="model">account.asset.remove</field>
         <field name="arch" type="xml">
             <form string="Remove Asset">
-                <group colspan="4" col="4">
-                    <field name="company_id" groups="base.group_multi_company" />
-                    <field name="date_remove" />
-                    <field name="force_date" />
-                    <field name="sale_value" />
-                    <field
-                        name="account_sale_id"
-                        attrs="{'invisible': [('sale_value', '=', 0.0)], 'required': [('sale_value', '>', 0.0)]}"
-                    />
-                    <newline />
-                    <field name="posting_regime" />
-                    <newline />
-                    <field
-                        name="account_plus_value_id"
-                        attrs="{'invisible': [('posting_regime', '=', 'residual_value')], 'required': [('posting_regime', '!=', 'residual_value')]}"
-                    />
-                    <field
-                        name="account_min_value_id"
-                        attrs="{'invisible': [('posting_regime', '=', 'residual_value')], 'required': [('posting_regime', '!=', 'residual_value')]}"
-                    />
-                    <field
-                        name="account_residual_value_id"
-                        attrs="{'invisible': [('posting_regime', '!=', 'residual_value')], 'required': [('posting_regime', '=', 'residual_value')]}"
-                    />
+                <group>
+                    <group>
+                        <field name="company_id" invisible="1" />
+                        <field name="company_id" groups="base.group_multi_company" />
+                        <field name="date_remove" />
+                        <field name="force_date" />
+                        <field name="sale_value" />
+                        <field
+                            name="account_sale_id"
+                            attrs="{'invisible': [('sale_value', '=', 0.0)], 'required': [('sale_value', '>', 0.0)]}"
+                        />
+                    </group>
+                    <group>
+                        <field
+                            name="account_plus_value_id"
+                            attrs="{'invisible': [('posting_regime', '=', 'residual_value')], 'required': [('posting_regime', '!=', 'residual_value')]}"
+                        />
+                        <field
+                            name="account_min_value_id"
+                            attrs="{'invisible': [('posting_regime', '=', 'residual_value')], 'required': [('posting_regime', '!=', 'residual_value')]}"
+                        />
+                        <field
+                            name="account_residual_value_id"
+                            attrs="{'invisible': [('posting_regime', '!=', 'residual_value')], 'required': [('posting_regime', '=', 'residual_value')]}"
+                        />
+                    </group>
+                    <group>
+                        <field name="posting_regime" />
+                    </group>
                     <separator string="Notes" colspan="4" />
                     <field name="note" nolabel="1" colspan="4" />
                 </group>
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 000000000000..e69de29bb2d1