diff --git a/account_asset_management/models/account_move.py b/account_asset_management/models/account_move.py
index 46ba8ccf2..4b1f0f9b8 100644
--- a/account_asset_management/models/account_move.py
+++ b/account_asset_management/models/account_move.py
@@ -27,12 +27,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):
@@ -116,12 +119,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:
@@ -135,10 +143,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")
@@ -146,6 +154,11 @@ class AccountMoveLine(models.Model):
         self.asset_profile_id = self.account_id.asset_profile_id
         super()._onchange_account_id()
 
+    @api.onchange("asset_profile_id")
+    def _onchange_asset_profile_id(self):
+        self.account_id = self.asset_profile_id.account_asset_id
+        super()._onchange_account_id()
+
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
diff --git a/account_asset_management/readme/HISTORY.rst b/account_asset_management/readme/HISTORY.rst
index 85492f514..e35ac96cb 100644
--- a/account_asset_management/readme/HISTORY.rst
+++ b/account_asset_management/readme/HISTORY.rst
@@ -1,3 +1,9 @@
+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 ae0b16efe..30eb8a00a 100644
--- a/account_asset_management/views/account_move.xml
+++ b/account_asset_management/views/account_move.xml
@@ -6,13 +6,17 @@
         <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
-                <button name="action_view_assets"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-cube"
-                        attrs="{'invisible': [('asset_count', '=', 0)]}">
+                <button
+                    name="action_view_assets"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-cube"
+                    attrs="{'invisible': [('asset_count', '=', 0)]}"
+                >
                     <div class="o_field_widget o_stat_info">
-                        <span class="o_stat_value"><field name="asset_count"/></span>
+                        <span class="o_stat_value">
+                            <field name="asset_count" />
+                        </span>
                         <span class="o_stat_text"> Asset(s)</span>
                     </div>
                 </button>
@@ -23,6 +27,7 @@
             >
                 <field
                     name="asset_profile_id"
+                    domain="[('company_id','=', parent.company_id)]"
                     attrs="{'invisible': [('parent.type', 'not in', ('in_invoice', 'in_refund'))]}"
                 />
                 <field
@@ -35,7 +40,10 @@
                 expr="//notebook//field[@name='line_ids']/tree/field[@name='date_maturity']"
                 position="after"
             >
-                <field name="asset_profile_id" />
+                <field
+                    name="asset_profile_id"
+                    domain="[('company_id','=', parent.company_id)]"
+                />
                 <field name="asset_id" groups="account.group_account_manager" />
             </xpath>
         </field>
diff --git a/account_asset_management/views/account_move_line.xml b/account_asset_management/views/account_move_line.xml
index 2f86d7d1d..73a2a1691 100644
--- a/account_asset_management/views/account_move_line.xml
+++ b/account_asset_management/views/account_move_line.xml
@@ -6,7 +6,10 @@
         <field name="inherit_id" ref="account.view_move_line_form" />
         <field name="arch" type="xml">
             <field name="statement_id" position="after">
-                <field name="asset_profile_id" />
+                <field
+                    name="asset_profile_id"
+                    domain="[('company_id','=', parent.company_id)]"
+                />
                 <field name="asset_id" />
             </field>
         </field>